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

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

2004/09/14 10:30:06+01:00 (none)!cwiiis
Semi-fix detect-stylus and miniclipboard.
Fix xmonobut.
Remove dependency on xinerama from rosetta.
Upgrade gpe-calendar (0.56) and gpe-gallery (0.95).
Add meatchbox-panel-hacks.
Prefer gtk 2.2.4 and libglade 2.0.1 in openzaurus-3.5.1.conf.

BKrev: 4146ba2cDQllTCv8TcQ9e-qKViJQ8Q

17 files changed, 148 insertions, 2 deletions

diff --git a/conf/openzaurus-3.5.1.conf b/conf/openzaurus-3.5.1.conf
index 47d4736cb4..a403af772f 100644
--- a/conf/openzaurus-3.5.1.conf
+++ b/conf/openzaurus-3.5.1.conf
@@ -18,3 +18,5 @@ TARGET_FPU = "soft"
 PREFERRED_VERSION_binutils-cross = "2.15.91.0.1"
 PREFERRED_VERSION_qte-for-opie = "2.3.7"
 PREFERRED_VERSION_orinoco-modules = "0.13e"
+PREFERRED_VERSION_gtk+ = "2.2.4"
+PREFERRED_VERSION_libglade = "2.0.1"
diff --git a/gpe-today/gpe-today_makefiles.patch b/detect-stylus/detect-stylus-0.13/correct-theme-name.patch
index e69de29bb2..e69de29bb2 100644
--- a/gpe-today/gpe-today_makefiles.patch
+++ b/detect-stylus/detect-stylus-0.13/correct-theme-name.patch
diff --git a/detect-stylus/detect-stylus_0.13.oe b/detect-stylus/detect-stylus_0.13.oe
index e69de29bb2..d9c0907c11 100644
--- a/detect-stylus/detect-stylus_0.13.oe
+++ b/detect-stylus/detect-stylus_0.13.oe
@@ -0,0 +1,16 @@
+inherit gpe pkgconfig
+
+PR = "r1"
+
+DEPENDS = "x11 xcursor-transparent-theme xrdb"
+SECTION = "gpe"
+RDEPENDS = "xrdb"
+
+DESCRIPTION = "Touchscreen detection utility"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+
+SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \
+           file://access.patch;patch=1;pnum=0 \
+	   file://correct-theme-name.patch;patch=1"
+
+export CVSBUILD=no
diff --git a/gpe-calendar/gpe-calendar_0.56.oe b/gpe-calendar/gpe-calendar_0.56.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gpe-calendar/gpe-calendar_0.56.oe
diff --git a/gpe-gallery/gpe-gallery_0.95.oe b/gpe-gallery/gpe-gallery_0.95.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gpe-gallery/gpe-gallery_0.95.oe
diff --git a/gpe-today/gpe-today-0.08/gpe-today_makefiles.patch b/gpe-today/gpe-today-0.08/gpe-today_makefiles.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gpe-today/gpe-today-0.08/gpe-today_makefiles.patch
diff --git a/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr-panelapp.desktop b/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr-panelapp.desktop
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr-panelapp.desktop
diff --git a/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr-panelapp.sh b/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr-panelapp.sh
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr-panelapp.sh
diff --git a/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr.png b/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr.png
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr.png
diff --git a/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.oe b/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.oe
diff --git a/meta/meta-gpe.oe b/meta/meta-gpe.oe
index f0b7765777..30132b6e8d 100644
--- a/meta/meta-gpe.oe
+++ b/meta/meta-gpe.oe
@@ -42,7 +42,6 @@ DEPENDS += " ${gpe-task-pim}"
 
 gpe-task-utils = "\
     gpe-bluetooth \
-    gpe-aerial \
     gpe-mixer \
     gpe-edit \
     gpe-su \
@@ -51,6 +50,7 @@ gpe-task-utils = "\
     gpe-gallery \
     gpe-calculator \
     minilite \
+    miniclipboard \
     gpe-taskmanager \
     gpe-package \
     gpe-clock \
@@ -60,6 +60,8 @@ gpe-task-utils = "\
     gpe-shield \
     keylaunch \
     gpe-mininet \
+    xmonobut \
+    matchbox-panel-hacks \
     rosetta \
     detect-stylus"
 
