gtk+: unify

10 files changed, 18 insertions, 106 deletions

diff --git a/recipes/gtk+/gtk+.inc b/recipes/gtk+/gtk+.inc
index d47ace0c06..610428821f 100644
--- a/recipes/gtk+/gtk+.inc
+++ b/recipes/gtk+/gtk+.inc
@@ -5,14 +5,24 @@ SECTION = "libs"
 LICENSE = "LGPL"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 tiff pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cups \
-           libxrandr libxdamage libxrender libxcomposite"
+	   libxrandr libxdamage libxrender libxcomposite cairo jasper"
 PROVIDES = "gdk-pixbuf"
 
-INC_PR = "r6"
+MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+SRC_URI = "http://download.gnome.org/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.bz2 \
+	file://hardcoded_libtool.patch;patch=1 \
+	file://no-demos.patch;patch=1 \
+	file://run-iconcache.patch;patch=1 \
+	file://toggle-font.diff;patch=1;pnum=0 \
+	file://xsettings.patch;patch=1 \
+	"
+
+INC_PR = "r7"
 
 inherit autotools pkgconfig
 
 LEAD_SONAME = "libgtk-x11-2.0.so"
+LIBV = "2.10.0"
 
 FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
 	${bindir}/gtk-update-icon-cache \
@@ -23,7 +33,7 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
 RDEPENDS_${PN} = "hicolor-icon-theme"
 
 FILES_${PN}-dev += " \
-        ${datadir}/gtk-2.0/include \
+	${datadir}/gtk-2.0/include \
 	${libdir}/gtk-2.0/include \
 	${bindir}/gdk-pixbuf-csource \
 	${bindir}/gtk-builder-convert"
@@ -41,8 +51,6 @@ RRECOMMENDS_${PN} = " ${NEATSTUFF} "
 RRECOMMENDS_${PN}_linux = " ${NEATSTUFF} glibc-gconv-iso8859-1 "
 RRECOMMENDS_${PN}_linux-gnueabi = " ${NEATSTUFF} glibc-gconv-iso8859-1"
 
-
-
 do_stage () {
 	oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR}
 	oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR}
