Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (d34989d9fbcc95c395ef50ac3dee3812511aeb14)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (d34989d9fbcc95c395ef50ac3dee3812511aeb14)
  • Date: Wed, 7 Jul 2021 21:58:10 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

libs/gettext/BUILD | 1 -
libs/gettext/DETAILS | 1 +
libs/gettext/HISTORY | 6 ++++++
libs/gettext/UP_TRIGGERS | 5 +++++
net/samba4/DEPENDS | 3 +++
net/samba4/DETAILS | 1 +
net/samba4/HISTORY | 4 ++++
7 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit d34989d9fbcc95c395ef50ac3dee3812511aeb14
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

gettext: Drop redundant libintl. It resides in glibc.

This is a long-term oddity in SMGL. Other distros using GNU libc
ship gettext in that, not in a spearate libintl. The redundant
lib confuses build systems working on top.

commit 9dc06db064e12f5a89be2e0f4421e5dfcf4650f2
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

samba4: add explicit jansson dep to fix build

Insists on --without-json if that's not there.

diff --git a/libs/gettext/BUILD b/libs/gettext/BUILD
index de79abe..03a399e 100755
--- a/libs/gettext/BUILD
+++ b/libs/gettext/BUILD
@@ -12,7 +12,6 @@ OPTS="--with-included-glib $OPTS" &&
--sysconfdir=${TRACK_ROOT}/etc \
--infodir=${TRACK_ROOT}/usr/share/info \
--mandir=${TRACK_ROOT}/usr/share/man \
- --with-included-gettext \
--includedir=${TRACK_ROOT}/usr/local/include \
$OPTS &&

diff --git a/libs/gettext/DETAILS b/libs/gettext/DETAILS
index a028ed5..f025412 100755
--- a/libs/gettext/DETAILS
+++ b/libs/gettext/DETAILS
@@ -1,5 +1,6 @@
SPELL=gettext
VERSION=0.21
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
diff --git a/libs/gettext/HISTORY b/libs/gettext/HISTORY
index 890a65f..c8dd8ae 100644
--- a/libs/gettext/HISTORY
+++ b/libs/gettext/HISTORY
@@ -1,3 +1,9 @@
+2021-07-07 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * BUILD: don't force duplicate libintl
+ * UP_TRIGGERS: check spells that might have picked up the redundant
+ libintl
+
2020-07-27 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 0.21

diff --git a/libs/gettext/UP_TRIGGERS b/libs/gettext/UP_TRIGGERS
new file mode 100755
index 0000000..a5b38c2
--- /dev/null
+++ b/libs/gettext/UP_TRIGGERS
@@ -0,0 +1,5 @@
+. $GRIMOIRE/FUNCTIONS
+if spell_ok $SPELL && gaze install $SPELL | grep -q '/libintl\.so'; then
+ message "${SPELL_COLOR}$SPELL$MESSAGE_COLOR used to provide libintl,
checking dependents for its removal.$DEFAULT_COLOR" &&
+ check_dependents $SPELL
+fi
diff --git a/net/samba4/DEPENDS b/net/samba4/DEPENDS
index c312262..d2c84ab 100755
--- a/net/samba4/DEPENDS
+++ b/net/samba4/DEPENDS
@@ -73,6 +73,9 @@ optional_depends dmapi \
"--without-dmapi" \
"for data management API for XFS Filesystem support" &&

+optional_depends jansson \
+ --with{,out}-json \
+ "for JSON printer stuff"

optional_depends libxslt "" "" "to build man pages and documentation" &&
if is_depends_enabled $SPELL libxslt; then
diff --git a/net/samba4/DETAILS b/net/samba4/DETAILS
index db9cb82..95270fd 100755
--- a/net/samba4/DETAILS
+++ b/net/samba4/DETAILS
@@ -16,6 +16,7 @@ else
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/4}-$VERSION
SOURCE_URL[0]=https://download.samba.org/pub/samba/stable/$SOURCE
fi
+ PATCHLEVEL=1
LICENSE[0]=GPL
WEB_SITE=https://www.samba.org/
KEYWORDS="net"
diff --git a/net/samba4/HISTORY b/net/samba4/HISTORY
index e382e32..02cd173 100644
--- a/net/samba4/HISTORY
+++ b/net/samba4/HISTORY
@@ -1,3 +1,7 @@
+2021-07-03 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: jansson added
+ * DETAILS: ++PATCHLEVEL
+
2021-01-13 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 4.13.3




  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (d34989d9fbcc95c395ef50ac3dee3812511aeb14), Thomas Orgis, 07/07/2021

Archive powered by MHonArc 2.6.24.

Top of Page