summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Orgis2008-08-21 21:32:08 +0200
committerThomas Orgis2008-08-21 21:32:08 +0200
commit231c5878fb94379da315910dc32d62e8f0abffe2 (patch)
tree7f12f2a92df2a4bfccf2d44d43c96c7683c3f037
parent3f121a5af4b3c229654957eb7954fdd1037c1f84 (diff)
parente77551e505fcc52830bca5148686b57c6a1ba3a4 (diff)
Merge with git+ssh://thorgis@scm.sourcemage.org/smgl/grimoire.git
-rwxr-xr-xaudio-creation/jamin/DEPENDS1
-rw-r--r--audio-creation/jamin/HISTORY3
-rwxr-xr-xgraphics/gimp/DETAILS4
-rw-r--r--graphics/gimp/HISTORY3
-rwxr-xr-xkde4-apps/dragonplayer/DEPENDS3
-rw-r--r--kde4-apps/dragonplayer/HISTORY4
6 files changed, 16 insertions, 2 deletions
diff --git a/audio-creation/jamin/DEPENDS b/audio-creation/jamin/DEPENDS
index e9e4e9d19d..3d44e78f67 100755
--- a/audio-creation/jamin/DEPENDS
+++ b/audio-creation/jamin/DEPENDS
@@ -1,5 +1,6 @@
depends glib2 &&
depends gtk+2 &&
+depends xml-parser-expat &&
depends pango &&
depends atk &&
depends libsndfile &&
diff --git a/audio-creation/jamin/HISTORY b/audio-creation/jamin/HISTORY
index 0e3b69ea96..d38e233ed7 100644
--- a/audio-creation/jamin/HISTORY
+++ b/audio-creation/jamin/HISTORY
@@ -1,3 +1,6 @@
+2008-08-21 Martin Spitzbarth <m.spitzbarth@gmx.de>
+ * DEPENDS: added xml-parser-expat as a dependency, fixes bug 12473
+
2006-10-03 Juuso Alasuutari <iuso@sourcemage.org>
* DETAILS: [automated] Removed UPDATED.
diff --git a/graphics/gimp/DETAILS b/graphics/gimp/DETAILS
index d5e7007318..765db086b8 100755
--- a/graphics/gimp/DETAILS
+++ b/graphics/gimp/DETAILS
@@ -1,7 +1,7 @@
SPELL=gimp
- VERSION=2.4.6
+ VERSION=2.4.7
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_HASH=sha512:8a817a00527ed4e3731d6fd350a05ebc1b31263e6df8c7d168a46ef86876b4a3a0a8f9a4e5bf890fe32b893c1c60c7d10959551bdf106eafe176cf6f2efe8626
+ SOURCE_HASH=sha512:ab4e066518dcf1236192db3d6a481aac9dac70b02d0288f1158be043b4ea161aacb3d9a381e419470693181486be89855ac894c6ecdec12ccb17ce0ba10fd467
SOURCE_URL[0]=ftp://ftp.gimp.org/pub/gimp/v${VERSION%.*}/$SOURCE
# SOURCE_GPG=gurus.gpg:$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/graphics/gimp/HISTORY b/graphics/gimp/HISTORY
index 2e03404bac..dee29aad35 100644
--- a/graphics/gimp/HISTORY
+++ b/graphics/gimp/HISTORY
@@ -1,3 +1,6 @@
+2008-08-21 Julien "_kaze_" ROZO <julien@rozo.org>
+ * DETAILS: updated version to 2.4.7
+
2008-08-19 Arjan Bouter <abouter@sourcemage.org>
* DEPENDS: pygtk is optional
diff --git a/kde4-apps/dragonplayer/DEPENDS b/kde4-apps/dragonplayer/DEPENDS
index f493619fe9..addb0cc655 100755
--- a/kde4-apps/dragonplayer/DEPENDS
+++ b/kde4-apps/dragonplayer/DEPENDS
@@ -1,6 +1,9 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&
#depends kdebase4
depends xine-lib &&
+
+source $GRIMOIRE/FUNCTIONS &&
+
if check_if_xorg_modular_libs qt4 ; then
sub_depends xine-lib libxcb
fi
diff --git a/kde4-apps/dragonplayer/HISTORY b/kde4-apps/dragonplayer/HISTORY
index 12b2bb7871..f0af3b7cdd 100644
--- a/kde4-apps/dragonplayer/HISTORY
+++ b/kde4-apps/dragonplayer/HISTORY
@@ -1,3 +1,7 @@
+2008-08-20 Julien "_kaze_" ROZO <julien@rozo.org>
+ * DEPENDS: added source $GRIMOIRE/FUNCTIONS to make
+ check_if_xorg_modular_libs function available
+
2008-02-28 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 2.0.1