Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 78592 by Arwed von Merkatz for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Perforce Review Daemon <p4review AT smee.org>
  • To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "David Michael Leo Brown Jr." <dmlb2000 AT gmail.com>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "vladimir_marek" <vlmarek AT volny.cz>
  • Subject: [SM-Commit] PERFORCE change 78592 by Arwed von Merkatz for review
  • Date: Fri, 28 Apr 2006 18:20:01 +0100 (BST)

Change 78592 by arwed_von_merkatz@arwed-Otherland on 2006/04/28 18:16:29

replaced calls to 'gaze depends' with fast_up_depends, added that to
libcompat, bug #10661

Affected files ...

... //sgl/grimoires/stable-rc/0.4/ChangeLog#6 integrate
... //sgl/grimoires/stable-rc/0.4/audio-libs/wavpack/HISTORY#2 integrate
... //sgl/grimoires/stable-rc/0.4/audio-libs/wavpack/UP_TRIGGERS#2 integrate
... //sgl/grimoires/stable-rc/0.4/crypto/openssl/HISTORY#2 integrate
... //sgl/grimoires/stable-rc/0.4/crypto/openssl/UP_TRIGGERS#2 integrate
... //sgl/grimoires/stable-rc/0.4/database/db/HISTORY#2 integrate
... //sgl/grimoires/stable-rc/0.4/database/db/UP_TRIGGERS#2 integrate
... //sgl/grimoires/stable-rc/0.4/database/firebird/HISTORY#2 integrate
... //sgl/grimoires/stable-rc/0.4/database/firebird/UP_TRIGGERS#2 integrate
... //sgl/grimoires/stable-rc/0.4/gnustep-libs/gnustep-base/HISTORY#2 edit
... //sgl/grimoires/stable-rc/0.4/gnustep-libs/gnustep-base/UP_TRIGGERS#2 edit
... //sgl/grimoires/stable-rc/0.4/libcompat#2 integrate
... //sgl/grimoires/stable-rc/0.4/libs/expat/HISTORY#2 integrate
... //sgl/grimoires/stable-rc/0.4/libs/expat/UP_TRIGGERS#2 integrate
... //sgl/grimoires/stable-rc/0.4/perl-cpan/perl/HISTORY#2 integrate
... //sgl/grimoires/stable-rc/0.4/perl-cpan/perl/UP_TRIGGERS#2 integrate
... //sgl/grimoires/stable-rc/0.4/printer/cups/HISTORY#2 integrate
... //sgl/grimoires/stable-rc/0.4/printer/cups/PRE_BUILD#2 integrate
... //sgl/grimoires/stable-rc/0.4/printer/gnulpr/HISTORY#2 integrate
... //sgl/grimoires/stable-rc/0.4/printer/gnulpr/PRE_BUILD#2 integrate
... //sgl/grimoires/stable-rc/0.4/video-libs/gstreamer/HISTORY#2 integrate
... //sgl/grimoires/stable-rc/0.4/video-libs/gstreamer/UP_TRIGGERS#2 integrate

Differences ...

==== //sgl/grimoires/stable-rc/0.4/ChangeLog#6 (text) ====

@@ -1,3 +1,6 @@
+2006-04-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * libcompat: added fast_up_depends function, bug #10661
+
2006-04-22 Arwed v. Merkatz <v.merkatz AT gmx.net>
* mozilla.gpg: added the current mozilla signing key (1AF32821)


==== //sgl/grimoires/stable-rc/0.4/audio-libs/wavpack/HISTORY#2 (text) ====

@@ -1,3 +1,7 @@
+2006-04-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * UP_TRIGGERS: replaced 'gaze depends' call with
+ fast_up_depends, bug #10661
+
2005-11-11 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: updated to 4.3
* DEPENDS: removed

==== //sgl/grimoires/stable-rc/0.4/audio-libs/wavpack/UP_TRIGGERS#2 (xtext)
====

@@ -2,7 +2,7 @@
local OLD_SPELL_VERSION=""
spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
if [ "$VERSION" != "$OLD_SPELL_VERSION" ]; then
- for each in $(gaze depends $SPELL 1 | cut -f1 -d:); do
+ for each in $(fast_up_depends $SPELL 1); do
up_trigger $each cast_self
done
fi

==== //sgl/grimoires/stable-rc/0.4/crypto/openssl/HISTORY#2 (text) ====

@@ -1,3 +1,7 @@
+2006-04-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * UP_TRIGGERS: replaced 'gaze depends' call with
+ fast_up_depends, bug #10661
+
2006-02-08 Eric Sandall <eric AT sandall.us>
* DEPENDS: Depends on smgl-fhs (for directory structure)


==== //sgl/grimoires/stable-rc/0.4/crypto/openssl/UP_TRIGGERS#2 (xtext) ====

@@ -3,7 +3,7 @@
local OLD_SPELL_VERSION=""
spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
if [ "${VERSION/[a-z]*/}" != "${OLD_SPELL_VERSION/[a-z]*/}" ]; then
- for each in $(gaze depends $SPELL 1|cut -f1 -d:); do
+ for each in $(fast_up_depends $SPELL 1); do
up_trigger $each cast_self
done
fi

