summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/billiardz/billiardz_0.1.4.bb5
-rw-r--r--packages/gemdropx/gemdropx_0.9.bb1
-rw-r--r--packages/gpe-timesheet/gpe-timesheet-0.13/.mtn2git_empty0
-rw-r--r--packages/gpe-timesheet/gpe-timesheet-0.13/gpe-timesheet-makefile.patch22
-rw-r--r--packages/gpe-timesheet/gpe-timesheet_0.13.bb7
-rw-r--r--packages/gpe-timesheet/gpe-timesheet_0.14.bb7
-rw-r--r--packages/gpe-timesheet/gpe-timesheet_0.16.bb9
-rw-r--r--packages/gpe-timesheet/gpe-timesheet_0.30.bb (renamed from packages/gpe-timesheet/gpe-timesheet_0.15.bb)7
-rw-r--r--packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb2
-rw-r--r--packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb2
-rw-r--r--packages/qpe-games/zrev7_1.0.1.bb12
-rw-r--r--packages/xserver-common/xserver-common_1.10.bb19
-rw-r--r--packages/xserver-common/xserver-common_1.5.bb11
-rw-r--r--packages/xserver-common/xserver-common_1.7.bb11
-rw-r--r--packages/zroadmap/files/qt2-fixes-r1.patch36
-rw-r--r--packages/zroadmap/zroadmap_cvs.bb55
16 files changed, 125 insertions, 81 deletions
diff --git a/packages/billiardz/billiardz_0.1.4.bb b/packages/billiardz/billiardz_0.1.4.bb
index fcba6d2f30..c0477bd4fc 100644
--- a/packages/billiardz/billiardz_0.1.4.bb
+++ b/packages/billiardz/billiardz_0.1.4.bb
@@ -5,9 +5,10 @@ PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
DEPENDS = "libsdl-qpe libsdl-image"
-PR = "r1"
+PR = "r2"
-SRC_URI = "http://www.chipx86.com/packages/ipkg/billiardz-${PV}.tar.gz"
+SRC_URI = "http://www.chipx86.com/packages/ipkg/billiardz-${PV}.tar.gz \
+ file://gcc4.patch;patch=1"
inherit palmtop
diff --git a/packages/gemdropx/gemdropx_0.9.bb b/packages/gemdropx/gemdropx_0.9.bb
index a50fd6b567..4f96715b79 100644
--- a/packages/gemdropx/gemdropx_0.9.bb
+++ b/packages/gemdropx/gemdropx_0.9.bb
@@ -18,6 +18,7 @@ EXTRA_QMAKEVARS_POST += "CONFIG-=qt \
LIBS+=-lSDL_mixer \
LIBS+=-lSDL_image \
LIBS+=-lpthread \
+ LIBS+=-Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT} \
DEFINES+=DATA_PREFIX=\\"\"${datadir}/gemdropx/\\"\""
do_configure_prepend() {
diff --git a/packages/gpe-timesheet/gpe-timesheet-0.13/.mtn2git_empty b/packages/gpe-timesheet/gpe-timesheet-0.13/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gpe-timesheet/gpe-timesheet-0.13/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gpe-timesheet/gpe-timesheet-0.13/gpe-timesheet-makefile.patch b/packages/gpe-timesheet/gpe-timesheet-0.13/gpe-timesheet-makefile.patch
deleted file mode 100644
index bfa5567590..0000000000
--- a/packages/gpe-timesheet/gpe-timesheet-0.13/gpe-timesheet-makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -u gpe-timesheet-0.13.orig/Makefile gpe-timesheet-0.13/Makefile
---- gpe-timesheet-0.13.orig/Makefile 2003-10-10 05:56:43.000000000 +1000
-+++ gpe-timesheet-0.13/Makefile 2004-04-29 15:09:46.000000000 +1000
-@@ -21,7 +21,7 @@
-
- CFLAGS += -MD -Wall $(GTKCFLAGS)
-
--CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
-+PACKAGE_CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
-
- MEMBERS = main sql
-
-@@ -40,6 +40,9 @@
- $(PACKAGE): $(OBJS)
- $(CC) -o $@ $^ $(LGPEWIDGET) $(GTKLDFLAGS) -lsqlite $(LDFLAGS)
-
-+.c.o:;
-+ $(CC) $(PACKAGE_CPPFLAGS) $(CFLAGS) $(GTKCFLAGS) -c $< -o $@
-+
- install-program: all $(PACKAGE).desktop
- mkdir -p $(DESTDIR)$(PREFIX)/bin
- install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)
diff --git a/packages/gpe-timesheet/gpe-timesheet_0.13.bb b/packages/gpe-timesheet/gpe-timesheet_0.13.bb
deleted file mode 100644
index b97ed97ffc..0000000000
--- a/packages/gpe-timesheet/gpe-timesheet_0.13.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-LICENSE = "GPL"
-inherit gpe
-
-DEPENDS = "libgpewidget glib-2.0 gtk+"
-SECTION = "gpe"
-
-SRC_URI += "file://gpe-timesheet-makefile.patch;patch=0"
diff --git a/packages/gpe-timesheet/gpe-timesheet_0.14.bb b/packages/gpe-timesheet/gpe-timesheet_0.14.bb
deleted file mode 100644
index b4f580736c..0000000000
--- a/packages/gpe-timesheet/gpe-timesheet_0.14.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-LICENSE = "GPL"
-inherit gpe
-
-DESCRIPTION = "GPE time tracker"
-DEPENDS = "libgpewidget gtk+ sqlite"
-SECTION = "gpe"
-RDEPENDS = "gpe-icons"
diff --git a/packages/gpe-timesheet/gpe-timesheet_0.16.bb b/packages/gpe-timesheet/gpe-timesheet_0.16.bb
deleted file mode 100644
index 0cd8b539f0..0000000000
--- a/packages/gpe-timesheet/gpe-timesheet_0.16.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-LICENSE = "GPL"
-inherit gpe
-
-DESCRIPTION = "GPE time tracker"
-DEPENDS = "libgpewidget gtk+ sqlite"
-SECTION = "gpe"
-RDEPENDS = "gpe-icons"
-
-SRC_URI = "${GPE_MIRROR}/gpe-timesheet-${PV}.tar.gz"
diff --git a/packages/gpe-timesheet/gpe-timesheet_0.15.bb b/packages/gpe-timesheet/gpe-timesheet_0.30.bb
index 0cd8b539f0..c23c963446 100644
--- a/packages/gpe-timesheet/gpe-timesheet_0.15.bb
+++ b/packages/gpe-timesheet/gpe-timesheet_0.30.bb
@@ -1,9 +1,10 @@
LICENSE = "GPL"
-inherit gpe
+inherit autotools gpe
DESCRIPTION = "GPE time tracker"
+GPE_TARBALL_SUFFIX = "bz2"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
DEPENDS = "libgpewidget gtk+ sqlite"
SECTION = "gpe"
RDEPENDS = "gpe-icons"
-
-SRC_URI = "${GPE_MIRROR}/gpe-timesheet-${PV}.tar.gz"
+ \ No newline at end of file
diff --git a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
index fd5d161cc1..40cf007174 100644
--- a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
+++ b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
@@ -8,6 +8,8 @@ PXAV = "${@bb.data.getVar('PV',d,True).split('-')[2]}"
JPMV = "${@bb.data.getVar('PV',d,True).split('-')[3]}"
PR = "r22"
+COMPATIBLE_MACHINE = 'simpad'
+
FILESPATH = "${FILE_DIRNAME}/opensimpad-${PV}:${FILE_DIRNAME}/opensimpad:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
diff --git a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
index fff45f20e9..51fabecd75 100644
--- a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
+++ b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
@@ -9,6 +9,8 @@ JPMV = "${@bb.data.getVar('PV',d,True).split('-')[3]}"
USBV= "usb20040610"
PR = "r4"
+COMPATIBLE_MACHINE = 'simpad'
+
FILESPATH = "${FILE_DIRNAME}/opensimpad-${PV}:${FILE_DIRNAME}/opensimpad:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
diff --git a/packages/qpe-games/zrev7_1.0.1.bb b/packages/qpe-games/zrev7_1.0.1.bb
index 2f023c4264..5bf5f47eb6 100644
--- a/packages/qpe-games/zrev7_1.0.1.bb
+++ b/packages/qpe-games/zrev7_1.0.1.bb
@@ -1,22 +1,20 @@
DESCRIPTION = "Reversi"
SECTION = "opie/games"
PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
AUTHOR = "Mario Weilguni"
HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-ZRev7.html"
-
+PR = "r1"
SRC_URI = "http://handhelds.org/~zecke/oe_packages/zrev7_V1.0.1.tar.gz \
file://zrev.patch;patch=1"
-
-PV = "1.0.1"
S = "${WORKDIR}/zrev7_V${PV}"
APPNAME = "zrev7"
APPTYPE = "binary"
+APPDESKTOP = "${S}"
-
+inherit opie
do_compile_prepend() {
oe_runmake -C images
@@ -25,8 +23,4 @@ do_compile_prepend() {
do_install () {
install -d ${D}${palmtopdir}/pics/${APPNAME}/
install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
- install -m 0644 ${S}/${APPNAME}.desktop ${D}${palmtopdir}/apps/Games
}
-
-
-inherit opie
diff --git a/packages/xserver-common/xserver-common_1.10.bb b/packages/xserver-common/xserver-common_1.10.bb
new file mode 100644
index 0000000000..de81537f99
--- /dev/null
+++ b/packages/xserver-common/xserver-common_1.10.bb
@@ -0,0 +1,19 @@
+MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
+PR = "r1"
+
+PACKAGE_ARCH = "all"
+
+# we are using a gpe-style Makefile
+inherit gpe
+
+SRC_URI_append = " file://setDPI.sh \
+ file://calibrate_zaurusd.patch;patch=1 \
+ file://poodle-xmodmap-2.6.patch;patch=1"
+
+do_install_append() {
+ install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+}
diff --git a/packages/xserver-common/xserver-common_1.5.bb b/packages/xserver-common/xserver-common_1.5.bb
deleted file mode 100644
index f6d09ac9e1..0000000000
--- a/packages/xserver-common/xserver-common_1.5.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
-DESCRIPTION = "Common X11 scripts and support files"
-LICENSE = "GPL"
-SECTION = "x11"
-RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r1"
-
-PACKAGE_ARCH = "all"
-
-# we are using a gpe-style Makefile
-inherit gpe
diff --git a/packages/xserver-common/xserver-common_1.7.bb b/packages/xserver-common/xserver-common_1.7.bb
deleted file mode 100644
index f6d09ac9e1..0000000000
--- a/packages/xserver-common/xserver-common_1.7.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
-DESCRIPTION = "Common X11 scripts and support files"
-LICENSE = "GPL"
-SECTION = "x11"
-RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r1"
-
-PACKAGE_ARCH = "all"
-
-# we are using a gpe-style Makefile
-inherit gpe
diff --git a/packages/zroadmap/files/qt2-fixes-r1.patch b/packages/zroadmap/files/qt2-fixes-r1.patch
new file mode 100644
index 0000000000..24fe1c9bdb
--- /dev/null
+++ b/packages/zroadmap/files/qt2-fixes-r1.patch
@@ -0,0 +1,36 @@
+
+#
+# Signed off by Michael 'Mickey' Lauer <mickey@Vanille.de>
+#
+
+--- src/qt/qt_main.cc~qt2-fixes-r1.patch
++++ src/qt/qt_main.cc
+@@ -137,7 +137,7 @@
+ switch (orientation[0]) {
+ case 't':
+ case 'T': break;
+-
++#ifndef QWS
+ case 'b':
+ case 'B': moveDockWindow (toolBar, DockBottom); break;
+
+@@ -146,7 +146,7 @@
+
+ case 'r':
+ case 'R': moveDockWindow (toolBar, DockRight); break;
+-
++#endif
+ default: roadmap_log (ROADMAP_FATAL,
+ "Invalid toolbar orientation %s", orientation);
+ }
+--- src/qt/Makefile~qt2-fixes-r1.patch
++++ src/qt/Makefile
+@@ -19,7 +19,7 @@
+
+ ifeq ($(DESKTOP),QPE)
+ CFLAGS += -I$(QTDIR)/include -DQWS
+- LIBS += -lqte -lqpe
++ LIBS += -lqpe
+ INSTALLDIR=$(QTDIR)
+ endif
+
diff --git a/packages/zroadmap/zroadmap_cvs.bb b/packages/zroadmap/zroadmap_cvs.bb
new file mode 100644
index 0000000000..db44964bfd
--- /dev/null
+++ b/packages/zroadmap/zroadmap_cvs.bb
@@ -0,0 +1,55 @@
+DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \
+It displays a map of the streets, tracks the position provided by a NMEA-compliant \
+GPS receiver, identifies the street matching this GPS position and announces the name \
+of the crossing street at the next intersection."
+SECTION = "opie/applications"
+PRIORITY = "optional"
+AUTHOR = "Pascal Martin <pascal.martin@iname.com>"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
+DEPENDS = "popt"
+LICENSE = "GPL"
+PV = "1.0.12+cvs-${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \
+ file://qt2-fixes-r1.patch;pnum=1;patch=1 \
+ http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \
+ file://zroadgps.png"
+S = "${WORKDIR}/roadmap/src"
+
+inherit palmtop
+
+QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}'
+QT_LIBRARY_append_c7x0 = " -laticore"
+
+EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} \
+ CFLAGS="-DQWS -DQT_NO_ROTATE -I${S} ${OE_QMAKE_CXXFLAGS} -I${OE_QMAKE_INCDIR_QT}" \
+ LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" '
+PARALLEL_MAKE = ""
+
+do_configure() {
+ echo removing pregenerated stuff
+ find . -name "moc*"|xargs rm -f
+}
+
+do_compile() {
+ oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a
+ oe_runmake -C gpx libgpx.a
+ oe_runmake -C unix libosroadmap.a
+ oe_runmake -C qt qtroadmap qtroadgps
+}
+
+do_install() {
+ install -d ${D}${palmtopdir}/bin
+ install -d ${D}${palmtopdir}/apps/Applications
+ install -d ${D}${palmtopdir}/pics
+ install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap
+ install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps
+ install -m 0644 roadmap.png ${D}${palmtopdir}/pics/zroadmap.png
+ install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png
+ install -m 0644 qt/ipkg/*.desktop ${D}${palmtopdir}/apps/
+ install -d ${D}${palmtopdir}/share/roadmap/
+ install -m 0644 sprites schema preferences ${D}${palmtopdir}/share/roadmap/
+ install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/
+}