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

into chris.(none):/home/cwiiis/oe/packages

2004/09/24 13:28:10+01:00 (none)!cwiiis
Fix rosetta problems, courtesy of Ole Reinhardt and florian.

BKrev: 41541640YJon8iOgGNhJ13j_1fAavg

diff --git a/rosetta/rosetta-makefile.patch b/rosetta/rosetta-makefile.patch
index 7b9db52..73efd99 100644 (file)
--- a/rosetta/rosetta-makefile.patch
+++ b/rosetta/rosetta-makefile.patch
@@ -46,7 +46,7 @@ diff -u rosetta.orig/Makefile rosetta/Makefile
 -CFLAGS += -DENABLE_NLS
 -CFLAGS += $(GPECFLAGS)
 +
-+PACKAGE_CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\"
++PACKAGE_CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" $(OPTIONS)
 +PACKAGE_CPPFLAGS += -DGTK_PACKAGE=\"$(GTK_PACKAGE)\"
 +PACKAGE_CPPFLAGS += -DPREFIX=\"$(PREFIX)\"
 +PACKAGE_CPPFLAGS += -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" 

diff --git a/rosetta/rosetta_cvs.oe b/rosetta/rosetta_cvs.oe
index d8ffaa4..e8d2231 100644 (file)
--- a/rosetta/rosetta_cvs.oe
+++ b/rosetta/rosetta_cvs.oe
@@ -5,7 +5,7 @@ DESCRIPTION = "Multistroke / full word handwriting recognition for X"
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=rosetta \
        file://rosetta-makefile.patch;patch=1"
 S = "${WORKDIR}/rosetta"
-PR = "r1"
+PR = "r2"
 
 inherit pkgconfig
 
@@ -15,3 +15,6 @@ do_install () {
         oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program
 }
 
+do_postinst () {
+  ${prefix}/bin/rosetta -R
+}