==== //sgl/grimoires/stable-rc/0.4/database/db/HISTORY#2 (text) ====

@@ -1,3 +1,7 @@
+2006-04-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * UP_TRIGGERS: replaced 'gaze depends' call with
+ fast_up_depends, bug #10661
+
2006-02-10 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated SHA512. Some data changed in license files
with no version update. Removed CCACHE and DISTCC.

==== //sgl/grimoires/stable-rc/0.4/database/db/UP_TRIGGERS#2 (xtext) ====

@@ -6,7 +6,7 @@
if test "${VERSION:0:3}" != "${OLD_SPELL_VERSION:0:3}"; then
message "This is a possibly incompatible update of libdb..."
message "Figuring out what spells need to be recast, this may take a
while."
- for each in $(gaze depends $SPELL | cut -f1 -d: | sort | uniq); do
+ for each in $(fast_up_depends $SPELL); do
if gaze install $each | xargs readelf -d 2> /dev/null |
grep -q "NEEDED.*libdb\(\|_cxx\)-${OLD_SPELL_VERSION:0:3}"; then
up_trigger $each cast_self

==== //sgl/grimoires/stable-rc/0.4/database/firebird/HISTORY#2 (text) ====

@@ -1,3 +1,7 @@
+2006-04-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * UP_TRIGGERS: replaced 'gaze depends' call with
+ fast_up_depends, bug #10661
+
2006-02-04 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: cvs version is now firebird2 T2_0_0_Beta2
* PRE_BUILD:

==== //sgl/grimoires/stable-rc/0.4/database/firebird/UP_TRIGGERS#2 (xtext)
====

@@ -7,7 +7,7 @@
if test "${VERSION:0:1}" != "${OLD_SPELL_VERSION:0:1}"; then
message "This is a possibly incompatible update of firebird..."
message "Figuring out what spells need to be recast, this may take a
while."
- for each in $(gaze depends $SPELL 1 | cut -f1 -d: | sort | uniq); do
+ for each in $(fast_up_depends $SPELL 1); do
if gaze install $each | xargs readelf -d 2> /dev/null |
grep -q "NEEDED.*libfbclient.so.${OLD_SPELL_VERSION:0:1}"; then
up_trigger $each cast_self

==== //sgl/grimoires/stable-rc/0.4/gnustep-libs/gnustep-base/HISTORY#2 (text)
====

@@ -1,3 +1,7 @@
+2006-04-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * UP_TRIGGERS: made executable, replaced call to 'gaze depends' with
+ fast_up_depends, bug #10661
+
2006-01-24 Maurizio Boriani <baux AT sourcemage.org>
* DETAILS: Fix license field, close bug#10444.


==== //sgl/grimoires/stable-rc/0.4/gnustep-libs/gnustep-base/UP_TRIGGERS#2
(xtext/text) ====

@@ -5,7 +5,7 @@

if [ $(installed_version gnustep-base) != $VERSION ]
then
- for spell in `gaze depends gnustep-base 2|cut -d":" -f1`
+ for spell in `fast_up_depends $SPELL 2|cut -d":" -f1`
do
up_trigger $spell cast_self
done

==== //sgl/grimoires/stable-rc/0.4/libcompat#2 (xtext) ====

@@ -3,3 +3,12 @@
function sub_depends() {
:
}
+
+#-------------------------------------------------------------------------
+## Grimoire gaze depends alternative
+## Uses gaze depends if the internal sorcery function isn't available
+#-------------------------------------------------------------------------
+declare -f fast_up_depends &> /dev/null ||
+function fast_up_depends() {
+ gaze -q depends --fast "$@"
+}

==== //sgl/grimoires/stable-rc/0.4/libs/expat/HISTORY#2 (text) ====

@@ -1,3 +1,7 @@
+2006-04-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * UP_TRIGGERS: replaced 'gaze depends' call with
+ fast_up_depends, bug #10661
+
2006-01-14 Arwed v. Merkatz <v.merkatz AT gmx.net>
* UP_TRIGGERS: up_trigger everything that needs to be recast due to
the library name change from libexpat.so.0 to libexpat.so.1

==== //sgl/grimoires/stable-rc/0.4/libs/expat/UP_TRIGGERS#2 (xtext) ====

@@ -6,7 +6,7 @@
if test "${VERSION:0:3}" != "${OLD_SPELL_VERSION:0:3}"; then
message "This is a possibly incompatible update of libexpat..."
message "Figuring out what spells need to be recast, this may take a
while."
- for each in $(gaze depends $SPELL | cut -f1 -d: | sort | uniq); do
+ for each in $(fast_up_depends $SPELL); do
if gaze install $each | xargs readelf -d 2> /dev/null |
grep -q "NEEDED.*libexpat.so.0"; then
up_trigger $each cast_self

==== //sgl/grimoires/stable-rc/0.4/perl-cpan/perl/HISTORY#2 (text) ====

