summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-05-16 15:01:41 +0000
committerRichard Purdie <richard@openedhand.com>2007-05-16 15:01:41 +0000
commitc56c41d3b26ce4ed4779ece349c97332555e0ba9 (patch)
treeafd2d9fd3126ca24797f6640272af8f35070c93f /meta
parent4baa324e2ed7e44eeac4e3411213fee47fb97d58 (diff)
downloadpoky-c56c41d3b26ce4ed4779ece349c97332555e0ba9.tar.gz
gcalctool: Fix compile issues, disable docs, update to 5.8.17
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1736 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/gcalctool/gcalctool/fix-includedir.patch29
-rw-r--r--meta/packages/gcalctool/gcalctool/makefile-fix.diff18
-rw-r--r--meta/packages/gcalctool/gcalctool_5.8.17.bb12
3 files changed, 36 insertions, 23 deletions
diff --git a/meta/packages/gcalctool/gcalctool/fix-includedir.patch b/meta/packages/gcalctool/gcalctool/fix-includedir.patch
index 62b386bf9d..aeb02ab2c1 100644
--- a/meta/packages/gcalctool/gcalctool/fix-includedir.patch
+++ b/meta/packages/gcalctool/gcalctool/fix-includedir.patch
@@ -1,12 +1,31 @@
1Index: gcalctool-5.7.32/gcalctool/Makefile.am 1---
2 Makefile.am | 2 +-
3 gcalctool/Makefile.am | 2 --
4 2 files changed, 1 insertion(+), 3 deletions(-)
5
6Index: gcalctool-5.8.17/gcalctool/Makefile.am
2=================================================================== 7===================================================================
3--- gcalctool-5.7.32.orig/gcalctool/Makefile.am 2007-04-07 19:44:00.000000000 +0200 8--- gcalctool-5.8.17.orig/gcalctool/Makefile.am 2005-12-19 15:46:57.000000000 +0000
4+++ gcalctool-5.7.32/gcalctool/Makefile.am 2007-04-07 19:44:15.000000000 +0200 9+++ gcalctool-5.8.17/gcalctool/Makefile.am 2007-05-16 16:03:26.000000000 +0100
5@@ -1,7 +1,6 @@ 10@@ -1,8 +1,6 @@
6 ## Process this file with automake to produce Makefile.in 11 ## Process this file with automake to produce Makefile.in
7 12
8 INCLUDES = \ 13 INCLUDES = \
9- -I$(includedir) \ 14- -I$(includedir) \
10 -DG_DISABLE_DEPRECATED \ 15- -DG_DISABLE_DEPRECATED \
11 -DGDK_PIXBUF_DISABLE_DEPRECATED \ 16 -DGDK_PIXBUF_DISABLE_DEPRECATED \
12 -DGDK_DISABLE_DEPRECATED \ 17 -DGDK_DISABLE_DEPRECATED \
18 -DGNOME_DISABLE_DEPRECATED \
19Index: 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/packages/gcalctool/gcalctool/makefile-fix.diff b/meta/packages/gcalctool/gcalctool/makefile-fix.diff
deleted file mode 100644
index 48a546271f..0000000000
--- a/meta/packages/gcalctool/gcalctool/makefile-fix.diff
+++ /dev/null
@@ -1,18 +0,0 @@
1--- gcalctool/Makefile.am~ 2005-03-23 16:50:10.000000000 +0000
2+++ gcalctool/Makefile.am 2006-03-20 13:59:17.000000000 +0000
3@@ -30,15 +30,8 @@
4
5 SCHEMAS_FILE = gcalctool.schemas
6
7-### Install the schemas file in /etc if GNOME support is not compiled in,
8-### and do not install the schemas at all
9-if DISABLE_GNOME
10-schemasdir = $(sysconfdir)/gcalctool
11-schemas_DATA = $(SCHEMAS_FILE)
12-else
13 schemadir = $(GCONF_SCHEMA_FILE_DIR)
14 schema_DATA = $(SCHEMAS_FILE)
15-endif
16
17 EXTRA_DIST = \
18 autogen.sh \
diff --git a/meta/packages/gcalctool/gcalctool_5.8.17.bb b/meta/packages/gcalctool/gcalctool_5.8.17.bb
new file mode 100644
index 0000000000..c72860c8f5
--- /dev/null
+++ b/meta/packages/gcalctool/gcalctool_5.8.17.bb
@@ -0,0 +1,12 @@
1LICENSE = "GPL"
2SECTION = "x11"
3DEPENDS = "gtk+ gnome-doc-utils"
4DESCRIPTION = "gcalctool is a powerful calculator"
5PR = "r0"
6
7SRC_URI = "http://download.gnome.org/sources/${PN}/5.8/${PN}-${PV}.tar.gz \
8 file://fix-includedir.patch;patch=1"
9
10inherit autotools pkgconfig
11
12EXTRA_OECONF = "--disable-gnome"