Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (ff89fce4215b322b236806029dc6e356d235d14b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (ff89fce4215b322b236806029dc6e356d235d14b)
  • Date: Wed, 16 Mar 2022 21:08:53 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

libs/libidn/BUILD | 2
libs/libidn/DEPENDS | 12 +++
libs/libidn/HISTORY | 2
utils/schroot/HISTORY | 3
utils/schroot/patches/0001-Add-missing-gettext-includes.patch | 35
++++++++++
utils/schroot/patches/0001-musl.patch | 25 -------
6 files changed, 54 insertions(+), 25 deletions(-)

New commits:
commit ff89fce4215b322b236806029dc6e356d235d14b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

schroot: Fix build against musl + boost 1.78

commit a9f591d6650ac60d663aeb1cf78446f98bce3ae8
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libidn: Add optional deps

commit 2954501f5bcf80cb801fb4dd902bcd37af6934ea
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libidn: Disable static lib

diff --git a/libs/libidn/BUILD b/libs/libidn/BUILD
new file mode 100755
index 0000000..448e746
--- /dev/null
+++ b/libs/libidn/BUILD
@@ -0,0 +1,2 @@
+OPTS+=' --disable-static' &&
+default_build
diff --git a/libs/libidn/DEPENDS b/libs/libidn/DEPENDS
new file mode 100755
index 0000000..3a41928
--- /dev/null
+++ b/libs/libidn/DEPENDS
@@ -0,0 +1,12 @@
+optional_depends GETTEXT \
+ --{enable,disable}-nls \
+ 'for NLS support' &&
+optional_depends CSHARP \
+ --{enable,disable}-csharp \
+ 'for C# support' &&
+optional_depends JAVA \
+ --{enable,disable}-java \
+ 'for Java API support' &&
+optional_depends gtk-doc \
+ --{enable,disable}-gtk-doc \
+ 'use gtk-doc to build documentation'
diff --git a/libs/libidn/HISTORY b/libs/libidn/HISTORY
index b35e98f..774ae4a 100644
--- a/libs/libidn/HISTORY
+++ b/libs/libidn/HISTORY
@@ -1,6 +1,8 @@
2022-03-16 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 1.38
* PRE_BUILD: disabled installation of libtool pseudo-libraries
+ * BUILD: disabled static library
+ * DEPENDS: added optional deps on gettext, C#, Java & gtk-doc

2020-07-24 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 1.36
diff --git a/utils/schroot/HISTORY b/utils/schroot/HISTORY
index 16914f9..e11bf1b 100644
--- a/utils/schroot/HISTORY
+++ b/utils/schroot/HISTORY
@@ -1,5 +1,8 @@
2022-03-16 Ismael Luceno <ismael AT iodev.co.uk>
* BUILD: removed -lintl from LDFLAGS for musl
+ * patches/0001-musl.patch: removed, replaced
+ * patches/0001-Add-missing-gettext-includes.patch: added, replaces
+ previous patch (fixes build against musl + boost 1.78)

2021-03-08 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: use GETTEXT
diff --git a/utils/schroot/patches/0001-Add-missing-gettext-includes.patch
b/utils/schroot/patches/0001-Add-missing-gettext-includes.patch
new file mode 100644
index 0000000..f9afc4a
--- /dev/null
+++ b/utils/schroot/patches/0001-Add-missing-gettext-includes.patch
@@ -0,0 +1,35 @@
+From 00c241c68c1071dca3aa7151150aacc49ecf8076 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT sourcemage.org>
+Date: Wed, 16 Mar 2022 21:46:46 +0100
+Subject: [PATCH] Add missing gettext includes
+
+---
+ bin/schroot-base/schroot-base-run.h | 1 +
+ sbuild/sbuild-feature.cc | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/sbuild/sbuild-feature.cc b/sbuild/sbuild-feature.cc
+--- a/sbuild/sbuild-feature.cc
++++ b/sbuild/sbuild-feature.cc
+@@ -20,6 +20,7 @@
+
+ #include <iostream>
++#include <libintl.h>
+
+ #include "sbuild-feature.h"
+
+ using namespace sbuild;
+
+diff --git a/bin/schroot-base/schroot-base-run.h
b/bin/schroot-base/schroot-base-run.h
+--- a/bin/schroot-base/schroot-base-run.h
++++ b/bin/schroot-base/schroot-base-run.h
+@@ -26,6 +26,7 @@
+ #include <cstdlib>
+ #include <iostream>
+ #include <string>
++#include <libintl.h>
+
+ namespace schroot_base
+ {
+--
+2.35.1
diff --git a/utils/schroot/patches/0001-musl.patch
b/utils/schroot/patches/0001-musl.patch
deleted file mode 100644
index 51e40e4..0000000
--- a/utils/schroot/patches/0001-musl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 73936a423227aa78b7682bdd3edc20643763807b Mon Sep 17 00:00:00 2001
-From: Andrea Brancaleoni <abc AT pompel.me>
-Date: Wed, 19 Sep 2018 11:22:47 +0200
-Subject: [PATCH] musl
-
----
- sbuild/sbuild-feature.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/sbuild/sbuild-feature.cc b/sbuild/sbuild-feature.cc
-index 5ac4725..9902db3 100644
---- a/sbuild/sbuild-feature.cc
-+++ b/sbuild/sbuild-feature.cc
-@@ -20,6 +20,8 @@
-
- #include <iostream>
-
-+#include <libintl.h>
-+
- #include "sbuild-feature.h"
-
- using namespace sbuild;
---
-2.19.0
-



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (ff89fce4215b322b236806029dc6e356d235d14b), Ismael Luceno, 03/16/2022

Archive powered by MHonArc 2.6.24.

Top of Page