diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/glibc/glibc_2.3.5+cvs20050627.bb | 6 | ||||
-rw-r--r-- | packages/gpe-conf/gpe-conf_0.1.30.bb | 27 | ||||
-rw-r--r-- | packages/matchbox-common/matchbox-common/add-media-category.patch | 37 | ||||
-rw-r--r-- | packages/matchbox-common/matchbox-common_0.9.1.bb | 5 | ||||
-rw-r--r-- | packages/matchbox-desktop/matchbox-desktop-0.9.1/.mtn2git_empty (renamed from packages/xserver-common/files/.mtn2git_empty) | 0 | ||||
-rw-r--r-- | packages/matchbox-desktop/matchbox-desktop-0.9.1/mb-desktop-multi-category-matching.patch | 39 | ||||
-rw-r--r-- | packages/matchbox-desktop/matchbox-desktop_0.9.1.bb | 4 | ||||
-rw-r--r-- | packages/matchbox-panel/matchbox-panel-0.9.2/mb-panel-multi-category-matching.patch | 32 | ||||
-rw-r--r-- | packages/matchbox-panel/matchbox-panel_0.9.2.bb | 3 | ||||
-rw-r--r-- | packages/python/python-pylinda/honor-datadir.patch | 32 | ||||
-rw-r--r-- | packages/python/python-pylinda_0.6.bb (renamed from packages/python/python-pylinda_0.5.bb) | 2 | ||||
-rw-r--r-- | packages/xserver-common/files/cxk-rotation.patch | 24 | ||||
-rw-r--r-- | packages/xserver-common/xserver-common_1.8.bb | 11 |
13 files changed, 168 insertions, 54 deletions
diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index e7adcd0a39..41a5f7e5a7 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -7,7 +7,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" SRCDATE = "20050627" -PR = "r1" +PR = "r2" GLIBC_ADDONS ?= "ports,linuxthreads" GLIBC_EXTRA_OECONF ?= "" @@ -41,8 +41,8 @@ INHIBIT_DEFAULT_DEPS = "1" # \ # file://arm-ioperm.patch;patch=1;pnum=0 \ # file://ldd.patch;patch=1;pnum=0 \ -SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc \ - cvs://anoncvs@sources.redhat.com/cvs/glibc;module=ports \ +SRC_URI = "http://familiar.handhelds.org/source/v0.8.3/libc_sources.redhat.com__20050627.tar.gz \ + http://familiar.handhelds.org/source/v0.8.3/ports_sources.redhat.com__20050627.tar.gz \ file://arm-audit.patch;patch=1 \ file://arm-audit2.patch;patch=1 \ file://arm-no-hwcap.patch;patch=1 \ diff --git a/packages/gpe-conf/gpe-conf_0.1.30.bb b/packages/gpe-conf/gpe-conf_0.1.30.bb new file mode 100644 index 0000000000..8eb1360e92 --- /dev/null +++ b/packages/gpe-conf/gpe-conf_0.1.30.bb @@ -0,0 +1,27 @@ +PACKAGES = "gpe-conf gpe-conf-panel" +LICENSE = "GPL" +SECTION = "gpe" +PRIORITY = "optional" +MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" + +inherit gpe +PR="r0" + +DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ipaq-sleep ntp gpe-login gpe-icons" +RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons" +RDEPENDS_gpe-conf-panel = "gpe-conf" +FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \ + ${datadir}/applications/gpe-conf-* ${datadir}/gpe/pixmaps \ + ${datadir}/gpe-conf" +FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop" + +do_compile () { + oe_runmake PREFIX=${prefix} + oe_runmake all-desktop PREFIX=${prefix} +} + +do_install () { + oe_runmake MACHINE=${MACHINE} PREFIX=${prefix} DESTDIR=${D} install-program +} + + diff --git a/packages/matchbox-common/matchbox-common/add-media-category.patch b/packages/matchbox-common/matchbox-common/add-media-category.patch new file mode 100644 index 0000000000..5c502b3797 --- /dev/null +++ b/packages/matchbox-common/matchbox-common/add-media-category.patch @@ -0,0 +1,37 @@ +diff -urN matchbox-common-0.9.1/data/vfolders-pda.orig/Makefile.am matchbox-common-0.9.1/data/vfolders-pda/Makefile.am +--- matchbox-common-0.9.1/data/vfolders-pda.orig/Makefile.am 2004-12-01 12:22:30.000000000 +0100 ++++ matchbox-common-0.9.1/data/vfolders-pda/Makefile.am 2006-02-16 21:32:57.000000000 +0100 +@@ -1,5 +1,6 @@ + desktop_files = Applications.directory \ + Games.directory \ ++ Media.directory \ + Other.directory \ + Root.directory \ + Settings.directory \ +@@ -11,4 +12,4 @@ + vfolders_DATA = $(desktop_files) + endif + +-EXTRA_DIST = $(desktop_files) +\ No newline at end of file ++EXTRA_DIST = $(desktop_files) +diff -urN matchbox-common-0.9.1/data/vfolders-pda.orig/Media.directory matchbox-common-0.9.1/data/vfolders-pda/Media.directory +--- matchbox-common-0.9.1/data/vfolders-pda.orig/Media.directory 1970-01-01 01:00:00.000000000 +0100 ++++ matchbox-common-0.9.1/data/vfolders-pda/Media.directory 2006-02-16 21:16:29.000000000 +0100 +@@ -0,0 +1,8 @@ ++[Desktop Entry] ++Name=Media ++Name[de]=Medien ++Comment=View media files ++Comment[de]=Programme zur Wiedergabe von audiovisuellen Medien ++Icon=mbfolder.png ++Type=Directory ++Match=AudioVideo;Graphics;Media;Viewer; +diff -urN matchbox-common-0.9.1/data/vfolders-pda.orig/Root.order matchbox-common-0.9.1/data/vfolders-pda/Root.order +--- matchbox-common-0.9.1/data/vfolders-pda.orig/Root.order 2006-02-16 20:51:36.000000000 +0100 ++++ matchbox-common-0.9.1/data/vfolders-pda/Root.order 2006-02-16 20:53:23.000000000 +0100 +@@ -1,3 +1,4 @@ ++Media + Games + Settings + Other diff --git a/packages/matchbox-common/matchbox-common_0.9.1.bb b/packages/matchbox-common/matchbox-common_0.9.1.bb index 27c2bdf508..d2db4683e1 100644 --- a/packages/matchbox-common/matchbox-common_0.9.1.bb +++ b/packages/matchbox-common/matchbox-common_0.9.1.bb @@ -2,10 +2,11 @@ SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager common files" LICENSE = "GPL" DEPENDS = "libmatchbox" -PR = "r1" +PR = "r2" SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \ - file://no-utilities-category.patch;patch=1" + file://no-utilities-category.patch;patch=1 \ + file://add-media-category.patch;patch=1" inherit autotools pkgconfig diff --git a/packages/xserver-common/files/.mtn2git_empty b/packages/matchbox-desktop/matchbox-desktop-0.9.1/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/xserver-common/files/.mtn2git_empty +++ b/packages/matchbox-desktop/matchbox-desktop-0.9.1/.mtn2git_empty diff --git a/packages/matchbox-desktop/matchbox-desktop-0.9.1/mb-desktop-multi-category-matching.patch b/packages/matchbox-desktop/matchbox-desktop-0.9.1/mb-desktop-multi-category-matching.patch new file mode 100644 index 0000000000..e4c245e5f0 --- /dev/null +++ b/packages/matchbox-desktop/matchbox-desktop-0.9.1/mb-desktop-multi-category-matching.patch @@ -0,0 +1,39 @@ +--- matchbox-desktop-0.9.1/modules/dotdesktop.c.orig 2006-02-15 23:08:31.000000000 +0100 ++++ matchbox-desktop-0.9.1/modules/dotdesktop.c 2006-02-16 00:31:46.000000000 +0100 +@@ -84,9 +84,33 @@ + item_fallback = item; + continue; + } +- if (category && strstr(category, match_str)) +- { +- return item; ++ if (category) ++ { ++ if (strstr(match_str, ";")) ++ { ++ char *s; ++ ++ while (s = strstr(match_str, ";")) ++ { ++ size_t len = s - match_str; ++ char *tok = (char *) malloc (sizeof (char) * (len + 1)); ++ ++ strncpy (tok, match_str, len); ++ tok[len] = 0; ++ if (strstr (category, tok)) ++ { ++ free (tok); ++ return item; ++ } ++ match_str = s + 1; ++ ++ free (tok); ++ } ++ } ++ else if (strstr(category, match_str)) ++ { ++ return item; ++ } + } + } + } diff --git a/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb b/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb index 5b1e472de7..5e9748c4d9 100644 --- a/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb +++ b/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb @@ -2,8 +2,10 @@ DESCRIPTION = "Matchbox Window Manager Desktop" LICENSE = "GPL" DEPENDS = "libmatchbox startup-notification" SECTION = "x11/wm" +PR = "r1" -SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.9/matchbox-desktop-${PV}.tar.bz2" +SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.9/matchbox-desktop-${PV}.tar.bz2 \ + file://mb-desktop-multi-category-matching.patch;patch=1" EXTRA_OECONF = "--enable-startup-notification --enable-dnotify" diff --git a/packages/matchbox-panel/matchbox-panel-0.9.2/mb-panel-multi-category-matching.patch b/packages/matchbox-panel/matchbox-panel-0.9.2/mb-panel-multi-category-matching.patch new file mode 100644 index 0000000000..3bd5d915b5 --- /dev/null +++ b/packages/matchbox-panel/matchbox-panel-0.9.2/mb-panel-multi-category-matching.patch @@ -0,0 +1,32 @@ +--- matchbox-panel-0.9.2/applets/mb-applet-menu-launcher.c 2005-04-06 22:13:00.000000000 +0200 ++++ matchbox-panel-0.9.2.new/applets/mb-applet-menu-launcher.c 2006-02-16 00:43:28.000000000 +0100 +@@ -566,7 +566,28 @@ + { + fallback = menu_lookup[i].item; + } +- if (strstr(category, ++ if (strstr(menu_lookup[i].match_str, ";")) ++ { ++ char *s; ++ char *match_str = menu_lookup[i].match_str; ++ ++ while (s = strstr(match_str, ";")) ++ { ++ size_t len = s - match_str; ++ char *tok = (char *) malloc (sizeof (char) * (len + 1)); ++ ++ strncpy (tok, match_str, len); ++ tok[len] = 0; ++ match_str = s + 1; ++ ++ if (strstr (category, tok)) ++ { ++ m = menu_lookup[i].item; ++ } ++ free (tok); ++ } ++ } ++ else if (strstr(category, + menu_lookup[i].match_str)) + { + m = menu_lookup[i].item; diff --git a/packages/matchbox-panel/matchbox-panel_0.9.2.bb b/packages/matchbox-panel/matchbox-panel_0.9.2.bb index 0e2ccf3f07..7ae8836040 100644 --- a/packages/matchbox-panel/matchbox-panel_0.9.2.bb +++ b/packages/matchbox-panel/matchbox-panel_0.9.2.bb @@ -1,11 +1,12 @@ include matchbox-panel.inc -PR="r10" +PR="r11" SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \ file://add_hostap.patch;patch=1 \ http://handhelds.org/~pb/mb-panel-0.9.2-polling.patch;patch=1 \ http://handhelds.org/~pb/mb-panel-0.9.2-msgcancel.patch;patch=1 \ file://mb-applet-battery-repaint.patch;patch=1 \ + file://mb-panel-multi-category-matching.patch;patch=1 \ file://system-monitor-crash-fix.patch;patch=1 " diff --git a/packages/python/python-pylinda/honor-datadir.patch b/packages/python/python-pylinda/honor-datadir.patch index 9035804592..decf686e34 100644 --- a/packages/python/python-pylinda/honor-datadir.patch +++ b/packages/python/python-pylinda/honor-datadir.patch @@ -3,27 +3,13 @@ # Patch managed by http://www.holgerschurig.de/patcher.html # ---- linda-0.4/setup.py~honor-datadir.patch -+++ linda-0.4/setup.py -@@ -74,7 +74,7 @@ - class myinstall(install): - def run(self): - install.run(self) -- -+ return - print "PyLinda's post-install options" +--- linda-0.6/setup.py~honor-datadir.patch ++++ linda-0.6/setup.py +@@ -68,6 +68,7 @@ + f.close() - # the following is taken from the install_scripts standard command -@@ -123,9 +123,9 @@ - Topic :: System :: Distributed Computing""".split("\n"), - version="0.4", - scripts=["linda_server.py"], -- data_files=[(root_path+"/examples", glob.glob("examples/*.py")), -- (root_path+"/doc", glob.glob("doc/html/*")), -- (root_path, ["README"])], -+ data_files=[("examples", glob.glob("examples/*.py")), -+ ("doc", glob.glob("doc/html/*")), -+ (".", ["README"])], - ext_modules=ext, - packages=["linda"], - package_dir={"linda": ""}, + def getlibpath(): ++ return os.getenv("LINDA_DATADIR") + l = sys.path + l.reverse() + for x in l: diff --git a/packages/python/python-pylinda_0.5.bb b/packages/python/python-pylinda_0.6.bb index 788db867c4..3bcd1a1362 100644 --- a/packages/python/python-pylinda_0.5.bb +++ b/packages/python/python-pylinda_0.6.bb @@ -10,3 +10,5 @@ SRC_URI = "http://www-users.cs.york.ac.uk/~aw/pylinda/dist/linda-${PV}.tar.gz \ S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils + +export LINDA_DATADIR = "${D}/${libdir}/${PYTHON_DIR}" diff --git a/packages/xserver-common/files/cxk-rotation.patch b/packages/xserver-common/files/cxk-rotation.patch deleted file mode 100644 index f29d052d8d..0000000000 --- a/packages/xserver-common/files/cxk-rotation.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur xserver-common-1.1~/X11/Xinit.d/11zaurus xserver-common-1.1/X11/Xinit.d/11zaurus ---- xserver-common-1.1~/X11/Xinit.d/11zaurus 2005-08-29 03:52:46.000000000 -0700 -+++ xserver-common-1.1/X11/Xinit.d/11zaurus 2005-09-12 11:03:37.000000000 -0700 -@@ -5,8 +5,19 @@ - exit 0 - fi - -+module_id() { -+ # Get model name -+ echo `grep "^Hardware" /proc/cpuinfo | sed -e "s/.*: *//" | tr a-z A-Z` -+} -+ - chkhinge -e - if [ $? = 12 ]; then -- xrandr -o right -+ case `module_id` in -+ *SPITZ | *AKITA | *BORZOI) -+ DIRECTION="left" ;; -+ default) -+ DIRECTION="right" ;; -+ esac -+ xrandr -o $DIRECTION - fi - diff --git a/packages/xserver-common/xserver-common_1.8.bb b/packages/xserver-common/xserver-common_1.8.bb new file mode 100644 index 0000000000..125b138f02 --- /dev/null +++ b/packages/xserver-common/xserver-common_1.8.bb @@ -0,0 +1,11 @@ +MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" +DESCRIPTION = "Common X11 scripts and support files" +LICENSE = "GPL" +SECTION = "x11" +RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" +PR = "r0" + +PACKAGE_ARCH = "all" + +# we are using a gpe-style Makefile +inherit gpe |