gimp: add 2.3.19, unify old recipes

diff --git a/packages/gimp/gimp.inc b/packages/gimp/gimp.inc
new file mode 100644 (file)
index 0000000..7a75f7d
--- /dev/null
+++ b/packages/gimp/gimp.inc
@@ -0,0 +1,38 @@
+DESCRIPTION = "The GIMP is the GNU Image Manipulation Program."
+HOMEPAGE = "http://www.gimp.org"
+SECTION = "x11/graphics"
+LICENSE = "GPL"
+
+DEPENDS = "sed-native libart-lgpl gtk+ jpeg libpng libexif tiff"
+
+SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2 \
+                 file://configure-libwmf.patch;patch=1"
+
+inherit autotools pkgconfig
+
+FILES_gimp-dbg =+ "${libdir}/gimp/2.0/modules/.debug \
+                   ${libdir}/gimp/2.0/plug-ins/.debug"
+
+#Don't laugh, this just builds a threaded gimp
+EXTRA_OECONF = " --disable-gtktest \
+                --disable-print \
+                --disable-python \
+                --enable-mp \
+                --without-libwmf"
+
+do_configure_append() {
+        find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
+}
+
+
+do_stage() {
+        autotools_stage_all
+}
+
+FILES_${PN} += "${datadir}/icons \
+                ${datadir}/mime-info \
+               ${datadir}/application-registry "
+
+FILES_${PN}-dbg += "${libdir}/gimp/2.0/plug-ins/.debug \
+                    ${libdir}/gimp/2.0/modules/.debug"
+

diff --git a/packages/gimp/gimp_2.2.10.bb b/packages/gimp/gimp_2.2.10.bb
index 10242e2..3719e2d 100644 (file)
--- a/packages/gimp/gimp_2.2.10.bb
+++ b/packages/gimp/gimp_2.2.10.bb
@@ -1,21 +1,4 @@
-DESCRIPTION =  "The GIMP is the GNU Image Manipulation Program."
-HOMEPAGE =     "http://www.gimp.org"
-SECTION = "x11/graphics"
-LICENSE =      "GPL"
+require gimp.inc
 PR = "r1"
 
-SRC_URI =      "ftp://ftp.gimp.org/pub/gimp/v2.2/gimp-${PV}.tar.bz2"
-
-DEPENDS =      "gtk+ jpeg libpng libexif"
-
-inherit autotools pkgconfig
-#Don't laugh, this just builds a threaded gimp
-EXTRA_OECONF =         " --disable-gtktest \
-               --without-libtiff \
-               --disable-print \
-               --enable-mp"
-
-do_configure_append() {
-    find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
-}
 

diff --git a/packages/gimp/gimp_2.3.10.bb b/packages/gimp/gimp_2.3.10.bb
index f43140e..b06687c 100644 (file)
--- a/packages/gimp/gimp_2.3.10.bb
+++ b/packages/gimp/gimp_2.3.10.bb
@@ -1,35 +1,3 @@
-DESCRIPTION = "The GIMP is the GNU Image Manipulation Program."
-HOMEPAGE = "http://www.gimp.org"
-SECTION = "x11/graphics"
-LICENSE = "GPL"
-PR = "r2"
-
-DEPENDS = "sed-native libart-lgpl gtk+ jpeg libpng libexif tiff"
-
-SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2 \
-                 file://configure-libwmf.patch;patch=1"
-
-inherit autotools pkgconfig
-
-FILES_gimp-dbg =+ "${libdir}/gimp/2.0/modules/.debug \
-                   ${libdir}/gimp/2.0/plug-ins/.debug"
-
-#Don't laugh, this just builds a threaded gimp
-EXTRA_OECONF = " --disable-gtktest \
-                --disable-print \
-                --disable-python \
-                --enable-mp \
-                --without-libwmf"
-
-do_configure_append() {
-        find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
-}
-
-
-FILES_${PN} += "${datadir}/icons \
-                ${datadir}/mime-info \
-               ${datadir}/application-registry "
-
-FILES_${PN}-dbg += "${libdir}/gimp/2.0/plug-ins/.debug \
-                    ${libdir}/gimp/2.0/modules/.debug"
+require gimp.inc
+PR = "r3"
 

diff --git a/packages/gimp/gimp_2.3.19.bb b/packages/gimp/gimp_2.3.19.bb
new file mode 100644 (file)
index 0000000..64d8d30
--- /dev/null
+++ b/packages/gimp/gimp_2.3.19.bb
@@ -0,0 +1,2 @@
+require gimp.inc
+

diff --git a/packages/gimp/gimp_2.3.7.bb b/packages/gimp/gimp_2.3.7.bb
index 59bc63d..7e72e74 100644 (file)
--- a/packages/gimp/gimp_2.3.7.bb
+++ b/packages/gimp/gimp_2.3.7.bb
@@ -1,20 +1,2 @@
-DESCRIPTION =  "The GIMP is the GNU Image Manipulation Program."
-HOMEPAGE =     "http://www.gimp.org"
-SECTION = "x11/graphics"
-LICENSE =      "GPL"
+require gimp.inc
 PR = "r1"
-
-SRC_URI =      "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2"
-
-DEPENDS =      "sed-native libart-lgpl gtk+ jpeg libpng libexif tiff"
-
-inherit autotools pkgconfig
-#Don't laugh, this just builds a threaded gimp
-EXTRA_OECONF =         " --disable-gtktest \
-               --disable-print \
-               --disable-python \
-               --enable-mp"
-
-do_configure_append() {
-       find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
-}

diff --git a/packages/gimp/gimp_2.3.8.bb b/packages/gimp/gimp_2.3.8.bb
index 03d88ed..7e72e74 100644 (file)
--- a/packages/gimp/gimp_2.3.8.bb
+++ b/packages/gimp/gimp_2.3.8.bb
@@ -1,22 +1,2 @@
-DESCRIPTION =  "The GIMP is the GNU Image Manipulation Program."
-HOMEPAGE =     "http://www.gimp.org"
-SECTION = "x11/graphics"
-LICENSE =      "GPL"
+require gimp.inc
 PR = "r1"
-
-SRC_URI =      "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2 \
-                 file://configure-libwmf.patch;patch=1"
-
-DEPENDS =      "sed-native libart-lgpl gtk+ jpeg libpng libexif tiff"
-
-inherit autotools pkgconfig
-#Don't laugh, this just builds a threaded gimp
-EXTRA_OECONF =         " --disable-gtktest \
-               --disable-print \
-               --disable-python \
-               --enable-mp \
-               --without-libwmf"
-
-do_configure_append() {
-       find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
-}