Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.26 grimoire by Arwed von Merkatz (c4580295cbad30bab060a054b041721df64f341c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.26 grimoire by Arwed von Merkatz (c4580295cbad30bab060a054b041721df64f341c)
  • Date: Wed, 15 Oct 2008 10:32:36 -0500

GIT changes to stable-0.26 grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

VERSION | 2 +-
disk/udev/HISTORY | 3 +++
disk/udev/SUB_DEPENDS | 5 +++++
graphics/gimp/DETAILS | 4 ++--
graphics/gimp/HISTORY | 3 +++
x11-libs/cairo/DETAILS | 1 +
x11-libs/cairo/HISTORY | 7 +++++++
x11-libs/cairo/PRE_SUB_DEPENDS | 2 ++
x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS | 7 +++++++
x11-libs/cairo/SUB_DEPENDS | 4 ++++
x11-toolkits/gtk+2/CONFLICTS | 2 +-
x11-toolkits/gtk+2/DEPENDS | 2 +-
x11-toolkits/gtk+2/HISTORY | 3 +++
13 files changed, 40 insertions(+), 5 deletions(-)

New commits:
commit c4580295cbad30bab060a054b041721df64f341c
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

VERSION: 0.26-1

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

udev: fixed regression bug about VOLUME_ID subdep

(cherry-picked from commit b51a4d59f24da864ae04364435ad08c090e7c1f8)

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

cairo: repairing the previous subdeps

(cherry-picked from commit ce3a733f7ce000ef3e20c1a6b68d442700928ddc)

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

gtk+2: use cairo's PS subdep (prolly fixes #14811)

(cherry-picked from commit 7266b59ec5428ac3fc72e6ebc9434529d88c08ab)

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

cairo: added PS subdep

(cherry-picked from commit 8cbbb132200fc633daa9b78f9692ead504102a89)

commit 5fb04f175af947a0ea43aa2a1ae8eef6653f09a6
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

cairo: patchlevel=1 for the new XCB sub_depends

commit ce1e51868b36f0541f1b47049302fb2e05f4dd85
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

cairo: fixed a typo. --enable xcb -> --enable-xcb

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

cairo: added XCB to PRE_SUB_DEPENDS and SUB_DEPENDS

(cherry-picked from commit 6ae2c85b86493ebad1aff631fbf19c586e0c5fea)

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

gimp: new SOURCE_HASH, a new tarball has been uploaded
http://dcs.unob.cz/~hgr/SOURCE-MAGE/gimp-2.6.0.diff

(cherry-picked from commit 08ae5f801b17040802bbbff58770023ad56ea84a)

diff --git a/VERSION b/VERSION
index 0d7ec16..dd3b71c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.26-0
+0.26-1
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index a11b82c..4fa02a1 100755
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,6 @@
+2008-10-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * SUB_DEPENDS: fixed regression bug
+
2008-10-04 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1, fixed a number of bugs caused by parsing
order
* rules.d/70-cdrom_perms.rules: renamed to 76-*
diff --git a/disk/udev/SUB_DEPENDS b/disk/udev/SUB_DEPENDS
new file mode 100755
index 0000000..9dcaf32
--- /dev/null
+++ b/disk/udev/SUB_DEPENDS
@@ -0,0 +1,5 @@
+case "$THIS_SUB_DEPENDS" in
+ VOLUME_ID) true;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" &&
+ return 1;;
+esac
diff --git a/graphics/gimp/DETAILS b/graphics/gimp/DETAILS
index 5e5a5cb..b0ccdab 100755
--- a/graphics/gimp/DETAILS
+++ b/graphics/gimp/DETAILS
@@ -2,12 +2,12 @@
if [ "$GIMP_DEVEL" == "y" ]; then
VERSION=2.6.0
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:d751cb5aea72784591b74c63f2aea8cf44e9ae6fe7bb25992fabed9a73808ec6756db1ab8c2046901ec9c0386fdc535fc1e706c581440cb543885175053b9a65
+
SOURCE_HASH=sha512:8b5f0f828029591ae0e1b7fd526c4ed2531af74239f773d3f47ca7d1245c6d71f3d97cb528765137938dfc902c457201308afac3d68113a59ad4f14a9a105c60
SOURCE_URL[0]=ftp://ftp.gimp.org/pub/gimp/v${VERSION%.*}/$SOURCE
else
VERSION=2.6.0
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:d751cb5aea72784591b74c63f2aea8cf44e9ae6fe7bb25992fabed9a73808ec6756db1ab8c2046901ec9c0386fdc535fc1e706c581440cb543885175053b9a65
+
SOURCE_HASH=sha512:8b5f0f828029591ae0e1b7fd526c4ed2531af74239f773d3f47ca7d1245c6d71f3d97cb528765137938dfc902c457201308afac3d68113a59ad4f14a9a105c60
SOURCE_URL[0]=ftp://ftp.gimp.org/pub/gimp/v${VERSION%.*}/$SOURCE
# SOURCE_GPG=gurus.gpg:$SOURCE.sig
fi
diff --git a/graphics/gimp/HISTORY b/graphics/gimp/HISTORY
index a1e60cf..e8eb503 100644
--- a/graphics/gimp/HISTORY
+++ b/graphics/gimp/HISTORY
@@ -1,4 +1,7 @@
2008-10-01 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: updated SOURCE_HASH, a new tarball has been uploaded
+
+2008-10-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.6.0
* DEPENDS: stable version now also depends on gegl and iso-codes

