diff options
author | Florian Boor <florian.boor@kernelconcepts.de> | 2006-02-16 23:06:02 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-16 23:06:02 +0000 |
commit | e6f6ecb62b493d186fcfd302f1b60c886c68e55b (patch) | |
tree | 5b11d697bd2dbe3027d875fdbc2419a90c0d03df | |
parent | 707d0080cf23b6ba5cc632e60b0229031cdff90a (diff) | |
parent | 2128f1a94ded090ab6d135d31798e3ddb97b1bd8 (diff) |
merge of 83ec6c603eb4d350be69c0ac3f03f8be63a970cd
and 96f792c135e95ff503266e442db17ede3ba27060
19 files changed, 160 insertions, 18 deletions
diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf index 1d40bbac56..d32ea7058c 100644 --- a/conf/distro/familiar-unstable.conf +++ b/conf/distro/familiar-unstable.conf @@ -13,8 +13,12 @@ DISTRO_TYPE = "debug" FEED_URIS += " \ - base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ - updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates" + base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ + ${MACHINE}##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/machine/${MACHINE} \ + updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates \ + locale-en##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/en \ + locale-fr##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/fr \ + locale-de##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/de" #SRCDATE = 20050331 #SRCDATE = "now" @@ -41,9 +45,9 @@ PREFERRED_VERSION_orinoco-modules_ipaq-pxa270 ?= "0.15" # 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 ?= "3.4.4" +#PREFERRED_VERSION_gcc-cross ?= "3.4.4" +#PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" # # Opie diff --git a/packages/gdbm/gdbm-1.8.3/libtool-mode.patch b/packages/gdbm/gdbm-1.8.3/libtool-mode.patch new file mode 100644 index 0000000000..c56bac2ca9 --- /dev/null +++ b/packages/gdbm/gdbm-1.8.3/libtool-mode.patch @@ -0,0 +1,20 @@ +--- gdbm-1.8.3/Makefile.in.orig 2006-02-16 15:17:25.000000000 +0000 ++++ gdbm-1.8.3/Makefile.in 2006-02-16 15:18:08.000000000 +0000 +@@ -131,7 +131,7 @@ + $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) \ + $(DESTDIR)$(includedir) $(DESTDIR)$(man3dir) \ + $(DESTDIR)$(infodir) +- $(LIBTOOL) $(INSTALL) -c libgdbm.la $(DESTDIR)$(libdir)/libgdbm.la ++ $(LIBTOOL) --mode=install $(INSTALL) -c libgdbm.la $(DESTDIR)$(libdir)/libgdbm.la + $(INSTALL_DATA) gdbm.h \ + $(DESTDIR)$(includedir)/gdbm.h + $(INSTALL_DATA) $(srcdir)/gdbm.3 \ +@@ -142,7 +142,7 @@ + install-compat: + $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) \ + $(DESTDIR)$(includedir) +- $(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \ ++ $(LIBTOOL) --mode=install $(INSTALL) -c libgdbm_compat.la \ + $(DESTDIR)$(libdir)/libgdbm_compat.la + $(INSTALL_DATA) $(srcdir)/dbm.h \ + $(DESTDIR)$(includedir)/dbm.h diff --git a/packages/gdbm/gdbm_1.8.3.bb b/packages/gdbm/gdbm_1.8.3.bb index 7429f41679..ecef5fc414 100644 --- a/packages/gdbm/gdbm_1.8.3.bb +++ b/packages/gdbm/gdbm_1.8.3.bb @@ -6,7 +6,8 @@ LICENSE = "GPL" PR = "r2" SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ - file://makefile.patch;patch=1" + file://makefile.patch;patch=1 \ + file://libtool-mode.patch;patch=1" inherit autotools diff --git a/packages/gnome/gnome-icon-theme_1.3.3.bb b/packages/gnome/gnome-icon-theme_1.3.3.bb index e44a06697e..1e693e6f74 100644 --- a/packages/gnome/gnome-icon-theme_1.3.3.bb +++ b/packages/gnome/gnome-icon-theme_1.3.3.bb @@ -1,7 +1,7 @@ LICENSE = "GPL" SECTION = "x11/gnome" SRC_URI = "${GNOME_MIRROR}/${PN}/1.3/${PN}-${PV}.tar.bz2" -DEPENDS = "glib intltool-native" +DEPENDS = "glib-2.0 intltool-native" PR="r1" FILES_${PN} += "${datadir}/*" diff --git a/packages/initscripts/initscripts-slugos_1.0.bb b/packages/initscripts/initscripts-slugos_1.0.bb index 7a4f79c20b..0b983ab1ec 100644 --- a/packages/initscripts/initscripts-slugos_1.0.bb +++ b/packages/initscripts/initscripts-slugos_1.0.bb @@ -43,13 +43,13 @@ do_install_append() { rm ${D}${sysconfdir}/rc6.d/S20sendsigs # rm ${D}${sysconfdir}/rc6.d/S30urandom rm ${D}${sysconfdir}/rc6.d/S31umountnfs.sh -# rm ${D}${sysconfdir}/rc6.d/S40umountfs + rm ${D}${sysconfdir}/rc6.d/S40umountfs rm ${D}${sysconfdir}/rcS.d/S30ramdisk rm ${D}${sysconfdir}/rc6.d/S90reboot rm ${D}${sysconfdir}/rc0.d/S20sendsigs # rm ${D}${sysconfdir}/rc0.d/S30urandom rm ${D}${sysconfdir}/rc0.d/S31umountnfs.sh -# rm ${D}${sysconfdir}/rc0.d/S40umountfs + rm ${D}${sysconfdir}/rc0.d/S40umountfs rm ${D}${sysconfdir}/rc0.d/S90halt rm ${D}${sysconfdir}/rcS.d/S02banner rm ${D}${sysconfdir}/rcS.d/S10checkroot.sh diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 4e11097f89..5ea7cfe95e 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -6,7 +6,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r67" +PR = "r68" SRC_URI = "file://halt \ file://ramdisk \ @@ -127,14 +127,14 @@ do_install () { ln -sf ../init.d/sendsigs ${D}${sysconfdir}/rc6.d/S20sendsigs # ln -sf ../init.d/urandom ${D}${sysconfdir}/rc6.d/S30urandom ln -sf ../init.d/umountnfs.sh ${D}${sysconfdir}/rc6.d/S31umountnfs.sh -# ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc6.d/S40umountfs + ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc6.d/S40umountfs # udev will run at S55 if installed ln -sf ../init.d/ramdisk ${D}${sysconfdir}/rcS.d/S30ramdisk ln -sf ../init.d/reboot ${D}${sysconfdir}/rc6.d/S90reboot ln -sf ../init.d/sendsigs ${D}${sysconfdir}/rc0.d/S20sendsigs # ln -sf ../init.d/urandom ${D}${sysconfdir}/rc0.d/S30urandom ln -sf ../init.d/umountnfs.sh ${D}${sysconfdir}/rc0.d/S31umountnfs.sh -# ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc0.d/S40umountfs + ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc0.d/S40umountfs # udev will run at S55 if installed ln -sf ../init.d/halt ${D}${sysconfdir}/rc0.d/S90halt ln -sf ../init.d/banner ${D}${sysconfdir}/rcS.d/S02banner 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/matchbox-desktop/matchbox-desktop-0.9.1/.mtn2git_empty b/packages/matchbox-desktop/matchbox-desktop-0.9.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ 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/qpf-fonts/qpf-qte_2.3.10.bb b/packages/qpf-fonts/qpf-qte_2.3.10.bb index f759831e3a..5e5462a964 100644 --- a/packages/qpf-fonts/qpf-qte_2.3.10.bb +++ b/packages/qpf-fonts/qpf-qte_2.3.10.bb @@ -3,6 +3,7 @@ SECTION = "opie/fonts" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL QPL" +HOMEPAGE = "http://www.trolltech.com" PR = "r1" PROVIDES = "qte-font-helvetica-100 qte-font-helvetica-120" diff --git a/packages/qt/qt-x11-free-native_3.3.5.bb b/packages/qt/qt-x11-free-native_3.3.5.bb index ae12f38ad2..e6340da14a 100644 --- a/packages/qt/qt-x11-free-native_3.3.5.bb +++ b/packages/qt/qt-x11-free-native_3.3.5.bb @@ -3,6 +3,7 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL QPL" DEPENDS = "qmake-native x11-native" +HOMEPAGE = "http://www.trolltech.com" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qt-x11-free" diff --git a/packages/qte-fonts-common/qte-fonts-common_3.3.5.bb b/packages/qte-fonts-common/qte-fonts-common_3.3.5.bb index db4568d48b..5215a3e258 100644 --- a/packages/qte-fonts-common/qte-fonts-common_3.3.5.bb +++ b/packages/qte-fonts-common/qte-fonts-common_3.3.5.bb @@ -3,6 +3,7 @@ MAINTAINER = "M&N Solutions <info@mn-solutions.de>" SECTION = "opie/base" LICENSE = "GPL QPL" PACKAGE_ARCH = "all" +HOMEPAGE = "http://www.trolltech.com" PR = "r3" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-free-${PV}.tar.bz2" diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb index e247431282..daf1161ce9 100644 --- a/packages/qte/qte_2.3.10.bb +++ b/packages/qte/qte_2.3.10.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Qt/Embedded Version ${PV}" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +HOMEPAGE = "http://www.trolltech.com" LICENSE = "GPL" DEPENDS = "zlib libpng jpeg tslib uicmoc-native" DEPENDS_mnci = "zlib libpng jpeg uicmoc-native" @@ -9,7 +10,7 @@ DEPENDS_append_c7x0 = " sharp-aticore-oss" PROVIDES = "virtual/qte virtual/libqte2" PR = "r28" -SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;md5=1f7ad30113afc500cab7f5b2f4dec0d7 \ +SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;md5sum=af7ad30113afc500cab7f5b2f4dec0d7 \ file://qpe.patch;patch=1 \ file://vt-switch.patch;patch=1 \ file://daemonize.patch;patch=1 \ diff --git a/packages/qte/qte_4.0.0-snapshot.bb b/packages/qte/qte_4.0.0-snapshot.bb index 9b98f7f4b1..25dc949edd 100644 --- a/packages/qte/qte_4.0.0-snapshot.bb +++ b/packages/qte/qte_4.0.0-snapshot.bb @@ -6,6 +6,7 @@ DEPENDS = "zlib libpng jpeg tslib qmake-native-1.08a uicmoc4-native" PROVIDES = "virtual/qte4 virtual/libqte4" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" PR = "ml1" +HOMEPAGE = "http://www.trolltech.com" BROKEN = "1" diff --git a/packages/xqt/xqt_0.0.9.bb b/packages/xqt/xqt_0.0.9.bb index 2888dd9511..8c87c3b797 100644 --- a/packages/xqt/xqt_0.0.9.bb +++ b/packages/xqt/xqt_0.0.9.bb @@ -1,6 +1,6 @@ HOMEPAGE = "http://xqt.sourceforge.jp" LICENSE = "GPL" -SECTION = "x11/base" +SECTION = "x11" SRCDATE = "20041111" |