libgpewidget: add 0.109, remove 0.95 to 0.100

11 files changed, 38 insertions, 141 deletions

diff --git a/packages/libgpewidget/libgpewidget-0.100/.mtn2git_empty b/packages/libgpewidget/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libgpewidget/libgpewidget-0.100/.mtn2git_empty
+++ b/packages/libgpewidget/files/.mtn2git_empty
diff --git a/packages/libgpewidget/files/pkgconfig.patch b/packages/libgpewidget/files/pkgconfig.patch
new file mode 100644
index 0000000000..317e01a9b4
--- /dev/null
+++ b/packages/libgpewidget/files/pkgconfig.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2006-02-04 17:37:55.000000000 +0100
++++ configure.ac	2006-02-06 00:56:28.000000000 +0100
+@@ -36,7 +36,7 @@
+ 	ENABLE_CAIRO=$enableval
+ ],
+ [
+-       	PKG_CHECK_EXISTS(cairo, [ENABLE_CAIRO=yes], [ENABLE_CAIRO=no])
++       	PKG_CHECK_MODULES(cairo, [ENABLE_CAIRO=yes], [ENABLE_CAIRO=no])
+ ])
+ 
+ ENABLE_HILDON=false
diff --git a/packages/libgpewidget/libgpewidget-0.100/fixdoc.patch b/packages/libgpewidget/libgpewidget-0.100/fixdoc.patch
deleted file mode 100644
index c5c83af303..0000000000
--- a/packages/libgpewidget/libgpewidget-0.100/fixdoc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- /tmp/libgpewidget-0.100/doc/gtk-doc.make	2005-04-21 23:56:55.000000000 +0200
-+++ libgpewidget-0.100/doc/gtk-doc.make	2005-04-22 12:36:23.628751472 +0200
-@@ -27,7 +27,6 @@
- 	$(DOC_MAIN_SGML_FILE)		\
- 	$(DOC_MODULE)-sections.txt	\
- 	$(DOC_MODULE)-overrides.txt
--#	$(DOC_MODULE).types		\
- 
- DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
- 	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
diff --git a/packages/libgpewidget/libgpewidget-0.99/.mtn2git_empty b/packages/libgpewidget/libgpewidget-0.99/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/libgpewidget/libgpewidget-0.99/.mtn2git_empty
+++ /dev/null
diff --git a/packages/libgpewidget/libgpewidget-0.99/doc.patch b/packages/libgpewidget/libgpewidget-0.99/doc.patch
deleted file mode 100644
index 06b61049e3..0000000000
--- a/packages/libgpewidget/libgpewidget-0.99/doc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- libgpewidget-0.99/doc/Makefile.am.orig	2005-04-19 13:32:58.335718432 +0100
-+++ libgpewidget-0.99/doc/Makefile.am	2005-04-19 13:33:06.755438440 +0100
-@@ -26,12 +26,6 @@
- 	gtkdoc-mkdb --module=$(DOC_MODULE) $(MKDB_OPTIONS) --source-dir=../gpe --source-dir=.. --main-sgml-file=$(DOC_MAIN_SGML_FILE)
- 	gtkdoc-mkhtml $(DOC_MODULE) $(DOC_MAIN_SGML_FILE)
- 
--else
--all: doc
--doc:
--	@echo "Use \"configure --enable-gtk-doc\" to enable documentation"
--	@exit 1
--
- endif
- 
- clean-local:
diff --git a/packages/libgpewidget/libgpewidget_0.100.bb b/packages/libgpewidget/libgpewidget_0.100.bb
deleted file mode 100644
index 977577c469..0000000000
--- a/packages/libgpewidget/libgpewidget_0.100.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-LICENSE = "LGPL"
-PR = "r2"
-DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS="gtk+ libxrender gtk-doc intltool-native"
-#DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native"
-
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2 \
-	file://fixdoc.patch;patch=1"
-
-inherit pkgconfig autotools
-
-#EXTRA_OECONF = "--enable-cairo"
-
-do_stage () {
-	oe_libinstall -C .libs -so libgpewidget ${STAGING_LIBDIR}
-	autotools_stage_includes
-}
-
diff --git a/packages/libgpewidget/libgpewidget_0.109.bb b/packages/libgpewidget/libgpewidget_0.109.bb
new file mode 100644
index 0000000000..bab62fd3dc
--- /dev/null
+++ b/packages/libgpewidget/libgpewidget_0.109.bb
@@ -0,0 +1,27 @@
+LICENSE     = "LGPL"
+DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
+SECTION     = "gpe/libs"
+PRIORITY    = "optional"
+DEPENDS     = "gtk+ cairo libxrender gtk-doc intltool-native"
+MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>"
+PR          = "r1"
+
+PACKAGES =+ "libgpewidget-bin"
+
+PARALLEL_MAKE = ""
+
+SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2 \
+           file://pkgconfig.patch;patch=1;pnum=0"
+
+inherit pkgconfig autotools
+
+FILES_libgpewidget-bin = "${bindir}"
+
+EXTRA_OECONF = "--enable-cairo"
+
+LDFLAGS += " -L${STAGING_LIBDIR}" 
+
+do_stage () {
+	autotools_stage_all
+}
+
diff --git a/packages/libgpewidget/libgpewidget_0.95.bb b/packages/libgpewidget/libgpewidget_0.95.bb
deleted file mode 100644
index 0951beed01..0000000000
--- a/packages/libgpewidget/libgpewidget_0.95.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-LICENSE = "LGPL"
-PR = "r1"
-DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "gtk+ cairo libxrender"
-
-inherit pkgconfig gpe
-
-headers = "infoprint.h init.h render.h errorbox.h smallbox.h pixmaps.h gpetimesel.h gtkdatecombo.h dirbrowser.h stylus.h picturebutton.h popup_menu.h spacing.h translabel.h question.h windows.h gpe-iconlist.h gtksimplemenu.h gpewindowlist.h tray.h popup.h gpeiconlistview.h gpehelp.h gpeiconlistitem.h gpeclockface.h"
-
-do_stage () {
-	oe_libinstall -so libgpewidget ${STAGING_LIBDIR}
-
-	mkdir -p ${STAGING_INCDIR}/gpe
-	for h in ${headers}; do
-		install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/$h
-	done
-}
-
-do_install_append () {
-	oe_runmake PREFIX='${prefix}' DESTDIR='${D}' install-devel
-}
-
diff --git a/packages/libgpewidget/libgpewidget_0.96.bb b/packages/libgpewidget/libgpewidget_0.96.bb
deleted file mode 100644
index 0951beed01..0000000000
--- a/packages/libgpewidget/libgpewidget_0.96.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-LICENSE = "LGPL"
-PR = "r1"
-DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "gtk+ cairo libxrender"
-
-inherit pkgconfig gpe
-
-headers = "infoprint.h init.h render.h errorbox.h smallbox.h pixmaps.h gpetimesel.h gtkdatecombo.h dirbrowser.h stylus.h picturebutton.h popup_menu.h spacing.h translabel.h question.h windows.h gpe-iconlist.h gtksimplemenu.h gpewindowlist.h tray.h popup.h gpeiconlistview.h gpehelp.h gpeiconlistitem.h gpeclockface.h"
-
-do_stage () {
-	oe_libinstall -so libgpewidget ${STAGING_LIBDIR}
-
-	mkdir -p ${STAGING_INCDIR}/gpe
-	for h in ${headers}; do
-		install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/$h
-	done
-}
-
-do_install_append () {
-	oe_runmake PREFIX='${prefix}' DESTDIR='${D}' install-devel
-}
-
diff --git a/packages/libgpewidget/libgpewidget_0.97.bb b/packages/libgpewidget/libgpewidget_0.97.bb
deleted file mode 100644
index 0951beed01..0000000000
--- a/packages/libgpewidget/libgpewidget_0.97.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-LICENSE = "LGPL"
-PR = "r1"
-DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "gtk+ cairo libxrender"
-
-inherit pkgconfig gpe
-
-headers = "infoprint.h init.h render.h errorbox.h smallbox.h pixmaps.h gpetimesel.h gtkdatecombo.h dirbrowser.h stylus.h picturebutton.h popup_menu.h spacing.h translabel.h question.h windows.h gpe-iconlist.h gtksimplemenu.h gpewindowlist.h tray.h popup.h gpeiconlistview.h gpehelp.h gpeiconlistitem.h gpeclockface.h"
-
-do_stage () {
-	oe_libinstall -so libgpewidget ${STAGING_LIBDIR}
-
-	mkdir -p ${STAGING_INCDIR}/gpe
-	for h in ${headers}; do
-		install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/$h
-	done
-}
-
-do_install_append () {
-	oe_runmake PREFIX='${prefix}' DESTDIR='${D}' install-devel
-}
-
diff --git a/packages/libgpewidget/libgpewidget_0.99.bb b/packages/libgpewidget/libgpewidget_0.99.bb
deleted file mode 100644
index c932e67d76..0000000000
--- a/packages/libgpewidget/libgpewidget_0.99.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-LICENSE = "LGPL"
-PR = "r0"
-DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native"
-
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2 \
-	file://doc.patch;patch=1"
-
-inherit pkgconfig autotools
-
-EXTRA_OECONF = "--enable-cairo"
-
-do_stage () {
-	oe_libinstall -C .libs -so libgpewidget ${STAGING_LIBDIR}
-	autotools_stage_includes
-}
-