From a3b0920d0cc2cecac9eea4993ad18a64b207d7af Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Thu, 4 Mar 2010 22:56:33 +0000 Subject: gtk+: build gtk-demo and package it appropriately --- recipes/gtk+/gtk+-2.12.0/no-demos.patch | 10 ---------- recipes/gtk+/gtk+-2.12.11/no-demos.patch | 10 ---------- recipes/gtk+/gtk+-2.12.3/no-demos.patch | 10 ---------- recipes/gtk+/gtk+-2.14.1/no-demos.patch | 10 ---------- recipes/gtk+/gtk+-2.14.2/no-demos.patch | 10 ---------- recipes/gtk+/gtk+-2.16.4/no-demos.patch | 10 ---------- recipes/gtk+/gtk+-2.16.6/no-demos.patch | 10 ---------- recipes/gtk+/gtk+-2.18.0/no-demos.patch | 10 ---------- recipes/gtk+/gtk+-2.18.3/no-demos.patch | 10 ---------- recipes/gtk+/gtk+-2.18.6/no-demos.patch | 10 ---------- recipes/gtk+/gtk+.inc | 7 +++++-- 11 files changed, 5 insertions(+), 102 deletions(-) delete mode 100644 recipes/gtk+/gtk+-2.12.0/no-demos.patch delete mode 100644 recipes/gtk+/gtk+-2.12.11/no-demos.patch delete mode 100644 recipes/gtk+/gtk+-2.12.3/no-demos.patch delete mode 100644 recipes/gtk+/gtk+-2.14.1/no-demos.patch delete mode 100644 recipes/gtk+/gtk+-2.14.2/no-demos.patch delete mode 100644 recipes/gtk+/gtk+-2.16.4/no-demos.patch delete mode 100644 recipes/gtk+/gtk+-2.16.6/no-demos.patch delete mode 100644 recipes/gtk+/gtk+-2.18.0/no-demos.patch delete mode 100644 recipes/gtk+/gtk+-2.18.3/no-demos.patch delete mode 100644 recipes/gtk+/gtk+-2.18.6/no-demos.patch (limited to 'recipes/gtk+') diff --git a/recipes/gtk+/gtk+-2.12.0/no-demos.patch b/recipes/gtk+/gtk+-2.12.0/no-demos.patch deleted file mode 100644 index 0fc4c48d1a..0000000000 --- a/recipes/gtk+/gtk+-2.12.0/no-demos.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100 -+++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100 -@@ -1,6 +1,6 @@ - ## Makefile.am for GTK+ - --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros - - # require automake 1.4 diff --git a/recipes/gtk+/gtk+-2.12.11/no-demos.patch b/recipes/gtk+/gtk+-2.12.11/no-demos.patch deleted file mode 100644 index 0fc4c48d1a..0000000000 --- a/recipes/gtk+/gtk+-2.12.11/no-demos.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100 -+++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100 -@@ -1,6 +1,6 @@ - ## Makefile.am for GTK+ - --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros - - # require automake 1.4 diff --git a/recipes/gtk+/gtk+-2.12.3/no-demos.patch b/recipes/gtk+/gtk+-2.12.3/no-demos.patch deleted file mode 100644 index 0fc4c48d1a..0000000000 --- a/recipes/gtk+/gtk+-2.12.3/no-demos.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100 -+++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100 -@@ -1,6 +1,6 @@ - ## Makefile.am for GTK+ - --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros - - # require automake 1.4 diff --git a/recipes/gtk+/gtk+-2.14.1/no-demos.patch b/recipes/gtk+/gtk+-2.14.1/no-demos.patch deleted file mode 100644 index 0fc4c48d1a..0000000000 --- a/recipes/gtk+/gtk+-2.14.1/no-demos.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100 -+++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100 -@@ -1,6 +1,6 @@ - ## Makefile.am for GTK+ - --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros - - # require automake 1.4 diff --git a/recipes/gtk+/gtk+-2.14.2/no-demos.patch b/recipes/gtk+/gtk+-2.14.2/no-demos.patch deleted file mode 100644 index 0fc4c48d1a..0000000000 --- a/recipes/gtk+/gtk+-2.14.2/no-demos.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100 -+++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100 -@@ -1,6 +1,6 @@ - ## Makefile.am for GTK+ - --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros - - # require automake 1.4 diff --git a/recipes/gtk+/gtk+-2.16.4/no-demos.patch b/recipes/gtk+/gtk+-2.16.4/no-demos.patch deleted file mode 100644 index 0fc4c48d1a..0000000000 --- a/recipes/gtk+/gtk+-2.16.4/no-demos.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100 -+++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100 -@@ -1,6 +1,6 @@ - ## Makefile.am for GTK+ - --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros - - # require automake 1.4 diff --git a/recipes/gtk+/gtk+-2.16.6/no-demos.patch b/recipes/gtk+/gtk+-2.16.6/no-demos.patch deleted file mode 100644 index 0fc4c48d1a..0000000000 --- a/recipes/gtk+/gtk+-2.16.6/no-demos.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100 -+++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100 -@@ -1,6 +1,6 @@ - ## Makefile.am for GTK+ - --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros - - # require automake 1.4 diff --git a/recipes/gtk+/gtk+-2.18.0/no-demos.patch b/recipes/gtk+/gtk+-2.18.0/no-demos.patch deleted file mode 100644 index 0fc4c48d1a..0000000000 --- a/recipes/gtk+/gtk+-2.18.0/no-demos.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100 -+++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100 -@@ -1,6 +1,6 @@ - ## Makefile.am for GTK+ - --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros - - # require automake 1.4 diff --git a/recipes/gtk+/gtk+-2.18.3/no-demos.patch b/recipes/gtk+/gtk+-2.18.3/no-demos.patch deleted file mode 100644 index 0fc4c48d1a..0000000000 --- a/recipes/gtk+/gtk+-2.18.3/no-demos.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100 -+++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100 -@@ -1,6 +1,6 @@ - ## Makefile.am for GTK+ - --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros - - # require automake 1.4 diff --git a/recipes/gtk+/gtk+-2.18.6/no-demos.patch b/recipes/gtk+/gtk+-2.18.6/no-demos.patch deleted file mode 100644 index 0fc4c48d1a..0000000000 --- a/recipes/gtk+/gtk+-2.18.6/no-demos.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100 -+++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100 -@@ -1,6 +1,6 @@ - ## Makefile.am for GTK+ - --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros - - # require automake 1.4 diff --git a/recipes/gtk+/gtk+.inc b/recipes/gtk+/gtk+.inc index e619a6af28..e6a0684fcc 100644 --- a/recipes/gtk+/gtk+.inc +++ b/recipes/gtk+/gtk+.inc @@ -11,19 +11,22 @@ PROVIDES = "gdk-pixbuf" 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" +INC_PR = "r8" inherit autotools pkgconfig LEAD_SONAME = "libgtk-x11-2.0.so" LIBV = "2.10.0" +PACKAGES =+ "${PN}-demo ${PN}-demo-source" +FILES_${PN}-demo = "${bindir}/gtk-demo" +FILES_${PN}-demo-source = "${datadir}/gtk-2.0/demo" + FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${bindir}/gtk-update-icon-cache \ ${bindir}/gtk-query-immodules-2.0 \ -- cgit 1.2.3-korg