diff --git a/miniclipboard/miniclipboard-0.3/miniclipboard.desktop b/miniclipboard/miniclipboard-0.3/miniclipboard.desktop
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/miniclipboard/miniclipboard-0.3/miniclipboard.desktop
diff --git a/miniclipboard/miniclipboard_0.3.oe b/miniclipboard/miniclipboard_0.3.oe
index e69de29bb2..4e6d0a597f 100644
--- a/miniclipboard/miniclipboard_0.3.oe
+++ b/miniclipboard/miniclipboard_0.3.oe
@@ -0,0 +1,19 @@
+inherit gpe
+
+DESCRIPTION = "Clipboard management application"
+DEPENDS = "x11"
+RDEPENDS = "gdk-pixbuf-loader-xpm"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+PR = "r1"
+
+SRC_URI += "file://miniclipboard.desktop"
+
+do_install() {
+	install -d ${D}/${bindir}
+        install -d ${D}/${datadir}/applications
+	install -d ${D}/${datadir}/pixmaps
+	install -m 0755 miniclipboard ${D}/${bindir}/
+	install -m 0644 ${WORKDIR}/miniclipboard.desktop ${D}/${datadir}/applications/
+	install -m 0644 copy.xpm ${D}/${datadir}/pixmaps/
+	install -m 0644 paste.xpm ${D}/${datadir}/pixmaps/
+}
diff --git a/rosetta/rosetta-makefile.patch b/rosetta/rosetta-makefile.patch
index e69de29bb2..7b9db522e4 100644
--- a/rosetta/rosetta-makefile.patch
+++ b/rosetta/rosetta-makefile.patch
@@ -0,0 +1,91 @@
+diff -u rosetta.orig/Makefile rosetta/Makefile
+--- rosetta.orig/Makefile	2003-09-28 00:37:58.000000000 +1000
++++ rosetta/Makefile	2004-04-29 13:16:23.000000000 +1000
+@@ -20,45 +20,30 @@
+ PACKAGE      = rosetta
+ GTK_PACKAGE  = rosettalearn
+ CVSBUILD     = yes
+-
+ BUILD = build
+-
+ VERSION = 0.01
+ 
+ DESTDIR =
+-PREFIX  = /usr/local
++PREFIX  = /usr
+ OPTIONS = -DNEW_NORMALIZE_CODE -DNEW_MATCH_CODE
+-
+-ifeq ($(CROSSCOMPILE),yes)
+-
+-CC      = arm-linux-gcc
+-STRIP   = arm-linux-strip
+-
+-PKG_CONFIG_PATH=/skiff/local/arm-linux/lib/pkgconfig/
+-
+-LDFLAGS     += -L/skiff/local/arm-linux/lib
+-LDFLAGS     += -L/skiff/local/arm-linux/lib/X11
+-LDFLAGS     += -lX11 -lXtst -lXext -lm 
+-
+-else
+-
+-CC      = gcc
+-STRIP   = strip
+-
+-LDFLAGS     += -L/usr/X11R6/lib -lX11 -lXtst -lm 
+-
+-endif
+-
+ CONTROL = control
+ 
+ CFLAGS += -Os -Wall
+ CFLAGS += -MD $(OPTIONS) -g  
+-CFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DGTK_PACKAGE=\"$(GTK_PACKAGE)\" -DPREFIX=\"$(PREFIX)\" 
+-CFLAGS += -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" 
+-CFLAGS += -DPACKAGE_DATA_DIR=\"$(PREFIX)/share/\"
+-CFLAGS += -I$(GPE_DIR)/libgpewidget
+-CFLAGS += -DENABLE_NLS
+-CFLAGS += $(GPECFLAGS)
++
++PACKAGE_CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\"
++PACKAGE_CPPFLAGS += -DGTK_PACKAGE=\"$(GTK_PACKAGE)\"
++PACKAGE_CPPFLAGS += -DPREFIX=\"$(PREFIX)\"
++PACKAGE_CPPFLAGS += -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" 
++PACKAGE_CPPFLAGS += -DPACKAGE_DATA_DIR=\"$(PREFIX)/share/\"
++PACKAGE_CPPFLAGS += -DENABLE_NLS
++
++PACKAGE_CFLAGS += `pkg-config --cflags gtk+-2.0 libgpewidget x11 xrandr xrender xft xtst xext xau`
++PACKAGE_LDFLAGS += `pkg-config --libs gtk+-2.0 libgpewidget x11 xrandr xrender xft xtst xext xau`
++PACKAGE_LDFLAGS += -L/skiff/local/arm-linux/lib
++PACKAGE_LDFLAGS += -L/skiff/local/arm-linux/lib/X11
++PACKAGE_LDFLAGS += -lm
++
+ #CFLAGS += -DDEBUG
+ 
+ .SUFFIXES: .d .c
+@@ -77,11 +62,15 @@
+ all: $(PACKAGE) $(GTK_PACKAGE)
+ 
+ $(PACKAGE): $(OBJS)
+-	$(CC) -o $@ $^ $(LDFLAGS)
++	$(CC) -o $@ $^ $(PACKAGE_LDFLAGS) $(LDFLAGS)
+ 	
+ $(GTK_PACKAGE): $(GTK_OBJS)
+-	$(CC) -o $@ $^ $(LDFLAGS) $(GPELIBS) -lXrender -lXinerama
++	$(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS) $(GPELIBS)
++
++.c.o:;
++	$(CC) $(PACKAGE_CPPFLAGS) $(PACKAGE_CFLAGS) -c $< -o $@
+ 
++install: install-program
+ install-program: all 
+ 	install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)
+ 	install -D $(GTK_PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(GTK_PACKAGE)
+@@ -92,7 +81,7 @@
+ 	mkdir   -p $(DESTDIR)/etc
+ 	install -m 644 $(PACKAGE).png  $(DESTDIR)$(PREFIX)/share/pixmaps/$(PACKAGE).png
+ 	install -m 644 penwrite24.png  $(DESTDIR)$(PREFIX)/share/pixmaps/penwrite24.png
+-	install -m 644 $(PACKAGE).pc   $(DESTDIR)$(PREFIX)/share/$(PACKAGE)
++#	install -m 644 $(PACKAGE).pc   $(DESTDIR)$(PREFIX)/share/$(PACKAGE)
+ 	install -m 666 $(PACKAGE).db   $(DESTDIR)$(PREFIX)/share/$(PACKAGE)
+ 	install -m 644 $(PACKAGE).conf $(DESTDIR)/etc
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/applications
diff --git a/rosetta/rosetta_cvs.oe b/rosetta/rosetta_cvs.oe
index 9449a58138..d8ffaa47e1 100644
--- a/rosetta/rosetta_cvs.oe
+++ b/rosetta/rosetta_cvs.oe
@@ -1,10 +1,11 @@
 PV = "0.0cvs${CVSDATE}"
-DEPENDS = "gtk+ libgpewidget x11 libxrandr libxft xinerama xtst xext xau"
+DEPENDS = "gtk+ libgpewidget x11 libxrandr libxft xtst xext xau"
 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"
 
 inherit pkgconfig
 
diff --git a/xmonobut/xmonobut.desktop b/xmonobut/xmonobut.desktop
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/xmonobut/xmonobut.desktop
diff --git a/xmonobut/xmonobut_0.4.oe b/xmonobut/xmonobut_0.4.oe
index e69de29bb2..3fb1be9fd9 100644
--- a/xmonobut/xmonobut_0.4.oe
+++ b/xmonobut/xmonobut_0.4.oe
@@ -0,0 +1,15 @@
+PR = "r1"
+DESCRIPTION = "utility to allow middle and right clicking with a stylus"
+DEPENDS = "diet-x11 xext xpm"
+SRC_URI = "http://www.handhelds.org/~mallum/downloadables/xmonobut/xmonobut-${PV}.tar.gz \
+	   file://xmonobut.desktop"
+inherit autotools
+
+do_install() {
+	install -d ${D}/${bindir}
+	install -d ${D}/${datadir}/applications
+	install -d ${D}/${datadir}/pixmaps
+	install -m 0755 xmonobut ${D}/${bindir}/xmonobut
+	install -m 0644 xmonobut.xpm ${D}/${datadir}/pixmaps/xmonobut.xpm
+	install -m 0644 ${WORKDIR}/xmonobut.desktop ${D}/${datadir}/applications/xmonobut.desktop
+}