Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (424cf3d07d80d2d776dc1c11c4e749755bc88606)

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 master grimoire by Arwed von Merkatz (424cf3d07d80d2d776dc1c11c4e749755bc88606)
  • Date: Mon, 12 Apr 2010 11:12:03 -0500

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

disk/attr/DETAILS | 2 +-
disk/attr/HISTORY | 3 +++
x11-toolkits/gtk+2/DEPENDS | 10 +---------
x11-toolkits/gtk+2/HISTORY | 6 ++++++
x11-toolkits/gtk+2/PRE_BUILD | 5 -----
5 files changed, 11 insertions(+), 15 deletions(-)

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

gtk+2: always requires cairo with SVG, bug 15664

commit dc3f3cf3e4b885982fc0f0315bc2d2c7458c926d
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

attr: fixed SOURCE_HASH, bug 15663

diff --git a/disk/attr/DETAILS b/disk/attr/DETAILS
index 4da245a..dc30c41 100755
--- a/disk/attr/DETAILS
+++ b/disk/attr/DETAILS
@@ -3,7 +3,7 @@
SOURCE=$SPELL-$VERSION.src.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://mirror.lihnidos.org/GNU/savannah/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:9b02b7799ca1250b285b8bb65f38ab221cd6a76d16808e507cc5bbba229746bedb6409c49a6ecf18b0cffc269c75deca9b352b19d4cb7256a38f67b8a8fa55af
+
SOURCE_HASH=sha512:dcb759f042296881e12463c76bc53c7c5ca2d158834777c6502a3d24ab34f8100d3a5974eabb73b7ccad98ca0413918401f63301e4a5ba61cef1d0d483257371
WEB_SITE=http://oss.sgi.com/projects/xfs/
ENTERED=20020219
LICENSE[0]=GPL
diff --git a/disk/attr/HISTORY b/disk/attr/HISTORY
index 16e88fc..436f0d4 100644
--- a/disk/attr/HISTORY
+++ b/disk/attr/HISTORY
@@ -1,3 +1,6 @@
+2010-04-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: fixed SOURCE_HASH, bug #15663
+
2010-03-17 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: corrected source url

diff --git a/x11-toolkits/gtk+2/DEPENDS b/x11-toolkits/gtk+2/DEPENDS
index 739b566..fa78872 100755
--- a/x11-toolkits/gtk+2/DEPENDS
+++ b/x11-toolkits/gtk+2/DEPENDS
@@ -1,20 +1,12 @@
depends glib2 &&
depends atk &&
depends pango &&
-depends -sub "PDF PS X" cairo &&
+depends -sub "PDF PS SVG X" cairo &&
depends libsm &&
depends libxext &&
depends libxcursor &&
depends libxrender &&

-if spell_ok $SPELL; then
- if spell_ok cairo; then
- # sub_depend on svg support in cair for file
- # print backend, requires this hack due to
- # circular dependency
- sub_depends cairo SVG
- fi
-fi &&
optional_depends libpng \
"--with-libpng" \
"--without-libpng" \
diff --git a/x11-toolkits/gtk+2/HISTORY b/x11-toolkits/gtk+2/HISTORY
index 101a2bc..b7fef1d 100644
--- a/x11-toolkits/gtk+2/HISTORY
+++ b/x11-toolkits/gtk+2/HISTORY
@@ -1,3 +1,9 @@
+2010-04-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: always sub_depend on SVG in cairo, the circular dependency
+ is gone and it's required now, bug #15664
+ * PRE_BUILD: removed, not needed anymore because SVG in cairo is
+ always required to be there
+
2010-03-30 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated GTK_VER=stable to 2.20.0

diff --git a/x11-toolkits/gtk+2/PRE_BUILD b/x11-toolkits/gtk+2/PRE_BUILD
deleted file mode 100755
index 9cf74aa..0000000
--- a/x11-toolkits/gtk+2/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-if [[ ! -f $INSTALL_ROOT/usr/include/cairo/cairo-svg.h ]]; then
-sed -i 's/SUBDIRS = file/SUBDIRS = /' modules/printbackends/Makefile.in
-fi



  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (424cf3d07d80d2d776dc1c11c4e749755bc88606), Arwed von Merkatz, 04/12/2010

Archive powered by MHonArc 2.6.24.

Top of Page