From c56c41d3b26ce4ed4779ece349c97332555e0ba9 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Wed, 16 May 2007 15:01:41 +0000
Subject: 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
---
 .../gcalctool/gcalctool/fix-includedir.patch       | 29 ++++++++++++++++++----
 .../packages/gcalctool/gcalctool/makefile-fix.diff | 18 --------------
 meta/packages/gcalctool/gcalctool_5.8.17.bb        | 12 +++++++++
 3 files changed, 36 insertions(+), 23 deletions(-)
 delete mode 100644 meta/packages/gcalctool/gcalctool/makefile-fix.diff
 create mode 100644 meta/packages/gcalctool/gcalctool_5.8.17.bb

(limited to 'meta/packages/gcalctool')

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 @@
-Index: gcalctool-5.7.32/gcalctool/Makefile.am
+---
+ Makefile.am           |    2 +-
+ gcalctool/Makefile.am |    2 --
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+
+Index: gcalctool-5.8.17/gcalctool/Makefile.am
 ===================================================================
---- gcalctool-5.7.32.orig/gcalctool/Makefile.am	2007-04-07 19:44:00.000000000 +0200
-+++ gcalctool-5.7.32/gcalctool/Makefile.am	2007-04-07 19:44:15.000000000 +0200
-@@ -1,7 +1,6 @@
+--- gcalctool-5.8.17.orig/gcalctool/Makefile.am	2005-12-19 15:46:57.000000000 +0000
++++ gcalctool-5.8.17/gcalctool/Makefile.am	2007-05-16 16:03:26.000000000 +0100
+@@ -1,8 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
  INCLUDES = \
 -	-I$(includedir) \
- 	-DG_DISABLE_DEPRECATED \
+-	-DG_DISABLE_DEPRECATED \
  	-DGDK_PIXBUF_DISABLE_DEPRECATED \
  	-DGDK_DISABLE_DEPRECATED \
+ 	-DGNOME_DISABLE_DEPRECATED \
+Index: gcalctool-5.8.17/Makefile.am
+===================================================================
+--- gcalctool-5.8.17.orig/Makefile.am	2007-05-16 15:35:44.000000000 +0100
++++ gcalctool-5.8.17/Makefile.am	2007-05-16 16:06:46.000000000 +0100
+@@ -29,7 +29,7 @@ DISTCLEANFILES =                \
+ 	gnome-doc-utils.make	\
+ 	gcalctool.desktop
+ 
+-SUBDIRS = po gcalctool help
++SUBDIRS = po gcalctool
+ 
+ SCHEMAS_FILE = gcalctool.schemas
+ 
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 @@
---- gcalctool/Makefile.am~	2005-03-23 16:50:10.000000000 +0000
-+++ gcalctool/Makefile.am	2006-03-20 13:59:17.000000000 +0000
-@@ -30,15 +30,8 @@
- 
- SCHEMAS_FILE = gcalctool.schemas
- 
--### Install the schemas file in /etc if GNOME support is not compiled in,
--### and do not install the schemas at all
--if DISABLE_GNOME
--schemasdir = $(sysconfdir)/gcalctool
--schemas_DATA = $(SCHEMAS_FILE)
--else
- schemadir = $(GCONF_SCHEMA_FILE_DIR)
- schema_DATA = $(SCHEMAS_FILE)
--endif
- 
- EXTRA_DIST = \
- 	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 @@
+LICENSE = "GPL"
+SECTION = "x11"
+DEPENDS = "gtk+ gnome-doc-utils"
+DESCRIPTION = "gcalctool is a powerful calculator"
+PR = "r0"
+
+SRC_URI = "http://download.gnome.org/sources/${PN}/5.8/${PN}-${PV}.tar.gz \
+	file://fix-includedir.patch;patch=1"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-gnome"
-- 
cgit v1.2.3-54-g00ecf