[SM-Commit] GIT changes to master grimoire by Florian Franzmann (e9643e2499b609b7372abf72bfe4e329d535a7c7)

Florian Franzmann scm at sourcemage.org
Wed Oct 5 06:47:13 EDT 2011


GIT changes to master grimoire by Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>:

 graphics/gimp/HISTORY   |    6 ++++++
 graphics/gimp/INSTALL   |    4 ++++
 graphics/gimp/PRE_BUILD |    2 ++
 3 files changed, 12 insertions(+)

New commits:
commit ba162c5a8778db47eb098ef5265ad7110b276777
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    graphics/gimp: create gimp symlink for devel branch

commit b8ba6d97e7b04d1025bc3a7d963a651eb1fd807d
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    graphics/gimp: fixed patch error when devel branch is build

diff --git a/graphics/gimp/HISTORY b/graphics/gimp/HISTORY
index 24dd84f..607c0cd 100644
--- a/graphics/gimp/HISTORY
+++ b/graphics/gimp/HISTORY
@@ -1,3 +1,9 @@
+2011-10-05 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* PRE_BUILD: don't apply gimp-poppler-0.18.patch.bz2 if
+	  devel branch is built
+	* INSTALL: create /usr/bin/gimp symlink if devel version
+	  is built
+
 2011-10-01 Vlad Glagolev <stealth at sourcemage.org>
 	* PRE_BUILD: added, to apply the patch
 	* gimp-poppler-0.18.patch.bz2: added, fixes compilation with poppler 0.18
diff --git a/graphics/gimp/INSTALL b/graphics/gimp/INSTALL
new file mode 100755
index 0000000..e81a84d
--- /dev/null
+++ b/graphics/gimp/INSTALL
@@ -0,0 +1,4 @@
+default_install &&
+if [[ $GIMP_DEVEL == y ]]; then
+  ln -sf /usr/bin/gimp-$(echo ${VERSION}|sed -e 's/\.[0-9]\+$//') ${INSTALL_ROOT}/usr/bin/gimp
+fi
diff --git a/graphics/gimp/PRE_BUILD b/graphics/gimp/PRE_BUILD
index 011c1ef..e068fe8 100755
--- a/graphics/gimp/PRE_BUILD
+++ b/graphics/gimp/PRE_BUILD
@@ -1,6 +1,8 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
+if [[ $GIMP_DEVEL == n ]]; then
 if is_depends_enabled $SPELL poppler; then
   bzcat "$SPELL_DIRECTORY/gimp-poppler-0.18.patch.bz2" | patch -p1
 fi
+fi


More information about the SM-Commit mailing list