New commits:
commit 96e63e01af4b7b4be75fdeb5c1577d97724d43a9
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
Revert "Revert "libxcb: added UP_TRIGGERS for bug 15104""
This reverts commit 91de8aa8dcfda3eb11c4525dc11f81ef79663dd3.
We don't want this reverted in devel-xorg-modular
commit 6c72bf894311ecb9a38298a2be8a3327dc66e0db
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
Revert "Revert "libxcb: => 1.2""
This reverts commit bc0b86c2bd270df2f356f1d36cd76605a94ae289.
We don't want this reverted in devel-xorg-modular
commit 66db1a58913262e5ed6f91d8a0a9458c113fe933
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
Revert "Revert "libx11: => 1.2""
This reverts commit 958752e145e5bf49c932d7210a28546531cbe86a.
We don't want this reverted in devel-xorg-modular
commit a44b97cde3356a829cf3d40c6f18f07486008b9d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
Revert "Revert "libxext: => 1.0.5". Will not build with current version"
This reverts commit 22aa148f11093753569f00729c69b6e2efc5e245.
We don't want this reverted in devel-xorg-modular
I need to be more careful with my merges. :)
commit 6b8621b68d378638518949d3dbad2461eb2c7b37
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
Revert "Revert "xextproto: => 7.0.5""
This reverts commit 3f261b337860cba6f0ec4ca94be0e3f4f9aabb0a.
We don't want this reverted in devel-xorg-modular
commit 47e31b0c61f4e019af961ca95f39934f50c91c76
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
Revert "Revert "xproto: Updated to 7.0.15". Caused libx11 1.1.5 to fail
as"
This reverts commit decde2addb430af49b51b87addc9bc4adb7f638b.
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/lib/${SOURCE}
-#
SOURCE_HASH=sha512:16dfd76ae13e33652af1de0936a75256726d9e6fe5a2ecc8c724459a9c8e6d271c56374f58236797c8de5e463269c50423da148cde734ae0a05600081934dcf3
- SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+# SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org/wiki
ENTERED=20051125
diff --git a/xorg-lib/libx11/HISTORY b/xorg-lib/libx11/HISTORY
index b19a2f8..6b7320d 100644
--- a/xorg-lib/libx11/HISTORY
+++ b/xorg-lib/libx11/HISTORY
@@ -1,3 +1,6 @@
+2009-02-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2
+
2008-10-12 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.1.5
diff --git a/xorg-lib/libx11/libX11-1.1.5.tar.bz2.sig
b/xorg-lib/libx11/libX11-1.1.5.tar.bz2.sig
deleted file mode 100644
index 023a0a9..0000000
Binary files a/xorg-lib/libx11/libX11-1.1.5.tar.bz2.sig and /dev/null differ
diff --git a/xorg-lib/libxcb/DEPENDS b/xorg-lib/libxcb/DEPENDS
index a52dcd3..2fbd59b 100755
--- a/xorg-lib/libxcb/DEPENDS
+++ b/xorg-lib/libxcb/DEPENDS
@@ -1,6 +1,6 @@
depends xcb-proto &&
local xcb_version=$(installed_version xcb-proto) &&
-if [[ $xcb_version == 1.0 || $xcb_version == 0.9.93 ]]; then
+if [[ $xcb_version == 1.2 ]] || [[ $xcb_version == 1.0 || $xcb_version ==
0.9.93 ]]; then
force_depends xcb-proto
fi &&
depends libpthread-stubs &&
diff --git a/xorg-lib/libxcb/DETAILS b/xorg-lib/libxcb/DETAILS
index beffa70..df99736 100755
--- a/xorg-lib/libxcb/DETAILS
+++ b/xorg-lib/libxcb/DETAILS
@@ -1,8 +1,8 @@
SPELL=libxcb
- VERSION=1.1
+ VERSION=1.2
+
SOURCE_HASH=sha512:4c3800a86e2cdbbf4d99f930c43bf5891e69c1e1bfd2a5dc8fe4e64a0114ef35e2dcd79318a273f849cb1ad344885fed527dccdf46640ee813e4e3101d2065e6
SOURCE="$SPELL-$VERSION.tar.bz2"
SOURCE_URL[0]=http://xcb.freedesktop.org/dist/$SOURCE
-
SOURCE_HASH=sha512:c071a683d4ff5560a8f85e9e7d2816cd4d73552f3efe7791ab2367776b4b00974b917729141fbc0c94c7abe4cc858ce82143375359cc8ee292f28813c4afc1a8
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
WEB_SITE=http://xcb.freedesktop.org
LICENSE[0]=XCL
diff --git a/xorg-lib/libxcb/HISTORY b/xorg-lib/libxcb/HISTORY
index 0ef0c8b..87ecd96 100644
--- a/xorg-lib/libxcb/HISTORY
+++ b/xorg-lib/libxcb/HISTORY
@@ -1,3 +1,11 @@
+2009-03-07 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * UP_TRIGGERS: added to recast all spells linking to the old soname,
+ bug 15104
+ * DEPENDS: updated force_depend condition
+
+2009-02-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2
+
2008-08-30 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DEPENDS: force_depend on xcb-proto if it is too old
diff --git a/xorg-lib/libxcb/UP_TRIGGERS b/xorg-lib/libxcb/UP_TRIGGERS
new file mode 100755
index 0000000..63ec7e9
--- /dev/null
+++ b/xorg-lib/libxcb/UP_TRIGGERS
@@ -0,0 +1,17 @@
+local OLD_SPELL_VERSION=""
+if spell_ok $SPELL; then
+ OLD_SPELL_VERSION="$(installed_version $SPELL)"
+ if [[ ${OLD_SPELL_VERSION:0:3} != ${VERSION:0:3} ]] && [[ ${VERSION:0:3}
== 1.2 ]]; then
+ message "This is a possibly incompatible update of $SPELL..."
+ message "Figuring out what spells need to be recast, this may take a
while."
+ for each in $(show_up_depends $SPELL); do
+ if [[ $each != $SPELL ]]; then
+ if gaze install $each | xargs readelf -d 2> /dev/null |
+ grep -q "NEEDED.*libxcb.*.so"; then
+ up_trigger $each cast_self
+ fi
+ fi
+ done
+ fi
+fi
+
diff --git a/xorg-lib/libxext/DETAILS b/xorg-lib/libxext/DETAILS
index 391b4d5..c93a1ea 100755
--- a/xorg-lib/libxext/DETAILS
+++ b/xorg-lib/libxext/DETAILS
@@ -1,10 +1,10 @@
SPELL=libxext
PKG=libXext
- VERSION=1.0.4
+ VERSION=1.0.5
+
SOURCE_HASH=sha512:29fc6eebd585f68d7014fc1ed0154fe24feec7de7d4481130547ca56e57ddf0aae75e4186ce3fc3d9115418ebc9f88144d43ec11719227c0a8ac5d7d162ec1c2
XORG_VER=X11R7.1
SOURCE=${PKG}-${VERSION}.tar.bz2