@@ -1,3 +1,7 @@
+2006-04-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * UP_TRIGGERS: replaced 'gaze depends' call with
+ fast_up_depends, bug #10661
+
2006-02-02 Sergey Lipnevich <sergey AT sourcemage.org>
* DETAILS: upgrade to 5.8.8; change source location according to
http://www.cpan.org/src/README.html.

==== //sgl/grimoires/stable-rc/0.4/perl-cpan/perl/UP_TRIGGERS#2 (xtext) ====

@@ -1,7 +1,7 @@
local OLD_SPELL_VERSION=""
spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
if [ "$VERSION" != "$OLD_SPELL_VERSION" ]; then
- for name in $(gaze depends --fast perl); do
+ for name in $(fast_up_depends perl); do
if test -f $INSTALL_LOGS/$name-$(installed_version $name); then
if grep -q "$TRACK_ROOT/usr/lib/perl5.*\.pm$" \
$INSTALL_LOGS/$name-$(installed_version $name); then

==== //sgl/grimoires/stable-rc/0.4/printer/cups/HISTORY#2 (text) ====

@@ -1,3 +1,7 @@
+2006-04-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD: replaced 'gaze depends' call with
+ fast_up_depends, bug #10661
+
2005-10-09 Jason Flatt <jflatt AT sourcemage.org>
* DEPENDS: Added missing deps on zlib, jpeg, tiff and libpng.


==== //sgl/grimoires/stable-rc/0.4/printer/cups/PRE_BUILD#2 (xtext) ====

@@ -2,11 +2,11 @@
echo "This spell conflicts with gnulpr and will cause it and any
dependants to be dispelled."

if query "Would you like to see a list of affected spells? " y; then
- gaze depends gnulpr
+ fast_up_depends gnulpr
echo "gnulpr"

if query "Would you like to continue casting? " y; then
- for CASTED_SPELL in `gaze depends gnulpr`; do
+ for CASTED_SPELL in `fast_up_depends gnulpr`; do
if [ "`gaze installed | grep $CASTED_SPELL | cut -d: -f1`"
= "$CASTED_SPELL" ]; then
dispel $CASTED_SPELL
fi
@@ -18,7 +18,7 @@
fi
else
if query "Would you like to continue casting? " y; then
- for CASTED_SPELL in `gaze depends gnulpr`; do
+ for CASTED_SPELL in `fast_up_depends gnulpr`; do
if [ "`gaze installed | grep $CASTED_SPELL | cut -d: -f1`"
= "$CASTED_SPELL" ]; then
dispel $CASTED_SPELL
fi

==== //sgl/grimoires/stable-rc/0.4/printer/gnulpr/HISTORY#2 (text) ====

@@ -1,3 +1,7 @@
+2006-04-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD: replaced 'gaze depends' call with
+ fast_up_depends, bug #10661
+
2005-11-29 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 -> SHA512


==== //sgl/grimoires/stable-rc/0.4/printer/gnulpr/PRE_BUILD#2 (xtext) ====

@@ -2,11 +2,11 @@
echo "This spell conflicts with cups and will cause it and any dependants
to be dispelled."

if query "Would you like to see a list of affected spells? " y; then
- gaze depends cups
+ fast_up_depends cups
echo "cups"

if query "Would you like to continue casting? " y; then
- for CASTED_SPELL in `gaze depends cups`; do
+ for CASTED_SPELL in `fast_up_depends cups`; do
if [ "`gaze installed | grep $CASTED_SPELL | cut -d: -f1`"
= "$CASTED_SPELL" ]; then
dispel $CASTED_SPELL
fi
@@ -18,7 +18,7 @@
fi
else
if query "Would you like to continue casting? " y; then
- for CASTED_SPELL in `gaze depends cups`; do
+ for CASTED_SPELL in `fast_up_depends cups`; do
if [ "`gaze installed | grep $CASTED_SPELL | cut -d: -f1`"
= "$CASTED_SPELL" ]; then
dispel $CASTED_SPELL
fi

==== //sgl/grimoires/stable-rc/0.4/video-libs/gstreamer/HISTORY#2 (text) ====

@@ -1,3 +1,10 @@
+2006-04-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * UP_TRIGGERS: replaced 'gaze depends' call with
+ fast_up_depends, bug #10661
+
+2006-03-11 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.10.4
+
2006-02-08 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: updated to 0.10.3


==== //sgl/grimoires/stable-rc/0.4/video-libs/gstreamer/UP_TRIGGERS#2 (xtext)
====

@@ -4,7 +4,7 @@
local OLD_SPELL_VERSION=""
spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
if [ "${OLD_SPELL_VERSION:0:3}" = "0.8" ]; then
- for each in $(gaze depends $SPELL 1 | cut -f1 -d:); do
+ for each in $(fast_up_depends $SPELL 1); do
up_trigger $each cast_self
done
fi



  • [SM-Commit] PERFORCE change 78592 by Arwed von Merkatz for review, Perforce Review Daemon, 04/28/2006

Archive powered by MHonArc 2.6.24.

Top of Page