Merge bk://openembedded@openembedded.bkbits.net/packages

into stealth.(none):/home/pb/oe/oe-packages

2004/08/22 20:01:31+01:00 (none)!pb
package minesweeper separately

2004/08/22 20:01:18+01:00 (none)!pb
bring gnomeprint packages up to modern standards


2004/08/22 19:48:06+01:00 (none)!pb
add gnome2-macros to EXTRA_AUTORECONF

BKrev: 4128ed96DuaJAzQxYxfZLbTb7m3Uew

5 files changed, 24 insertions, 33 deletions

diff --git a/classes/gnome.oeclass b/classes/gnome.oeclass
index eee7e20bbe..d41502cdab 100644
--- a/classes/gnome.oeclass
+++ b/classes/gnome.oeclass
@@ -11,6 +11,8 @@ FILES_${PN} += "${datadir}/application-registry ${datadir}/mime-info \
 
 inherit autotools pkgconfig gconf
 
+EXTRA_AUTORECONF += "-I ${STAGING_DIR}/${HOST_SYS}/share/aclocal/gnome2-macros"
+
 gnome_stage_includes() {
 	autotools_stage_includes
 }
diff --git a/gnome/files/compiler-flags.m4 b/gnome/files/compiler-flags.m4
deleted file mode 100644
index e69de29bb2..0000000000
--- a/gnome/files/compiler-flags.m4
+++ /dev/null
diff --git a/gnome/gnome-games_2.6.1.oe b/gnome/gnome-games_2.6.1.oe
index 74c11a6940..891a8eec6a 100644
--- a/gnome/gnome-games_2.6.1.oe
+++ b/gnome/gnome-games_2.6.1.oe
@@ -1,11 +1,9 @@
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "guile gtk+ libgnome libgnomeui librsvg gnome-vfs gconf libglade"
-PR = "r1"
+DEPENDS = "guile gtk+ libgnome libgnomeui librsvg gnome-vfs gconf libglade gnome-common"
+PR = "r2"
 
 inherit gnome
 
-SRC_URI += "file://compiler-flags.m4"
-
 PACKAGES =+ "libgdkcardimage libgdkcardimage-data libgdkcardimage-dev"
 
 FILES_libgdkcardimage = "${libdir}/libgdkcardimage.so.*"
@@ -21,10 +19,8 @@ FILES_gnome-games-sol = "${bindir}/sol ${datadir}/applications/sol.desktop ${dat
 PACKAGES =+ "gnome-games-gnometris "
 FILES_gnome-games-gnometris = "${bindir}/gnometris ${datadir}/pixmaps/gnometris ${datadir}/pixmaps/gnome-gtetris.png ${datadir}/applications/gnometris.desktop ${sysconfdir}/gconf/schemas/gnometris.schemas"
 
-EXTRA_OECONF = "--disable-schemas-install"
+PACKAGES =+ "gnome-games-gnomine"
+FILES_gnome-games-gnomine = "${bindir}/gnomine ${datadir}/pixmaps/gnomine ${datadir}/pixmaps/gnome-gnomine.png ${datadir}/applications/gnomine.desktop ${sysconfdir}/gconf/schemas/gnomine.schemas"
 
-do_configure_prepend() {
-	mkdir -p m4
-	cp ${WORKDIR}/compiler-flags.m4 m4/
-}
+EXTRA_OECONF = "--disable-schemas-install"
 
diff --git a/gnome/libgnomeprint_2.6.2.oe b/gnome/libgnomeprint_2.6.2.oe
index e69de29bb2..383ede26cb 100644
--- a/gnome/libgnomeprint_2.6.2.oe
+++ b/gnome/libgnomeprint_2.6.2.oe
@@ -0,0 +1,12 @@
+PR = "r1"
+
+DEPENDS = "libxml2 glib-2.0 pango libart-lgpl fontconfig popt gnome-common"
+
+inherit flow-lossage pkgconfig gnome
+
+do_stage() {
+	install -d ${STAGING_LIBDIR}
+	oe_libinstall -so -a -C libgnomeprint libgnomeprint-2-2 ${STAGING_LIBDIR}
+	gnome_stage_includes
+}
+
diff --git a/gnome/libgnomeprintui_2.6.2.oe b/gnome/libgnomeprintui_2.6.2.oe
index 7f9590361a..b518de2903 100644
--- a/gnome/libgnomeprintui_2.6.2.oe
+++ b/gnome/libgnomeprintui_2.6.2.oe
@@ -1,31 +1,12 @@
-DEPENDS = "libgnomeprint gtk+ libgnomecanvas gnome-icon-theme"
+PR = "r1"
+DEPENDS = "libgnomeprint gtk+ libgnomecanvas gnome-icon-theme gnome-common"
 
-SRC_URI = "${GNOME_MIRROR}/${PN}/2.6/${PN}-${PV}.tar.bz2 \
-	file://compiler-flags.m4 \
-	file://configure.patch;patch=1"
+inherit gnome pkgconfig
 
-inherit autotools pkgconfig
-
-do_configure_prepend() {
-	mkdir -p ${S}/m4
-	install ${WORKDIR}/compiler-flags.m4 ${S}/m4/
-}
-
-HEADERS = " \
-gnome-print-paper-selector.h \
-gnome-print-config-dialog.h \
-gnome-print-preview.h \
-gnome-font-dialog.h \
-gnome-print-dialog.h \
-gnome-print-unit-selector.h \
-gnome-print-job-preview.h \
-"
+SRC_URI += "file://configure.patch;patch=1"
 
 do_stage() {
 	install -d ${STAGING_LIBDIR}
 	oe_libinstall -so -a -C libgnomeprintui libgnomeprintui-2-2 ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}/libgnomeprintui-2.2/libgnomeprintui
-	for i in ${HEADERS}; do
-		install -m 0644 libgnomeprintui/$i ${STAGING_INCDIR}/libgnomeprintui-2.2/libgnomeprintui/$i
-	done	
+	gnome_stage_includes
 }