@@ -56,7 +64,7 @@ do_stage () {
 
 	mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include
 	install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h
-        # Copy over all headers, since the maemo stuff needs access to the private api. *sigh*
+	# Copy over all headers, since the maemo stuff needs access to the private api. *sigh*
 	cp gtk/*.h ${STAGING_INCDIR}/gtk-2.0/gtk/
 
 	install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/
diff --git a/recipes/gtk+/gtk+_2.12.0.bb b/recipes/gtk+/gtk+_2.12.0.bb
index f5741b65c3..0378040656 100644
--- a/recipes/gtk+/gtk+_2.12.0.bb
+++ b/recipes/gtk+/gtk+_2.12.0.bb
@@ -2,20 +2,12 @@ require gtk+.inc
 
 PR = "${INC_PR}.0"
 
-DEPENDS += "cairo"
-
 # disable per default - untested and not all patches included.
 DEFAULT_PREFERENCE = "-1" 
 
-SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \
-           file://xsettings.patch;patch=1 \
-           file://run-iconcache.patch;patch=1 \
-           file://disable-print.patch;patch=1 \
-           file://hardcoded_libtool.patch;patch=1 \
-           file://no-demos.patch;patch=1 \
+SRC_URI += "file://disable-print.patch;patch=1 \
            file://cellrenderer-cairo.patch;patch=1;pnum=0 \
            file://entry-cairo.patch;patch=1;pnum=0 \
-           file://toggle-font.diff;patch=1;pnum=0 \
            file://scrolled-placement.patch;patch=1;pnum=0"
 # temporary
 #           file://gtklabel-resize-patch;patch=1 \
@@ -26,8 +18,6 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \
 
 EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
 
-LIBV = "2.10.0"
-
 PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*"
 
 python populate_packages_prepend () {
diff --git a/recipes/gtk+/gtk+_2.12.11.bb b/recipes/gtk+/gtk+_2.12.11.bb
index 8a0db74ac5..1e04c2b319 100644
--- a/recipes/gtk+/gtk+_2.12.11.bb
+++ b/recipes/gtk+/gtk+_2.12.11.bb
@@ -2,19 +2,11 @@ require gtk+.inc
 
 PR = "${INC_PR}.0"
 
-DEPENDS += "cairo"
-
 # disable per default - untested and not all patches included.
 DEFAULT_PREFERENCE = "-1" 
 
-SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \
-           file://xsettings.patch;patch=1 \
-           file://run-iconcache.patch;patch=1 \
-           file://hardcoded_libtool.patch;patch=1 \
-           file://no-demos.patch;patch=1 \
-           file://cellrenderer-cairo.patch;patch=1;pnum=0 \
+SRC_URI += "file://cellrenderer-cairo.patch;patch=1;pnum=0 \
            file://entry-cairo.patch;patch=1;pnum=0 \
-           file://toggle-font.diff;patch=1;pnum=0 \
            file://scrolled-placement.patch;patch=1;pnum=0"
 # temporary
 #           file://gtklabel-resize-patch;patch=1 \
@@ -25,8 +17,6 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \
 
 EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
 
-LIBV = "2.10.0"
-
 PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*"
 
 python populate_packages_prepend () {
diff --git a/recipes/gtk+/gtk+_2.12.3.bb b/recipes/gtk+/gtk+_2.12.3.bb
index 8a0db74ac5..1e04c2b319 100644
--- a/recipes/gtk+/gtk+_2.12.3.bb
+++ b/recipes/gtk+/gtk+_2.12.3.bb
@@ -2,19 +2,11 @@ require gtk+.inc
 
 PR = "${INC_PR}.0"
 
-DEPENDS += "cairo"
-
 # disable per default - untested and not all patches included.
 DEFAULT_PREFERENCE = "-1" 
 
-SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \
-           file://xsettings.patch;patch=1 \
-           file://run-iconcache.patch;patch=1 \
-           file://hardcoded_libtool.patch;patch=1 \
-           file://no-demos.patch;patch=1 \
-           file://cellrenderer-cairo.patch;patch=1;pnum=0 \
+SRC_URI += "file://cellrenderer-cairo.patch;patch=1;pnum=0 \
            file://entry-cairo.patch;patch=1;pnum=0 \
-           file://toggle-font.diff;patch=1;pnum=0 \
            file://scrolled-placement.patch;patch=1;pnum=0"
 # temporary
 #           file://gtklabel-resize-patch;patch=1 \
@@ -25,8 +17,6 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \
 
 EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
 
-LIBV = "2.10.0"
-
 PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*"
 
 python populate_packages_prepend () {
diff --git a/recipes/gtk+/gtk+_2.14.1.bb b/recipes/gtk+/gtk+_2.14.1.bb
index dc4f2f254a..2d78edb4a4 100644
--- a/recipes/gtk+/gtk+_2.14.1.bb
+++ b/recipes/gtk+/gtk+_2.14.1.bb
@@ -2,23 +2,11 @@ require gtk+.inc
 
 PR = "${INC_PR}.0"
 
-DEPENDS += "cairo jasper"
-
 # disable per default - this uses as little patches as possible
 DEFAULT_PREFERENCE = "-1" 
 
-SRC_URI = "http://download.gnome.org/sources/gtk+/2.14/gtk+-${PV}.tar.bz2 \
-           file://xsettings.patch;patch=1 \
-           file://run-iconcache.patch;patch=1 \
-           file://hardcoded_libtool.patch;patch=1 \
-           file://no-demos.patch;patch=1 \
-           file://toggle-font.diff;patch=1;pnum=0 \
-          "
-
 EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration gio_can_sniff=yes"
 
-LIBV = "2.10.0"
-
 PACKAGES_DYNAMIC = "gtk-module-* gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*"
 
 python populate_packages_prepend () {
diff --git a/recipes/gtk+/gtk+_2.14.2.bb b/recipes/gtk+/gtk+_2.14.2.bb
index bc4a5869ac..a6ba9ce12f 100644
--- a/recipes/gtk+/gtk+_2.14.2.bb
+++ b/recipes/gtk+/gtk+_2.14.2.bb
@@ -2,21 +2,11 @@ require gtk+.inc
 
 PR = "${INC_PR}.0"
 
-DEPENDS += "cairo jasper"
-
-SRC_URI = "http://download.gnome.org/sources/gtk+/2.14/gtk+-${PV}.tar.bz2 \
-           file://xsettings.patch;patch=1 \
-           file://run-iconcache.patch;patch=1 \
-           file://hardcoded_libtool.patch;patch=1 \
-           file://no-demos.patch;patch=1 \
-           file://toggle-font.diff;patch=1;pnum=0 \
-           file://smallscreen_filechooser.patch;patch=1 \
+SRC_URI += "file://smallscreen_filechooser.patch;patch=1 \
           "
 
 EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration gio_can_sniff=yes"
 
-LIBV = "2.10.0"
-
 PACKAGES_DYNAMIC = "gtk-module-* gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*"
 
 python populate_packages_prepend () {
diff --git a/recipes/gtk+/gtk+_2.16.4.bb b/recipes/gtk+/gtk+_2.16.4.bb
index 890a27f724..77595c3309 100644
--- a/recipes/gtk+/gtk+_2.16.4.bb
+++ b/recipes/gtk+/gtk+_2.16.4.bb
@@ -1,23 +1,12 @@
 require gtk+.inc
 
-DEPENDS += "cairo jasper"
 PR = "${INC_PR}.0"
 
 # disabled per default - this uses as little patches as possible
 DEFAULT_PREFERENCE = "-1" 
 
-SRC_URI = "http://download.gnome.org/sources/gtk+/2.16/gtk+-${PV}.tar.bz2 \
-           file://xsettings.patch;patch=1 \
-           file://run-iconcache.patch;patch=1 \
-           file://hardcoded_libtool.patch;patch=1 \
-           file://no-demos.patch;patch=1 \
-           file://toggle-font.diff;patch=1;pnum=0 \
-          "
-
 EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration gio_can_sniff=yes"
 
-LIBV = "2.10.0"
-
 PACKAGES_DYNAMIC = "gtk-module-* gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*"
 
 python populate_packages_prepend () {
diff --git a/recipes/gtk+/gtk+_2.16.6.bb b/recipes/gtk+/gtk+_2.16.6.bb
index 890a27f724..77595c3309 100644
--- a/recipes/gtk+/gtk+_2.16.6.bb
+++ b/recipes/gtk+/gtk+_2.16.6.bb
@@ -1,23 +1,12 @@
 require gtk+.inc
 
-DEPENDS += "cairo jasper"
 PR = "${INC_PR}.0"
 
 # disabled per default - this uses as little patches as possible
 DEFAULT_PREFERENCE = "-1" 
 
-SRC_URI = "http://download.gnome.org/sources/gtk+/2.16/gtk+-${PV}.tar.bz2 \
-           file://xsettings.patch;patch=1 \
-           file://run-iconcache.patch;patch=1 \
-           file://hardcoded_libtool.patch;patch=1 \
-           file://no-demos.patch;patch=1 \
-           file://toggle-font.diff;patch=1;pnum=0 \
-          "
-
 EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration gio_can_sniff=yes"
 
-LIBV = "2.10.0"
-
 PACKAGES_DYNAMIC = "gtk-module-* gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*"
 
 python populate_packages_prepend () {
diff --git a/recipes/gtk+/gtk+_2.18.0.bb b/recipes/gtk+/gtk+_2.18.0.bb
index d2cf4c6858..77595c3309 100644
--- a/recipes/gtk+/gtk+_2.18.0.bb
+++ b/recipes/gtk+/gtk+_2.18.0.bb
@@ -1,23 +1,12 @@
 require gtk+.inc
 
-DEPENDS += "cairo jasper"
 PR = "${INC_PR}.0"
 
 # disabled per default - this uses as little patches as possible
 DEFAULT_PREFERENCE = "-1" 
 
-SRC_URI = "http://download.gnome.org/sources/gtk+/2.18/gtk+-${PV}.tar.bz2 \
-           file://xsettings.patch;patch=1 \
-           file://run-iconcache.patch;patch=1 \
-           file://hardcoded_libtool.patch;patch=1 \
-           file://no-demos.patch;patch=1 \
-           file://toggle-font.diff;patch=1;pnum=0 \
-          "
-
 EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration gio_can_sniff=yes"
 
-LIBV = "2.10.0"
-
 PACKAGES_DYNAMIC = "gtk-module-* gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*"
 
 python populate_packages_prepend () {
diff --git a/recipes/gtk+/gtk+_2.18.3.bb b/recipes/gtk+/gtk+_2.18.3.bb
index d2cf4c6858..77595c3309 100644
--- a/recipes/gtk+/gtk+_2.18.3.bb
+++ b/recipes/gtk+/gtk+_2.18.3.bb
@@ -1,23 +1,12 @@
 require gtk+.inc
 
-DEPENDS += "cairo jasper"
 PR = "${INC_PR}.0"
 
 # disabled per default - this uses as little patches as possible
 DEFAULT_PREFERENCE = "-1" 
 
-SRC_URI = "http://download.gnome.org/sources/gtk+/2.18/gtk+-${PV}.tar.bz2 \
-           file://xsettings.patch;patch=1 \
-           file://run-iconcache.patch;patch=1 \
-           file://hardcoded_libtool.patch;patch=1 \
-           file://no-demos.patch;patch=1 \
-           file://toggle-font.diff;patch=1;pnum=0 \
-          "
-
 EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration gio_can_sniff=yes"
 
-LIBV = "2.10.0"
-
 PACKAGES_DYNAMIC = "gtk-module-* gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*"
 
 python populate_packages_prepend () {