summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2009-08-12 14:30:58 +0000
committerJustin Lecher <jlec@gentoo.org>2009-08-12 14:30:58 +0000
commit9f6bc793708c3f38ded152fa6db12992ab196138 (patch)
treeee421ed4a5db7f8d4b0fdd7b6cc06a349a34271a /media-gfx/gimp-cmyk-plugin/files
parentdev-python/eventlet: New version and test additions. Thanks to Tommy[D] (diff)
downloadsunrise-9f6bc793708c3f38ded152fa6db12992ab196138.tar.gz
sunrise-9f6bc793708c3f38ded152fa6db12992ab196138.tar.bz2
sunrise-9f6bc793708c3f38ded152fa6db12992ab196138.zip
media-gfx/gimp-cmyk-plugin: version bump, CC, LDFLAGS and CFLAGS are respected now, keyworded for ~amd64, make use of base.eclass
svn path=/sunrise/; revision=9003
Diffstat (limited to 'media-gfx/gimp-cmyk-plugin/files')
-rw-r--r--media-gfx/gimp-cmyk-plugin/files/0.5.4-Makefile.patch51
-rw-r--r--media-gfx/gimp-cmyk-plugin/files/installer.patch10
2 files changed, 51 insertions, 10 deletions
diff --git a/media-gfx/gimp-cmyk-plugin/files/0.5.4-Makefile.patch b/media-gfx/gimp-cmyk-plugin/files/0.5.4-Makefile.patch
new file mode 100644
index 000000000..4a3dc86e1
--- /dev/null
+++ b/media-gfx/gimp-cmyk-plugin/files/0.5.4-Makefile.patch
@@ -0,0 +1,51 @@
+--- separate+-0.5.4/Makefile 2009-07-20 02:42:00.000000000 +0200
++++ separate+-0.5.4/Makefile.new 2009-08-12 16:20:56.000000000 +0200
+@@ -27,9 +27,9 @@
+ # remove "-DSEPARATE_SEPARATE".
+ CM = -DENABLE_COLOR_MANAGEMENT
+ NLS = -DENABLE_NLS -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""
+-CFLAGS = $(GIMP_INCLUDE) $(GTK_INCLUDE) $(LCMS_INCLUDE) -O3 -Wall $(CM) $(NLS) \
++CFLAGS += $(GIMP_INCLUDE) $(GTK_INCLUDE) $(LCMS_INCLUDE) $(CM) $(NLS) \
+ -DSEPARATE_SEPARATE -DUSE_ICC_BUTTON
+-LDFLAGS = $(GIMP_LIB) $(GTK_LIB) $(LCMS_LIB) $(TIFF_LIB)
++LIBS = $(GIMP_LIB) $(GTK_LIB) $(LCMS_LIB) $(TIFF_LIB)
+
+ SOURCES = $(SEPARATE_SOURCES) $(IMPORT_SOURCES) \
+ $(ICC_COLORSPACE_SOURCES) $(EXTRA_SOURCES)
+@@ -68,21 +68,21 @@
+ clean: clean-plugins clean-catalogs
+
+ catalogs:
+- cd po && $(MAKE)
++ $(MAKE) -C po
+
+ plugins: $(TARGETS)
+
+ separate: $(SEPARATE_OBJECTS)
+- $(CC) $(SEPARATE_OBJECTS) -o $@ $(LDFLAGS)
++ $(CC) $(LDFLAGS) $(SEPARATE_OBJECTS) -o $@ $(LIBS)
+
+ separate_import: $(IMPORT_OBJECTS)
+- $(CC) $(IMPORT_OBJECTS) -o $@ $(LDFLAGS)
++ $(CC) $(LDFLAGS) $(IMPORT_OBJECTS) -o $@ $(LIBS)
+
+ icc_colorspace: $(ICC_COLORSPACE_OBJECTS)
+- $(CC) $(ICC_COLORSPACE_OBJECTS) -o $@ $(LDFLAGS)
++ $(CC) $(LDFLAGS) $(ICC_COLORSPACE_OBJECTS) -o $@ $(LIBS)
+
+ install-catalogs:
+- cd po && $(MAKE) install
++ $(MAKE) -C po install
+
+ install-plugins: $(TARGETS)
+ install -c $^ "$(INSTALLDIR)"
+--- separate+-0.5.4/Makefile 2009-08-12 16:21:22.000000000 +0200
++++ separate+-0.5.4/Makefile.new 2009-08-12 16:22:16.000000000 +0200
+@@ -85,6 +85,7 @@
+ $(MAKE) -C po install
+
+ install-plugins: $(TARGETS)
++ mkdir -p "$(INSTALLDIR)"
+ install -c $^ "$(INSTALLDIR)"
+
+ install: install-plugins install-catalogs
diff --git a/media-gfx/gimp-cmyk-plugin/files/installer.patch b/media-gfx/gimp-cmyk-plugin/files/installer.patch
deleted file mode 100644
index 2f33f6260..000000000
--- a/media-gfx/gimp-cmyk-plugin/files/installer.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- separate+-0.5.3/Makefile 2008-08-11 05:00:08.000000000 -0400
-+++ separate+-0.5.3.new/Makefile 2009-05-26 12:52:22.000000000 -0400
-@@ -85,6 +85,7 @@
- cd po && $(MAKE) install
-
- install-plugins: $(TARGETS)
-+ mkdir -p "$(INSTALLDIR)"
- install -c $^ "$(INSTALLDIR)"
-
- install: install-plugins install-catalogs