summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Brabec <utx@penguin.cz>2009-09-16 19:50:10 +0000
committerutx@penguin.cz <utx@penguin.cz>2009-09-16 19:50:10 +0000
commit952eef23ccbc52076a3e0b4f45fb0c58d5354ce7 (patch)
tree0336641606b2505d23ed0496596c3fe0b337a8d5
parent9298697cbf536b2d1db9b6c720dfab34758adbf6 (diff)
gtk+: Implemented INC_PR, require hicolor-icon-theme.
-rw-r--r--recipes/gtk+/gtk+.inc3
-rw-r--r--recipes/gtk+/gtk+_2.12.0.bb2
-rw-r--r--recipes/gtk+/gtk+_2.12.11.bb2
-rw-r--r--recipes/gtk+/gtk+_2.12.3.bb2
-rw-r--r--recipes/gtk+/gtk+_2.14.1.bb2
-rw-r--r--recipes/gtk+/gtk+_2.14.2.bb2
-rw-r--r--recipes/gtk+/gtk+_2.16.4.bb2
-rw-r--r--recipes/gtk+/gtk+_2.16.6.bb1
8 files changed, 10 insertions, 6 deletions
diff --git a/recipes/gtk+/gtk+.inc b/recipes/gtk+/gtk+.inc
index 9322d709e4..d47ace0c06 100644
--- a/recipes/gtk+/gtk+.inc
+++ b/recipes/gtk+/gtk+.inc
@@ -8,6 +8,8 @@ DEPENDS = "glib-2.0 tiff pango atk jpeg libpng libxext libxcursor gtk-doc libgcr
libxrandr libxdamage libxrender libxcomposite"
PROVIDES = "gdk-pixbuf"
+INC_PR = "r6"
+
inherit autotools pkgconfig
LEAD_SONAME = "libgtk-x11-2.0.so"
@@ -18,6 +20,7 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
${libdir}/lib*.so.* \
${datadir}/themes ${sysconfdir} \
${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so"
+RDEPENDS_${PN} = "hicolor-icon-theme"
FILES_${PN}-dev += " \
${datadir}/gtk-2.0/include \
diff --git a/recipes/gtk+/gtk+_2.12.0.bb b/recipes/gtk+/gtk+_2.12.0.bb
index 3d4dcde40f..f5741b65c3 100644
--- a/recipes/gtk+/gtk+_2.12.0.bb
+++ b/recipes/gtk+/gtk+_2.12.0.bb
@@ -1,6 +1,6 @@
require gtk+.inc
-PR = "r3"
+PR = "${INC_PR}.0"
DEPENDS += "cairo"
diff --git a/recipes/gtk+/gtk+_2.12.11.bb b/recipes/gtk+/gtk+_2.12.11.bb
index d246eb8de9..8a0db74ac5 100644
--- a/recipes/gtk+/gtk+_2.12.11.bb
+++ b/recipes/gtk+/gtk+_2.12.11.bb
@@ -1,6 +1,6 @@
require gtk+.inc
-PR = "r4"
+PR = "${INC_PR}.0"
DEPENDS += "cairo"
diff --git a/recipes/gtk+/gtk+_2.12.3.bb b/recipes/gtk+/gtk+_2.12.3.bb
index 642154b207..8a0db74ac5 100644
--- a/recipes/gtk+/gtk+_2.12.3.bb
+++ b/recipes/gtk+/gtk+_2.12.3.bb
@@ -1,6 +1,6 @@
require gtk+.inc
-PR = "r3"
+PR = "${INC_PR}.0"
DEPENDS += "cairo"
diff --git a/recipes/gtk+/gtk+_2.14.1.bb b/recipes/gtk+/gtk+_2.14.1.bb
index 627a1750c0..dc4f2f254a 100644
--- a/recipes/gtk+/gtk+_2.14.1.bb
+++ b/recipes/gtk+/gtk+_2.14.1.bb
@@ -1,6 +1,6 @@
require gtk+.inc
-PR = "r1"
+PR = "${INC_PR}.0"
DEPENDS += "cairo jasper"
diff --git a/recipes/gtk+/gtk+_2.14.2.bb b/recipes/gtk+/gtk+_2.14.2.bb
index 0289e2ed22..bc4a5869ac 100644
--- a/recipes/gtk+/gtk+_2.14.2.bb
+++ b/recipes/gtk+/gtk+_2.14.2.bb
@@ -1,6 +1,6 @@
require gtk+.inc
-PR = "r5"
+PR = "${INC_PR}.0"
DEPENDS += "cairo jasper"
diff --git a/recipes/gtk+/gtk+_2.16.4.bb b/recipes/gtk+/gtk+_2.16.4.bb
index 4fde9b6825..890a27f724 100644
--- a/recipes/gtk+/gtk+_2.16.4.bb
+++ b/recipes/gtk+/gtk+_2.16.4.bb
@@ -1,7 +1,7 @@
require gtk+.inc
DEPENDS += "cairo jasper"
-PR = "r0"
+PR = "${INC_PR}.0"
# disabled per default - this uses as little patches as possible
DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/gtk+/gtk+_2.16.6.bb b/recipes/gtk+/gtk+_2.16.6.bb
index 43df738c30..890a27f724 100644
--- a/recipes/gtk+/gtk+_2.16.6.bb
+++ b/recipes/gtk+/gtk+_2.16.6.bb
@@ -1,6 +1,7 @@
require gtk+.inc
DEPENDS += "cairo jasper"
+PR = "${INC_PR}.0"
# disabled per default - this uses as little patches as possible
DEFAULT_PREFERENCE = "-1"