diff --git a/x11-libs/cairo/DETAILS b/x11-libs/cairo/DETAILS
index 2821ad7..e091ce6 100755
--- a/x11-libs/cairo/DETAILS
+++ b/x11-libs/cairo/DETAILS
@@ -15,6 +15,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_GPG=gurus.gpg:$SOURCE.sig
LICENSE[0]=MIT
ENTERED=20040617
+ PATCHLEVEL=1
KEYWORDS="x11 libs"
SHORT="multi-platform 2D graphics library"
cat << EOF
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index bd45259..a39f36b 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,10 @@
+2008-10-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * [PRE_]SUB_DEPENDS: added ps subdep for new gtk+2
+ * REPAIR^all^PRE_SUB_DEPENDS: added, for repairing the previous
subdeps
+
+2008-10-06 Arjan Bouter <abouter AT sourcemage.org>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: added XCB
+
2008-09-26 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.8.0
* DEPENDS: added ps option; force_depends pixman on old installations
diff --git a/x11-libs/cairo/PRE_SUB_DEPENDS b/x11-libs/cairo/PRE_SUB_DEPENDS
index c8fd97e..4aba94b 100755
--- a/x11-libs/cairo/PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/PRE_SUB_DEPENDS
@@ -1,5 +1,7 @@
case $THIS_SUB_DEPENDS in
PDF) is_depends_enabled $SPELL poppler;;
+ XCB) is_depends_enabled $SPELL xcb-util;;
+ PS) is_depends_enabled $SPELL ghostscript;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac
diff --git a/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..4aba94b
--- /dev/null
+++ b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,7 @@
+case $THIS_SUB_DEPENDS in
+ PDF) is_depends_enabled $SPELL poppler;;
+ XCB) is_depends_enabled $SPELL xcb-util;;
+ PS) is_depends_enabled $SPELL ghostscript;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/x11-libs/cairo/SUB_DEPENDS b/x11-libs/cairo/SUB_DEPENDS
index 8538618..10e6792 100755
--- a/x11-libs/cairo/SUB_DEPENDS
+++ b/x11-libs/cairo/SUB_DEPENDS
@@ -1,6 +1,10 @@
case $THIS_SUB_DEPENDS in
PDF) message "Cairo with PDF support requested, forcing poppler
dependency" &&
depends poppler "--enable-pdf";;
+ XCB) message "Cairo with XCB support requested, forcing xcb-util
dependency" &&
+ depends xcb-util "--enable-xcb";;
+ PS) message "Cairo with PS support requested, forcing ghostscript
dependency" &&
+ depends ghostscript "--enable-ps";;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac
diff --git a/x11-toolkits/gtk+2/CONFLICTS b/x11-toolkits/gtk+2/CONFLICTS
index 6b3a6c8..50f6d21 100755
--- a/x11-toolkits/gtk+2/CONFLICTS
+++ b/x11-toolkits/gtk+2/CONFLICTS
@@ -1 +1 @@
-conflicts gail y
\ No newline at end of file
+conflicts gail y
diff --git a/x11-toolkits/gtk+2/DEPENDS b/x11-toolkits/gtk+2/DEPENDS
index 1f99077..5965ac2 100755
--- a/x11-toolkits/gtk+2/DEPENDS
+++ b/x11-toolkits/gtk+2/DEPENDS
@@ -1,7 +1,7 @@
depends glib2 &&
depends atk &&
depends pango &&
-depends -sub PDF cairo &&
+depends -sub "PDF PS" cairo &&
depends xorg-libs &&
depends libxrender &&

diff --git a/x11-toolkits/gtk+2/HISTORY b/x11-toolkits/gtk+2/HISTORY
index cd8b3d7..e345374 100644
--- a/x11-toolkits/gtk+2/HISTORY
+++ b/x11-toolkits/gtk+2/HISTORY
@@ -1,3 +1,6 @@
+2008-10-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added PS subdep for cairo (required)
+
2008-09-26 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: fixed deps
* DETAILS: fixed descs



  • [SM-Commit] GIT changes to stable-0.26 grimoire by Arwed von Merkatz (c4580295cbad30bab060a054b041721df64f341c), Arwed von Merkatz, 10/15/2008

Archive powered by MHonArc 2.6.24.

Top of Page