Skip to Content.
Sympa Menu

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

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 (e016697fee02b59c9662ba98e8a525bbc406006d)
  • Date: Sun, 24 Sep 2017 22:03:51 +0000

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

libs/glibc/HISTORY | 4 ++++
libs/glibc/UP_TRIGGERS | 7 +++++--
libs/icu/HISTORY | 3 +++
libs/icu/PRE_BUILD | 3 ++-
libs/icu/xlocale.patch | 31 +++++++++++++++++++++++++++++++
5 files changed, 45 insertions(+), 3 deletions(-)

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

glibc: trigger xlocale recast for all updates over 2.26, not just from
2.25

I had glibc 2.24 installed. Update to 2.26 broke things. No trigger.

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

glibc: also trigger icu for xlocale.h change

commit 77c5c610e20ddc3ca2e62e4ff70eedef99fad544
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

icu: fix build with glibc-2.26

diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 5d0b1d9..5f6b58e 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,7 @@
+2017-09-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * UP_TRIGGERS: add icu to the xlocale.h offenders,
+ also trigger on any update crossing 2.26
+
2017-08-16 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Force gcc to be built if major version upgrade
e.g. gcc 4.6.4 (stable-0.62-10) -> gcc 7.2.0 (test-0.63)
diff --git a/libs/glibc/UP_TRIGGERS b/libs/glibc/UP_TRIGGERS
index 58b8194..364574d 100755
--- a/libs/glibc/UP_TRIGGERS
+++ b/libs/glibc/UP_TRIGGERS
@@ -1,3 +1,5 @@
+. "$GRIMOIRE/FUNCTIONS"
+
if ! spell_ok locale; then
up_trigger locale cast_self
echo
@@ -11,8 +13,9 @@ fi
# See https://bugzilla.redhat.com/show_bug.cgi?id=1464244 for perl
local OLD_SPELL_VERSION=""
spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
-if [ "x${OLD_SPELL_VERSION}" == "x2.25" ] && [ "x${VERSION}" !=
"x${OLD_SPELL_VERSION}" ]; then
- for each in gsoap matplotlib numpy perl qjson scipy weechat; do
+if is_version_less $OLD_SPELL_VERSION $VERSION &&
+ is_version_less $OLD_SPELL_VERSION 2.26; then
+ for each in gsoap matplotlib numpy perl qjson scipy weechat icu; do
if spell_ok $each; then
up_trigger $each cast_self
fi
diff --git a/libs/icu/HISTORY b/libs/icu/HISTORY
index 513af30..0ac42f0 100644
--- a/libs/icu/HISTORY
+++ b/libs/icu/HISTORY
@@ -1,3 +1,6 @@
+2017-09-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * xlocale.patch, PRE_BUILD: fix build with glibc-2.26
+
2017-08-16 Eric Sandall <sandalle AT sourcemage.org>
* collation.patch: Strip trailing CRs

diff --git a/libs/icu/PRE_BUILD b/libs/icu/PRE_BUILD
index b61b40e..8cb3ff1 100755
--- a/libs/icu/PRE_BUILD
+++ b/libs/icu/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&
-patch -p3 < ${SPELL_DIRECTORY}/collation.patch
+patch -p3 < "$SPELL_DIRECTORY/collation.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/xlocale.patch"
diff --git a/libs/icu/xlocale.patch b/libs/icu/xlocale.patch
new file mode 100644
index 0000000..add0d76
--- /dev/null
+++ b/libs/icu/xlocale.patch
@@ -0,0 +1,31 @@
+From c4254fd8ff1888ca285e3242b812010357ce2b3e Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem AT gmail.com>
+Date: Sat, 24 Jun 2017 22:52:40 -0700
+Subject: [PATCH] i18n: Drop include <xlocale.h>
+
+glibc 2.26 drops this header
+
+Signed-off-by: Khem Raj <raj.khem AT gmail.com>
+---
+Upstream-Status: Pending
+
+ i18n/digitlst.cpp | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+Index: source/i18n/digitlst.cpp
+===================================================================
+--- source.orig/i18n/digitlst.cpp
++++ source/i18n/digitlst.cpp
+@@ -61,11 +61,7 @@
+ #endif
+
+ #if U_USE_STRTOD_L
+-# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN
+-# include <locale.h>
+-# else
+-# include <xlocale.h>
+-# endif
++# include <locale.h>
+ #endif
+
+ //
***************************************************************************



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (e016697fee02b59c9662ba98e8a525bbc406006d), Thomas Orgis, 09/24/2017

Archive powered by MHonArc 2.6.24.

Top of Page