aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Hovland <erik@hovland.org>2006-06-01 14:08:54 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-06-01 14:08:54 +0000
commit5da4bf942566a5c76bbc3e0b1299da1c7da66e85 (patch)
treea6e5b9f6453f5959789366ba563dd8cd3a841918
parent90b513c87911b00fab52e383e5688016be9aa360 (diff)
downloadopenembedded-5da4bf942566a5c76bbc3e0b1299da1c7da66e85.tar.gz
openembedded-5da4bf942566a5c76bbc3e0b1299da1c7da66e85.tar.bz2
openembedded-5da4bf942566a5c76bbc3e0b1299da1c7da66e85.zip
Continue to add missing files to the branch.
-rw-r--r--classes/simplepremirror.bbclass4
-rw-r--r--conf/distro/familiar-0.8.4.conf89
-rw-r--r--conf/distro/familiar-feeds.inc24
-rw-r--r--packages/gpe-aerial/files/iconlist.patch10
-rw-r--r--packages/gpe-clock/gpe-clock_0.25.bb9
-rw-r--r--packages/gpe-plucker/gpe-plucker_0.4.bb9
-rw-r--r--packages/gpe-session-scripts/gpe-session-scripts_0.67.bb29
-rw-r--r--packages/gpe-today/files/no-transparency.patch10
-rw-r--r--packages/gpe-today/gpe-today-0.08/.mtn2git_empty0
-rw-r--r--packages/gpe-today/gpe-today-0.08/gpe-today_makefiles.patch185
-rw-r--r--packages/gpe-today/gpe-today-0.09/.mtn2git_empty0
-rw-r--r--packages/gpe-today/gpe-today-0.09/makefile.patch65
-rw-r--r--packages/gpe-today/gpe-today_0.08.bb9
-rw-r--r--packages/gpe-today/gpe-today_0.09.bb9
-rw-r--r--packages/libgpewidget/libgpewidget_0.112.bb30
-rw-r--r--packages/xserver-common/xserver-common-1.8/hx4700.patch10
16 files changed, 492 insertions, 0 deletions
diff --git a/classes/simplepremirror.bbclass b/classes/simplepremirror.bbclass
new file mode 100644
index 0000000000..baccd52eaf
--- /dev/null
+++ b/classes/simplepremirror.bbclass
@@ -0,0 +1,4 @@
+PREMIRRORS_prepend () {
+ftp://.*/.*/ ${SIMPLE_PREMIRROR}
+http://.*/.*/ ${SIMPLE_PREMIRROR}
+}
diff --git a/conf/distro/familiar-0.8.4.conf b/conf/distro/familiar-0.8.4.conf
new file mode 100644
index 0000000000..8c3cf9667e
--- /dev/null
+++ b/conf/distro/familiar-0.8.4.conf
@@ -0,0 +1,89 @@
+DISTRO = "familiar"
+DISTRO_NAME = "Familiar Linux"
+DISTRO_VERSION = "v0.8.4-rc2"
+
+include conf/distro/familiar.conf
+include conf/distro/familiar-feeds.inc
+
+INHERIT += "simplepremirror"
+SIMPLE_PREMIRROR = "http://familiar.handhelds.org/source/v0.8.4-rc2/sources/"
+
+
+DISTRO_TYPE = "release"
+
+
+CVSDATE = 20051212
+
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+PREFERRED_PROVIDER_virtual/libiconv=glibc
+PREFERRED_PROVIDER_virtual/libintl=glibc
+PREFERRED_PROVIDER_x11=diet-x11
+
+#newer hostap modules didn't seem to work for me
+PREFERRED_VERSION_hostap-modules ?= "0.3.9"
+
+#2.4 machines prefer 0.13e ones
+PREFERRED_VERSION_orinoco-modules ?= "0.13e"
+
+#but 0.13e doesn't build against 2.6
+PREFERRED_VERSION_orinoco-modules_h2200 ?= "0.15"
+PREFERRED_VERSION_orinoco-modules_ipaq-pxa270 ?= "0.15"
+
+#prefer a newer hh.org cvs kernel
+CVSDATE_handhelds-pxa-2.6 = "20051221"
+CVSDATE_LAB-kernel = "20051221"
+
+CVSDATE_gomunicator = "20060518"
+
+#The CSL compiler is unusable because
+# 1) certain programs stop to compile
+# 2) more programs segfault
+PREFERRED_VERSION_gcc ?= "3.4.4"
+PREFERRED_VERSION_gcc-cross ?= "3.4.4"
+PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
+PREFERRED_VERSION_gcc-cross-sdk ?= "3.4.4"
+
+
+#
+# Machines section
+#
+
+# select kernel version for the zaurus family
+
+ZKERNEL_VERSION_poodle = "2.4"
+ZKERNEL_VERSION_collie = "2.4"
+ZKERNEL_VERSION_c7x0 = "2.6"
+ZKERNEL_VERSION_spitz = "2.4"
+ZKERNEL_VERSION_akita = "2.4"
+ZKERNEL_VERSION_borzoi = "2.4"
+ZKERNEL_VERSION_tosa = "2.4"
+
+
+#
+# Opie
+#
+
+PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
+PREFERRED_VERSION_qte = "2.3.10"
+
+OPIE_VERSION = "1.2.1"
+include conf/distro/preferred-opie-versions.inc
+
+#
+# GPE
+#
+
+PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
+PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
+PREFERRED_PROVIDER_x11 = "diet-x11"
+
+include conf/distro/preferred-gpe-versions-2.7.inc
+
+#
+# E
+#
+include conf/distro/preferred-e-versions.inc
+
diff --git a/conf/distro/familiar-feeds.inc b/conf/distro/familiar-feeds.inc
new file mode 100644
index 0000000000..411c97e742
--- /dev/null
+++ b/conf/distro/familiar-feeds.inc
@@ -0,0 +1,24 @@
+DISTRO_FEED_PREFIX = "http://ftp.handhelds.org/distributions/familiar/releases/${DISTRO_VERSION}/feed"
+
+DISTRO_FEEDS_prepend () {
+# Familiar ${DISTRO_VERSION} feeds
+
+# base - essential packages
+src/gz base ${DISTRO_FEED_PREFIX}/base
+src/gz base-${MACHINE} ${DISTRO_FEED_PREFIX}/base/machine/${MACHINE}
+
+# updates - security and bugfix updates go in this feed
+src/gz updates ${DISTRO_FEED_PREFIX}/updates
+src/gz updates-${MACHINE} ${DISTRO_FEED_PREFIX}/updates/machine/${MACHINE}
+
+# common - additional packages not specific to any graphical environment
+src/gz common ${DISTRO_FEED_PREFIX}/common
+src/gz common-${MACHINE} ${DISTRO_FEED_PREFIX}/common/machine/${MACHINE}
+}
+
+DISTRO_LOCALE_FEEDS_PREFIXES = "${DISTRO_FEED_PREFIX}/base ${DISTRO_FEED_PREFIX}/updates ${DISTRO_FEED_PREFIX}/common"
+
+DISTRO_LOCALE_FEEDS_HEADER_prepend () {
+# Familiar ${DISTRO_VERSION} locale feeds
+
+}
diff --git a/packages/gpe-aerial/files/iconlist.patch b/packages/gpe-aerial/files/iconlist.patch
new file mode 100644
index 0000000000..004e317b90
--- /dev/null
+++ b/packages/gpe-aerial/files/iconlist.patch
@@ -0,0 +1,10 @@
+--- main.c.orig 2006-05-10 21:37:32.000000000 +0200
++++ main.c 2006-05-10 21:37:43.000000000 +0200
+@@ -33,7 +33,6 @@
+ #include <gpe/init.h>
+ #include <gpe/pixmaps.h>
+ #include <gpe/errorbox.h>
+-#include <gpe/gpe-iconlist.h>
+ #include <gpe/tray.h>
+ #include <gpe/popup.h>
+ #include <gpe/spacing.h>
diff --git a/packages/gpe-clock/gpe-clock_0.25.bb b/packages/gpe-clock/gpe-clock_0.25.bb
new file mode 100644
index 0000000000..51b001208b
--- /dev/null
+++ b/packages/gpe-clock/gpe-clock_0.25.bb
@@ -0,0 +1,9 @@
+inherit gpe
+
+DESCRIPTION = "GPE panel clock"
+DEPENDS = "gtk+ libschedule libgpewidget gpe-announce atd libgpelaunch"
+RDEPENDS = "gpe-announce atd"
+SECTION = "gpe"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
diff --git a/packages/gpe-plucker/gpe-plucker_0.4.bb b/packages/gpe-plucker/gpe-plucker_0.4.bb
new file mode 100644
index 0000000000..68acf59071
--- /dev/null
+++ b/packages/gpe-plucker/gpe-plucker_0.4.bb
@@ -0,0 +1,9 @@
+inherit gpe pkgconfig
+LICENSE = "GPL"
+DESCRIPTION = "Plucker ebook reader"
+DEPENDS = "gtk+ libgpewidget"
+SECTION = "gpe"
+PRIORITY = "optional"
+
+PARALLEL_MAKE=""
+
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
new file mode 100644
index 0000000000..c207802f9b
--- /dev/null
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
@@ -0,0 +1,29 @@
+LICENSE = "GPL"
+
+inherit gpe
+
+DESCRIPTION = "GPE session startup scripts"
+SECTION = "gpe"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+RDEPENDS_${PN} = "matchbox matchbox-panel (>= 0.9.2-r12) matchbox-desktop (>= 0.9.1-r1) matchbox-common (>= 0.9.1-r2) gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo xserver-common"
+# more rdepends: keylaunch ipaq-sleep apmd blueprobe
+DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo xserver-common"
+
+SRC_URI += "file://matchbox-session \
+ file://disable-composite.xsettings"
+
+do_install_append() {
+ install -d ${D}${sysconfdir}/gpe/xsettings-default.d
+ if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then
+ echo "Gtk/ToolbarStyle:S:icons" > ${D}${sysconfdir}/gpe/xsettings-default.d/toolbar
+ fi
+ install -d ${D}${sysconfdir}/matchbox
+ install ${WORKDIR}/matchbox-session ${D}${sysconfdir}/matchbox/session
+
+ install -d ${D}${sysconfdir}/gpe/xsettings-default.d
+ install -m 0644 ${WORKDIR}/disable-composite.xsettings ${D}${sysconfdir}/gpe/xsettings-default.d/disable-composite
+}
+
+# This makes use of GUI_MACHINE_CLASS, so set PACKAGE_ARCH appropriately
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/gpe-today/files/no-transparency.patch b/packages/gpe-today/files/no-transparency.patch
new file mode 100644
index 0000000000..e10e8cd283
--- /dev/null
+++ b/packages/gpe-today/files/no-transparency.patch
@@ -0,0 +1,10 @@
+--- gpe-today-0.11/main.c.orig 2006-05-21 18:59:40.000000000 +0200
++++ gpe-today-0.11/main.c 2006-05-21 19:01:15.000000000 +0200
+@@ -85,6 +85,7 @@
+ /* some code adpated from mbdesktop.c copyright matthew allum */
+ void set_background(const char *spec)
+ {
++ return;
+ /* img-tiled:<filename>
+ * img-streched:<filename> -- will be tiled too
+ * col-solid:<filename>
diff --git a/packages/gpe-today/gpe-today-0.08/.mtn2git_empty b/packages/gpe-today/gpe-today-0.08/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpe-today/gpe-today-0.08/.mtn2git_empty
diff --git a/packages/gpe-today/gpe-today-0.08/gpe-today_makefiles.patch b/packages/gpe-today/gpe-today-0.08/gpe-today_makefiles.patch
new file mode 100644
index 0000000000..6ef5ddca91
--- /dev/null
+++ b/packages/gpe-today/gpe-today-0.08/gpe-today_makefiles.patch
@@ -0,0 +1,185 @@
+diff -urNd ../gpe-today-0.08-r0.orig/gpe-today-0.08/Makefile gpe-today-0.08/Makefile
+--- ../gpe-today-0.08-r0.orig/gpe-today-0.08/Makefile 2003-11-27 20:25:07.000000000 +0000
++++ gpe-today-0.08/Makefile 2004-06-22 04:30:22.722392968 +0000
+@@ -1,32 +1,20 @@
+ PACKAGE = gpe-today
+ PREFIX = /usr/local
+-VERSION = 0.08
++DEBUG = no
+ CVSBUILD = no
+-#DEBUG = yes
+-#EFENCE = yes
+-LINGUAS = pt de zh_TW ga ro wa fr sv nl cs sk ru
+-
+-MEMBERS = main todo calendar date xsettings
+-
+-GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
+-GTKLDFLAGS += `pkg-config --libs gtk+-2.0`
+-
+-CPPFLAGS = -I../libgpewidget -I../libeventdb -I../libtododb -I../libxsettings -I../libxsettings-client -D_GNU_SOURCE
++VERSION = 0.08
+
+-ifeq ($(EFENCE),yes)
+-LDFLAGS = -lefence
+-endif
++LINGUAS = pt de zh_TW ga ro wa fr sv nl cs sk ru
+
+-ifeq ($(DEBUG),yes)
+-CFLAGS = -g
+-else
+-CFLAGS = -Os -fomit-frame-pointer
++ifeq ($(CVSBUILD),yes)
++PACKAGE_CPPFLAGS += -I../libeventdb -I../libtododb -I../libxsettings -I../libxsettings-client -I../libdisplaymigration -I../libgpepimc
++PACKAGE_LDFLAGS += -L../libeventdb -L../libtododb -L../libxsettings-client -Wl,-rpath-link,../libxsettings -L../libgpepimc
+ endif
++PACKAGE_CPPFLAGS += $(STANDARD_CPPFLAGS)
++PACKAGE_CFLAGS += $(STANDARD_CFLAGS) $(GPECFLAGS)
++PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) $(GPELIBS) -leventdb -ltododb -lXsettings-client -ldisplaymigration -lsqlite -lgpepimc
+
+-CFLAGS += -Wall $(GTKCFLAGS)
+-LDFLAGS += $(GTKLDFLAGS) -L/usr/local/lib -L../libeventdb -leventdb -L../libtododb -ltododb -L../libxsettings -L../libxsettings-client -lXsettings-client -Wl,-rpath-link,../libxsettings
+-CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
+-#CFLAGS += -MD
++MEMBERS = main todo calendar date xsettings
+
+ .SUFFIXES: .d
+
+@@ -42,10 +30,10 @@
+ BUILD = build
+ endif
+
+-all: $(PACKAGE) all-mo
++all: $(PACKAGE)
+
+ $(PACKAGE): $(OBJS)
+- $(CC) -o $@ $^ -L../libgpewidget -lgpewidget -lsqlite $(LDFLAGS)
++ $(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS)
+
+ install-program: all $(PACKAGE).desktop
+ for i in $(PIXMAPS); do install -D -m 644 pixmaps/$$i $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/pixmaps/$$i; done
+diff -urNd ../gpe-today-0.08-r0.orig/gpe-today-0.08/build/Makefile.dpkg_ipkg gpe-today-0.08/build/Makefile.dpkg_ipkg
+--- ../gpe-today-0.08-r0.orig/gpe-today-0.08/build/Makefile.dpkg_ipkg 2003-11-27 20:25:07.000000000 +0000
++++ gpe-today-0.08/build/Makefile.dpkg_ipkg 2004-06-22 04:20:51.000000000 +0000
+@@ -18,8 +18,10 @@
+ LIBGPEWIDGET_PC = libgpewidget
+ endif
+
++ifeq ($(IN_LIBGPEWIDGET),)
+ GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC))
+ GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC))
++endif
+
+ GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0)
+ GTKLIBS = $(shell pkg-config --libs gtk+-2.0)
+@@ -28,16 +30,16 @@
+ STANDARD_CFLAGS = -MD -Wall
+
+ ifeq ($(DEBUG),yes)
+-STANDARD_CFLAGS += -O2 -g
+-STANDARD_LDFLAGS = -g
++CFLAGS += -O2 -g
++LDFLAGS = -g
+ else
+-STANDARD_CFLAGS += -Os -fomit-frame-pointer
++CFLAGS += -Os -fomit-frame-pointer
+ endif
+
+ dist: check-source clean dist-prep
+ rm -rf ../$(PACKAGE)-$(VERSION)
+ mkdir ../$(PACKAGE)-$(VERSION)
+- ( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.d" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -)
++ ( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -)
+ ( cd ../$(PACKAGE)-$(VERSION); mkdir build; cp $(BUILD)/Makefile.dpkg_ipkg $(BUILD)/Makefile.translation build/ ; sed 's:^CVSBUILD.*:CVSBUILD = no:' < Makefile > Makefile.new; mv Makefile.new Makefile )
+ ( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz )
+ rm -rf ../$(PACKAGE)-$(VERSION)
+@@ -53,8 +55,13 @@
+
+ install: install-program install-mo
+
++clean-dist:
++ rm -rf familiar/dist familiar/dist.list
++
++clean: clean-dist
++
+ check-source:
+- @if ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file. Aborting.\n"; exit 1; fi
++ @if [ -e familiar ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file. Aborting.\n"; exit 1; fi
+
+ ipkg: check-source ipkg-prep clean
+ rm -rf familiar/dist
+@@ -68,9 +75,9 @@
+ $(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program
+ rm -rf familiar/dist.list
+ ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list
+- rm -f
+ if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi
+ md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch
++ rm -rf familiar/dist familiar/dist.list
+ $(MAKE) printinfo
+
+ dpkg: dist
+@@ -89,6 +96,7 @@
+ @printf " ftp://ftp.handhelds.org/pub/projects/gpe/\n"
+ @printf " (handhelds.org:~ftp/pub/projects/gpe/source)\n"
+ @printf "You can use 'make dist-upload' to do that.\n"
++ @printf "You are currently known as USER %s.\n" $(USER)
+ @printf '-------------------------------------------------------------------------------\n'
+
+ tag: check-source
+@@ -101,3 +109,6 @@
+
+ %.pc: %.pc.in
+ sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@
++
++.c.o:;
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@
+diff -urNd ../gpe-today-0.08-r0.orig/gpe-today-0.08/build/Makefile.translation gpe-today-0.08/build/Makefile.translation
+--- ../gpe-today-0.08-r0.orig/gpe-today-0.08/build/Makefile.translation 2003-11-27 20:25:07.000000000 +0000
++++ gpe-today-0.08/build/Makefile.translation 2004-06-22 04:20:51.000000000 +0000
+@@ -5,7 +5,7 @@
+ # use ipkg-build or ipkg-deb-build
+ IPKG_BUILD := ipkg-build
+
+-TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint/
++TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint
+
+ ifeq ($(DIR_PO),)
+ DIR_PO := po
+@@ -56,7 +56,7 @@
+ ( SOURCES="$(SOURCES)"; for DESK in $(PACKAGE).desktop.in $(EXTRA_DESKTOPS); do if [ -f $$DESK ]; then intltool-extract --type=gettext/ini $$DESK; SOURCES="$$SOURCES $${DESK}.h"; fi; done; if [ "x$$SOURCES" != "x" ]; then xgettext --add-comments=TRANSLATORS: -k_ -kN_ -o $(DIR_PO)/$(PACKAGE).pot.new $$SOURCES; fi )
+ if [ -f $(DIR_PO)/$(PACKAGE).pot.new ]; then if cmp -s $(DIR_PO)/$(PACKAGE).pot.new $(PACKAGE).pot; then rm $(DIR_PO)/$(PACKAGE).pot.new; else mv $(DIR_PO)/$(PACKAGE).pot.new $(DIR_PO)/$(PACKAGE).pot; fi; fi
+
+-clean: clean-po
++clean: clean-po clean-dist-translation
+
+ clean-po:
+ rm -rf $(DIR_PO)/*.mo
+@@ -76,10 +76,17 @@
+
+ MAINTAINER = $(shell grep 'Maintainer: ' familiar/$(CONTROL) | cut -d ' ' -f 2-)
+
++ifndef BUILD
++BUILD = ../build
++endif
++
+ transdist := familiar/dist-translation
+-templates := ../build/familiar
++templates := $(BUILD)/familiar
+ ipkglist := translation-ipkgs.txt
+
++clean-dist-translation:
++ rm -rf $(transdist) $(ipkglist)
++
+ real-translation-package: all-mo
+ rm -rf $(transdist) $(ipkglist)
+ for LINGUA in $(LINGUAS); do \
+@@ -89,8 +96,7 @@
+ install -m 644 po/$$LINGUA.mo $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES/$(PACKAGE).mo; \
+ sed -e "s/<maintainer>/$(MAINTAINER)/;s/<package>/$(BINPACKAGE)/;s/<version>/$(VERSION)/;s/<language>/$$i/;s!<source>!$(SOURCE)!" $(templates)/control.translation > $(transdist)/$$i/CONTROL/control; \
+ install $(templates)/postinst.translation $(transdist)/$$i/CONTROL/postinst; \
+- chown -R root.root $(transdist)/$$i; \
+- $(IPKG_BUILD) $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \
++ $(IPKG_BUILD) -g 0 -o 0 $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \
+ done
+
+ translation-ipkg:
diff --git a/packages/gpe-today/gpe-today-0.09/.mtn2git_empty b/packages/gpe-today/gpe-today-0.09/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpe-today/gpe-today-0.09/.mtn2git_empty
diff --git a/packages/gpe-today/gpe-today-0.09/makefile.patch b/packages/gpe-today/gpe-today-0.09/makefile.patch
new file mode 100644
index 0000000000..6f405a6d7f
--- /dev/null
+++ b/packages/gpe-today/gpe-today-0.09/makefile.patch
@@ -0,0 +1,65 @@
+--- /tmp/Makefile 2005-09-01 17:07:30.218823872 +0200
++++ gpe-today-0.09/Makefile 2005-09-01 17:07:32.698446912 +0200
+@@ -1,7 +1,7 @@
+ PACKAGE = gpe-today
+ PREFIX = /usr/local
+ VERSION = 0.09
+-CVSBUILD = no
++CVSBUILD =no
+ #DEBUG = yes
+ #EFENCE = yes
+
+@@ -9,28 +9,27 @@
+
+ MEMBERS = main todo calendar date xsettings
+
+-GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
+-GTKLDFLAGS += `pkg-config --libs gtk+-2.0`
+-
+-CPPFLAGS = -I../libgpewidget -I../libeventdb -I../libtododb -I../libxsettings -I../libxsettings-client -D_GNU_SOURCE
+-
+ ifeq ($(EFENCE),yes)
+-LDFLAGS = -lefence
++PACKAGE_LDFLAGS = -lefence
+ endif
+
+ ifeq ($(DEBUG),yes)
+-CFLAGS = -g
++package_CFLAGS = -g
+ else
+-CFLAGS = -Os -fomit-frame-pointer
++PACKAGE_CFLAGS = -Os -fomit-frame-pointer
+ endif
+
+-CFLAGS += -Wall $(GTKCFLAGS)
+-LDFLAGS += $(GTKLDFLAGS) -L/usr/local/lib -L../libeventdb -leventdb -L../libtododb -ltododb -L../libxsettings -L../libxsettings-client -lXsettings-client -Wl,-rpath-link,../libxsettings -Wl,-rpath-link,../libgpepimc -Wl,-rpath-link,../libdisplaymigration
+-CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
+-#CFLAGS += -MD
+-
+ .SUFFIXES: .d
+
++ifeq ($(CVSBUILD),yes)
++PACKAGE_CPPFLAGS += -I../libeventdb -I../libtododb -I../libxsettings -I../libxsettings-client -I../libdisplaymigration -I../libgpepimc
++PACKAGE_LDFLAGS += -L../libeventdb -L../libtododb -L../libxsettings-client -Wl,-rpath-link,../libxsettings -L../libgpepimc
++endif
++PACKAGE_CPPFLAGS += $(STANDARD_CPPFLAGS)
++PACKAGE_CFLAGS += $(STANDARD_CFLAGS) $(GPECFLAGS)
++PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) $(GPELIBS) -leventdb -ltododb -lXsettings-client -lsqlite -lgpepimc
++
++
+ OBJS = $(patsubst %,%.o,$(MEMBERS))
+ DEPS = $(patsubst %,%.d,$(MEMBERS))
+ SOURCES = $(patsubst %,%.c,$(MEMBERS))
+@@ -43,10 +42,10 @@
+ BUILD = build
+ endif
+
+-all: $(PACKAGE) all-mo
++all: $(PACKAGE)
+
+ $(PACKAGE): $(OBJS)
+- $(CC) -o $@ $^ -L../libgpewidget -lgpewidget -lsqlite $(LDFLAGS)
++ $(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS)
+
+ install-program: all $(PACKAGE).desktop
+ for i in $(PIXMAPS); do install -D -m 644 pixmaps/$$i $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/pixmaps/$$i; done
diff --git a/packages/gpe-today/gpe-today_0.08.bb b/packages/gpe-today/gpe-today_0.08.bb
new file mode 100644
index 0000000000..492128a3a5
--- /dev/null
+++ b/packages/gpe-today/gpe-today_0.08.bb
@@ -0,0 +1,9 @@
+LICENSE = "GPL"
+inherit gpe
+
+DESCRIPTION = "Displays a summary of appointments and tasks for the day ahead"
+DEPENDS = "gtk+ libxrandr libxsettings libxsettings-client libgpewidget libdisplaymigration libeventdb libgpepimc libtododb"
+SECTION = "gpe"
+PRIORITY = "optional"
+
+SRC_URI += "file://gpe-today_makefiles.patch;patch=1"
diff --git a/packages/gpe-today/gpe-today_0.09.bb b/packages/gpe-today/gpe-today_0.09.bb
new file mode 100644
index 0000000000..916b5ab50f
--- /dev/null
+++ b/packages/gpe-today/gpe-today_0.09.bb
@@ -0,0 +1,9 @@
+LICENSE = "GPL"
+inherit gpe
+
+DESCRIPTION = "Displays a summary of appointments and tasks for the day ahead"
+DEPENDS = "gtk+ libxrandr libxsettings libxsettings-client libgpewidget libdisplaymigration libeventdb libgpepimc libtododb"
+SECTION = "gpe"
+PRIORITY = "optional"
+
+SRC_URI += "file://makefile.patch;patch=1"
diff --git a/packages/libgpewidget/libgpewidget_0.112.bb b/packages/libgpewidget/libgpewidget_0.112.bb
new file mode 100644
index 0000000000..cc33e71613
--- /dev/null
+++ b/packages/libgpewidget/libgpewidget_0.112.bb
@@ -0,0 +1,30 @@
+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 = "r0"
+
+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
+}
+
+do_configure () {
+ autotools_do_configure
+}
diff --git a/packages/xserver-common/xserver-common-1.8/hx4700.patch b/packages/xserver-common/xserver-common-1.8/hx4700.patch
new file mode 100644
index 0000000000..7e286debd7
--- /dev/null
+++ b/packages/xserver-common/xserver-common-1.8/hx4700.patch
@@ -0,0 +1,10 @@
+--- xserver-common-1.8/X11/hx4700.xmodmap.orig 2006-05-13 01:18:59.000000000 +0200
++++ xserver-common-1.8/X11/hx4700.xmodmap 2006-05-13 01:19:02.000000000 +0200
+@@ -1,6 +1,6 @@
+ keycode 75 = XF86Calendar
+ keycode 76 = telephone
+ keycode 95 = XF86Mail
+-keycode 96 = XF86Record
++keycode 96 = XF86AudioRecord
+ keycode 110 = XF86Start
+ keycode 124 = XF86PowerDown