Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (958752e145e5bf49c932d7210a28546531cbe86a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (958752e145e5bf49c932d7210a28546531cbe86a)
  • Date: Wed, 25 Mar 2009 12:55:23 -0500

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

xorg-lib/libx11/DETAILS | 6 +++---
xorg-lib/libx11/HISTORY | 3 ---
xorg-lib/libx11/libX11-1.1.5.tar.bz2.sig |binary
xorg-lib/libxcb/DEPENDS | 2 +-
xorg-lib/libxcb/DETAILS | 4 ++--
xorg-lib/libxcb/HISTORY | 8 --------
xorg-lib/libxcb/UP_TRIGGERS | 17 -----------------
7 files changed, 6 insertions(+), 34 deletions(-)

New commits:
commit 958752e145e5bf49c932d7210a28546531cbe86a
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

Revert "libx11: => 1.2"

needs libxcb 1.2 15104 (http://bugs.sourcemage.org/show_bug.cgi?id=15111)

This reverts commit a4f60cf8487cf12a12a9d127ee6f1caf322972bc.

commit bc0b86c2bd270df2f356f1d36cd76605a94ae289
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

Revert "libxcb: => 1.2"

http://bugs.sourcemage.org/show_bug.cgi?id=15104

This reverts commit 9cbbde905788e41e90590d6c82deefc9fa67bd51.

commit 91de8aa8dcfda3eb11c4525dc11f81ef79663dd3
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

Revert "libxcb: added UP_TRIGGERS for bug 15104"

reverted as part of http://bugs.sourcemage.org/show_bug.cgi?id=15104

This reverts commit c22211f89e8fb54aa024d66b2b54cec851d8fa87.

diff --git a/xorg-lib/libx11/DETAILS b/xorg-lib/libx11/DETAILS
index 3b5b257..810a8d3 100755
--- a/xorg-lib/libx11/DETAILS
+++ b/xorg-lib/libx11/DETAILS
@@ -1,11 +1,11 @@
SPELL=libx11
PKG=libX11
- VERSION=1.2
-
SOURCE_HASH=sha512:a1ab18f44ff703298d8eadc951b09b061f802cd63d30c2d9c45667b03d03554449a202437e1b022417340fdf306c1c0d7726cef85a623a6c6ef825cc54f59a39
+ VERSION=1.1.5
XORG_VER=X11R7.0
SOURCE=${PKG}-${VERSION}.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/lib/${SOURCE}
-# SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+#
SOURCE_HASH=sha512:16dfd76ae13e33652af1de0936a75256726d9e6fe5a2ecc8c724459a9c8e6d271c56374f58236797c8de5e463269c50423da148cde734ae0a05600081934dcf3
+ 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 6b7320d..b19a2f8 100644
--- a/xorg-lib/libx11/HISTORY
+++ b/xorg-lib/libx11/HISTORY
@@ -1,6 +1,3 @@
-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
new file mode 100644
index 0000000..023a0a9
Binary files /dev/null and b/xorg-lib/libx11/libX11-1.1.5.tar.bz2.sig differ
diff --git a/xorg-lib/libxcb/DEPENDS b/xorg-lib/libxcb/DEPENDS
index 2fbd59b..a52dcd3 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.2 ]] || [[ $xcb_version == 1.0 || $xcb_version ==
0.9.93 ]]; then
+if [[ $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 df99736..beffa70 100755
--- a/xorg-lib/libxcb/DETAILS
+++ b/xorg-lib/libxcb/DETAILS
@@ -1,8 +1,8 @@
SPELL=libxcb
- VERSION=1.2
-
SOURCE_HASH=sha512:4c3800a86e2cdbbf4d99f930c43bf5891e69c1e1bfd2a5dc8fe4e64a0114ef35e2dcd79318a273f849cb1ad344885fed527dccdf46640ee813e4e3101d2065e6
+ VERSION=1.1
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 87ecd96..0ef0c8b 100644
--- a/xorg-lib/libxcb/HISTORY
+++ b/xorg-lib/libxcb/HISTORY
@@ -1,11 +1,3 @@
-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
deleted file mode 100755
index 63ec7e9..0000000
--- a/xorg-lib/libxcb/UP_TRIGGERS
+++ /dev/null
@@ -1,17 +0,0 @@
-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
-




Archive powered by MHonArc 2.6.24.

Top of Page