Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (20b6d9afd08ba0992d2d9575d99be115c1ca5300)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (20b6d9afd08ba0992d2d9575d99be115c1ca5300)
  • Date: Mon, 16 Mar 2015 06:23:50 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

libs/icu/HISTORY | 3 ++-
libs/icu/UP_TRIGGERS | 14 +++++++++++++-
libs/libffi/HISTORY | 3 +++
libs/libffi/UP_TRIGGERS | 27 +++++++++++++++++++++------
4 files changed, 39 insertions(+), 8 deletions(-)

New commits:
commit 20b6d9afd08ba0992d2d9575d99be115c1ca5300
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libffi: rewritten UP_TRIGGERS

commit 3f32ed2b0c849608fa17959bc4f7c15fa773a27f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

icu: corrected sorting in triggers

commit c652b97f73023cd790a827e8388ce6c6d6522b49
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

icu: added libxml2 and raptor to check for triggering

diff --git a/libs/icu/HISTORY b/libs/icu/HISTORY
index 926c725..0e9ce3b 100644
--- a/libs/icu/HISTORY
+++ b/libs/icu/HISTORY
@@ -1,5 +1,6 @@
2015-03-16 Vlad Glagolev <stealth AT sourcemage.org>
- * UP_TRIGGERS: added libicudata to the triggers
+ * UP_TRIGGERS: added libicudata to the triggers; added libxml2 and
+ raptor spells to check for

2015-03-13 Vlad Glagolev <stealth AT sourcemage.org>
* UP_TRIGGERS: rewritten, to fix upgrade procedure
diff --git a/libs/icu/UP_TRIGGERS b/libs/icu/UP_TRIGGERS
index 4fd679e..d08afc7 100755
--- a/libs/icu/UP_TRIGGERS
+++ b/libs/icu/UP_TRIGGERS
@@ -7,7 +7,19 @@ if spell_ok $SPELL; then
message "${MESSAGE_COLOR}This is a possibly incompatible update of
$SPELL..." &&
message "Figuring out what spells need to be recast, this may take a
while.${DEFAULT_COLOR}" &&

- for each in $(show_up_depends $SPELL 1); do
+ local dependees="$(show_up_depends $SPELL 1)" &&
+
+ # LDFLAGS are taken from /usr/lib/pkgconfig/libxml-2.0.pc
+ if spell_ok libxml2 && is_depends_enabled libxml2 icu; then
+ dependees="`echo -e "$(show_up_depends libxml2 1)\n$dependees" | sort
| uniq`"
+ fi &&
+
+ # LDFLAGS are taken from /usr/lib/pkgconfig/raptor2.pc
+ if spell_ok raptor && is_depends_enabled raptor icu; then
+ dependees="`echo -e "$(show_up_depends raptor 1)\n$dependees" | sort |
uniq`"
+ fi &&
+
+ for each in $dependees; do
if gaze install $each | xargs readelf -d 2> /dev/null |
grep -q
"NEEDED.*\(libicuuc\|libicuio\|libicudata\|libicui18n\)\.so"; then
up_trigger $each cast_self
diff --git a/libs/libffi/HISTORY b/libs/libffi/HISTORY
index e691418..b054d00 100644
--- a/libs/libffi/HISTORY
+++ b/libs/libffi/HISTORY
@@ -1,3 +1,6 @@
+2015-03-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * UP_TRIGGERS: rewritten, to recast all gobject-linked spells
+
2015-01-29 Eric Sandall <sandalle AT sourcemage.org>
* UP_TRIGGERS: 3.0.10 -> 3.2.1 is an ABI change causing breakage
Recast dependees on x.y version changes in x.y.z updates
diff --git a/libs/libffi/UP_TRIGGERS b/libs/libffi/UP_TRIGGERS
index d282a33..5fa581a 100755
--- a/libs/libffi/UP_TRIGGERS
+++ b/libs/libffi/UP_TRIGGERS
@@ -1,8 +1,23 @@
# Run if X or Y changes in version x.y.z for ABI (e.g. 3.0 -> 3.2) changes
-local OLD_SPELL_VERSION=""
-spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
-if [ "${OLD_SPELL_VERSION:0:3}" != "${VERSION:0:3}" ]; then
- for each in $(show_up_depends $SPELL 1); do
- up_trigger $each cast_self
- done
+if spell_ok $SPELL; then
+ local OLD_SPELL_VERSION="$(installed_version $SPELL)" &&
+
+ if [ "${OLD_SPELL_VERSION:0:3}" != "${VERSION:0:3}" ]; then
+ message "${MESSAGE_COLOR}This is a possibly incompatible update of
$SPELL..." &&
+ message "Figuring out what spells need to be recast, this may take a
while.${DEFAULT_COLOR}" &&
+
+ local dependees="$(show_up_depends $SPELL 1)" &&
+
+ # LDFLAGS are taken from /usr/lib/pkgconfig/gobject-2.0.pc
+ if spell_ok glib2; then
+ dependees="`echo -e "$(show_up_depends glib2 1)\n$dependees" | sort |
uniq`"
+ fi &&
+
+ for each in $dependees; do
+ if gaze install $each | xargs readelf -d 2> /dev/null |
+ grep -q "NEEDED.*libffi\.so"; then
+ up_trigger $each cast_self
+ fi
+ done
+ fi
fi



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (20b6d9afd08ba0992d2d9575d99be115c1ca5300), Vlad Glagolev, 03/16/2015

Archive powered by MHonArc 2.6.24.

Top of Page