diff options
| author | Saul Wold <Saul.Wold@intel.com> | 2010-11-22 13:57:13 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-11-22 13:57:13 +0000 |
| commit | cfe12efb5ec9586dab6961f141d52b103bd8b1d1 (patch) | |
| tree | 7108e22aa7ddf6cfc2f1b6c6b73a811187706ecb /meta-demoapps/recipes-gnome/gcalctool | |
| parent | 762fd6b7b3b22d7a8cb80ef9e9ba62e7ef21af3e (diff) | |
| download | poky-cfe12efb5ec9586dab6961f141d52b103bd8b1d1.tar.gz | |
Meta: Recipe Reogranization
This is the next stage of recipe reorganization, in this stage
many recipes where moved to a new meta-demoapps layer since this
is more appropriate for demo usage then the core. Additional some
recipes were moved to meta-extras to indicate they may be depercated
at a future time.
A number of recipes were modified since dependencies need to be
corrected.
Signed-off-by: Saul Wold <Saul.Wold@intel.com>
Diffstat (limited to 'meta-demoapps/recipes-gnome/gcalctool')
3 files changed, 56 insertions, 0 deletions
diff --git a/meta-demoapps/recipes-gnome/gcalctool/gcalctool/fix-includedir.patch b/meta-demoapps/recipes-gnome/gcalctool/gcalctool/fix-includedir.patch new file mode 100644 index 0000000000..aeb02ab2c1 --- /dev/null +++ b/meta-demoapps/recipes-gnome/gcalctool/gcalctool/fix-includedir.patch | |||
| @@ -0,0 +1,31 @@ | |||
| 1 | --- | ||
| 2 | Makefile.am | 2 +- | ||
| 3 | gcalctool/Makefile.am | 2 -- | ||
| 4 | 2 files changed, 1 insertion(+), 3 deletions(-) | ||
| 5 | |||
| 6 | Index: gcalctool-5.8.17/gcalctool/Makefile.am | ||
| 7 | =================================================================== | ||
| 8 | --- gcalctool-5.8.17.orig/gcalctool/Makefile.am 2005-12-19 15:46:57.000000000 +0000 | ||
| 9 | +++ gcalctool-5.8.17/gcalctool/Makefile.am 2007-05-16 16:03:26.000000000 +0100 | ||
| 10 | @@ -1,8 +1,6 @@ | ||
| 11 | ## Process this file with automake to produce Makefile.in | ||
| 12 | |||
| 13 | INCLUDES = \ | ||
| 14 | - -I$(includedir) \ | ||
| 15 | - -DG_DISABLE_DEPRECATED \ | ||
| 16 | -DGDK_PIXBUF_DISABLE_DEPRECATED \ | ||
| 17 | -DGDK_DISABLE_DEPRECATED \ | ||
| 18 | -DGNOME_DISABLE_DEPRECATED \ | ||
| 19 | Index: gcalctool-5.8.17/Makefile.am | ||
| 20 | =================================================================== | ||
| 21 | --- gcalctool-5.8.17.orig/Makefile.am 2007-05-16 15:35:44.000000000 +0100 | ||
| 22 | +++ gcalctool-5.8.17/Makefile.am 2007-05-16 16:06:46.000000000 +0100 | ||
| 23 | @@ -29,7 +29,7 @@ DISTCLEANFILES = \ | ||
| 24 | gnome-doc-utils.make \ | ||
| 25 | gcalctool.desktop | ||
| 26 | |||
| 27 | -SUBDIRS = po gcalctool help | ||
| 28 | +SUBDIRS = po gcalctool | ||
| 29 | |||
| 30 | SCHEMAS_FILE = gcalctool.schemas | ||
| 31 | |||
diff --git a/meta-demoapps/recipes-gnome/gcalctool/gcalctool_5.7.32.bb b/meta-demoapps/recipes-gnome/gcalctool/gcalctool_5.7.32.bb new file mode 100644 index 0000000000..f12e6c402a --- /dev/null +++ b/meta-demoapps/recipes-gnome/gcalctool/gcalctool_5.7.32.bb | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | LICENSE = "GPL" | ||
| 2 | SECTION = "x11" | ||
| 3 | DEPENDS = "gtk+" | ||
| 4 | DESCRIPTION = "gcalctool is a powerful calculator" | ||
| 5 | PR = "r2" | ||
| 6 | |||
| 7 | SRC_URI = "http://download.gnome.org/sources/${PN}/5.7/${PN}-${PV}.tar.gz \ | ||
| 8 | file://makefile-fix.diff;patch=1\ | ||
| 9 | file://fix-includedir.patch;patch=1" | ||
| 10 | |||
| 11 | inherit autotools pkgconfig | ||
| 12 | |||
| 13 | EXTRA_OECONF = "--disable-gnome" | ||
diff --git a/meta-demoapps/recipes-gnome/gcalctool/gcalctool_5.8.17.bb b/meta-demoapps/recipes-gnome/gcalctool/gcalctool_5.8.17.bb new file mode 100644 index 0000000000..c72860c8f5 --- /dev/null +++ b/meta-demoapps/recipes-gnome/gcalctool/gcalctool_5.8.17.bb | |||
| @@ -0,0 +1,12 @@ | |||
| 1 | LICENSE = "GPL" | ||
| 2 | SECTION = "x11" | ||
| 3 | DEPENDS = "gtk+ gnome-doc-utils" | ||
| 4 | DESCRIPTION = "gcalctool is a powerful calculator" | ||
| 5 | PR = "r0" | ||
| 6 | |||
| 7 | SRC_URI = "http://download.gnome.org/sources/${PN}/5.8/${PN}-${PV}.tar.gz \ | ||
| 8 | file://fix-includedir.patch;patch=1" | ||
| 9 | |||
| 10 | inherit autotools pkgconfig | ||
| 11 | |||
| 12 | EXTRA_OECONF = "--disable-gnome" | ||
