From bfcee58f3400d1fed759a65117ddbde78fca768f Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Sun, 17 Feb 2008 20:47:10 +0000
Subject: wxbase: consolidate into wxwidgets project directory.

---
 packages/wxbase/.mtn2git_empty       |  0
 packages/wxbase/wxbase_2.6.2.bb      | 54 ------------------------------------
 packages/wxbase/wxbase_2.7+cvs.bb    | 53 -----------------------------------
 packages/wxwidgets/wxbase_2.6.2.bb   | 54 ++++++++++++++++++++++++++++++++++++
 packages/wxwidgets/wxbase_2.7+cvs.bb | 53 +++++++++++++++++++++++++++++++++++
 5 files changed, 107 insertions(+), 107 deletions(-)
 delete mode 100644 packages/wxbase/.mtn2git_empty
 delete mode 100644 packages/wxbase/wxbase_2.6.2.bb
 delete mode 100644 packages/wxbase/wxbase_2.7+cvs.bb
 create mode 100644 packages/wxwidgets/wxbase_2.6.2.bb
 create mode 100644 packages/wxwidgets/wxbase_2.7+cvs.bb

(limited to 'packages')

diff --git a/packages/wxbase/.mtn2git_empty b/packages/wxbase/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/wxbase/wxbase_2.6.2.bb b/packages/wxbase/wxbase_2.6.2.bb
deleted file mode 100644
index 07d9199ae1..0000000000
--- a/packages/wxbase/wxbase_2.6.2.bb
+++ /dev/null
@@ -1,54 +0,0 @@
-DESCRIPTION = "wxBase is a library for programming \
-non-GUI (console) applications using the base wxWidgets functionality."
-HOMEPAGE = "http://www.wxwidgets.org/"
-LICENSE = "GPL"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "jpeg libpng zlib"
-
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2"
-
-S = "${WORKDIR}/wxBase-${PV}"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--enable-largefile"
-
-LEAD_SONAME = "libwx_base-2.6.so*"
-
-do_configure() {
-       oe_runconf
-}
-
-do_stage() {
-       install -d ${STAGING_INCDIR}/wx-2.6/wx
-       cp -pR include/wx ${STAGING_INCDIR}/wx-2.6
-       cp -pR lib/libwx* ${STAGING_LIBDIR}
-       cp -pR lib/wx     ${STAGING_LIBDIR}
-       cp -pR build/bakefiles/wxpresets/presets  ${STAGING_DATADIR}/bakefile
-       cp -pR wxwin.m4                           ${STAGING_DATADIR}/aclocal
-       ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 ${STAGING_BINDIR_CROSS}/wx-config
-       sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
-           -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
-           -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \
-           -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \
-           -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6
-}
-
-FILES_${PN} += " \
-       ${libdir}/wx/config"
-
-FILES_${PN}-dev += " \
-       ${libdir}/wx/include \
-       ${datadir}/bakefile"
-
-do_install() {
-       oe_runmake 'DESTDIR=${D}' install
-       ln -sf  ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 ${D}${bindir}/wx-config
-       install -d ${D}${docdir}/${PN}-${PV}
-       install -m 644 -p CHANGES.txt     ${D}${docdir}/${PN}-${PV}
-       install -m 644 -p COPYING.LIB     ${D}${docdir}/${PN}-${PV}
-       install -m 644 -p LICENCE.txt     ${D}${docdir}/${PN}-${PV}
-       install -m 644 -p README.txt      ${D}${docdir}/${PN}-${PV}
-}
diff --git a/packages/wxbase/wxbase_2.7+cvs.bb b/packages/wxbase/wxbase_2.7+cvs.bb
deleted file mode 100644
index 772ea4e27f..0000000000
--- a/packages/wxbase/wxbase_2.7+cvs.bb
+++ /dev/null
@@ -1,53 +0,0 @@
-DESCRIPTION = "wxBase is a library for programming \
-non-GUI (console) applications using the base wxWidgets functionality."
-HOMEPAGE = "http://www.wxwidgets.org/"
-LICENSE = "GPL"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "jpeg libpng zlib"
-
-
-SRC_URI = "http://biolpc22.york.ac.uk/pub/CVS_HEAD/v1/wx-cvs-Gtk.tar.bz2"
-#SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2"
-
-S = "${WORKDIR}/wxGTK"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-gui --enable-largefile"
-
-LEAD_SONAME = "libwx_base-2.7*"
-
-do_configure() {
-       oe_runconf
-}
-
-do_stage() {
-       install -d ${STAGING_INCDIR}/wx-2.7/wx
-       cp -pR include/wx ${STAGING_INCDIR}/wx-2.7
-       cp -pR lib/libwx* ${STAGING_LIBDIR}
-       cp -pR lib/wx     ${STAGING_LIBDIR}
-       cp -pR build/bakefiles/wxpresets/presets  ${STAGING_DATADIR}/bakefile
-       cp -pR wxwin.m4                           ${STAGING_DATADIR}/aclocal
-       ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${STAGING_BINDIR_CROSS}/wx-config
-       sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
-           -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
-           -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \
-           -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \
-           -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7
-}
-
-FILES_${PN} += " \
-       ${libdir}/wx/config"
-
-FILES_${PN}-dev += " \
-       ${libdir}/wx/include \
-       ${datadir}/bakefile"
-
-do_install() {
-       oe_runmake 'DESTDIR=${D}' install
-       ln -sf ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${D}${bindir}/wx-config
-       install -d ${D}${docdir}/${PN}-${PV}
-       install -m 644 -p docs/*.txt      ${D}${docdir}/${PN}-${PV}
-       install -m 644 -p docs/*.htm      ${D}${docdir}/${PN}-${PV}
-}
diff --git a/packages/wxwidgets/wxbase_2.6.2.bb b/packages/wxwidgets/wxbase_2.6.2.bb
new file mode 100644
index 0000000000..07d9199ae1
--- /dev/null
+++ b/packages/wxwidgets/wxbase_2.6.2.bb
@@ -0,0 +1,54 @@
+DESCRIPTION = "wxBase is a library for programming \
+non-GUI (console) applications using the base wxWidgets functionality."
+HOMEPAGE = "http://www.wxwidgets.org/"
+LICENSE = "GPL"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "jpeg libpng zlib"
+
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2"
+
+S = "${WORKDIR}/wxBase-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-largefile"
+
+LEAD_SONAME = "libwx_base-2.6.so*"
+
+do_configure() {
+       oe_runconf
+}
+
+do_stage() {
+       install -d ${STAGING_INCDIR}/wx-2.6/wx
+       cp -pR include/wx ${STAGING_INCDIR}/wx-2.6
+       cp -pR lib/libwx* ${STAGING_LIBDIR}
+       cp -pR lib/wx     ${STAGING_LIBDIR}
+       cp -pR build/bakefiles/wxpresets/presets  ${STAGING_DATADIR}/bakefile
+       cp -pR wxwin.m4                           ${STAGING_DATADIR}/aclocal
+       ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 ${STAGING_BINDIR_CROSS}/wx-config
+       sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
+           -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
+           -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \
+           -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \
+           -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6
+}
+
+FILES_${PN} += " \
+       ${libdir}/wx/config"
+
+FILES_${PN}-dev += " \
+       ${libdir}/wx/include \
+       ${datadir}/bakefile"
+
+do_install() {
+       oe_runmake 'DESTDIR=${D}' install
+       ln -sf  ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 ${D}${bindir}/wx-config
+       install -d ${D}${docdir}/${PN}-${PV}
+       install -m 644 -p CHANGES.txt     ${D}${docdir}/${PN}-${PV}
+       install -m 644 -p COPYING.LIB     ${D}${docdir}/${PN}-${PV}
+       install -m 644 -p LICENCE.txt     ${D}${docdir}/${PN}-${PV}
+       install -m 644 -p README.txt      ${D}${docdir}/${PN}-${PV}
+}
diff --git a/packages/wxwidgets/wxbase_2.7+cvs.bb b/packages/wxwidgets/wxbase_2.7+cvs.bb
new file mode 100644
index 0000000000..772ea4e27f
--- /dev/null
+++ b/packages/wxwidgets/wxbase_2.7+cvs.bb
@@ -0,0 +1,53 @@
+DESCRIPTION = "wxBase is a library for programming \
+non-GUI (console) applications using the base wxWidgets functionality."
+HOMEPAGE = "http://www.wxwidgets.org/"
+LICENSE = "GPL"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "jpeg libpng zlib"
+
+
+SRC_URI = "http://biolpc22.york.ac.uk/pub/CVS_HEAD/v1/wx-cvs-Gtk.tar.bz2"
+#SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2"
+
+S = "${WORKDIR}/wxGTK"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-gui --enable-largefile"
+
+LEAD_SONAME = "libwx_base-2.7*"
+
+do_configure() {
+       oe_runconf
+}
+
+do_stage() {
+       install -d ${STAGING_INCDIR}/wx-2.7/wx
+       cp -pR include/wx ${STAGING_INCDIR}/wx-2.7
+       cp -pR lib/libwx* ${STAGING_LIBDIR}
+       cp -pR lib/wx     ${STAGING_LIBDIR}
+       cp -pR build/bakefiles/wxpresets/presets  ${STAGING_DATADIR}/bakefile
+       cp -pR wxwin.m4                           ${STAGING_DATADIR}/aclocal
+       ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${STAGING_BINDIR_CROSS}/wx-config
+       sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
+           -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
+           -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \
+           -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \
+           -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7
+}
+
+FILES_${PN} += " \
+       ${libdir}/wx/config"
+
+FILES_${PN}-dev += " \
+       ${libdir}/wx/include \
+       ${datadir}/bakefile"
+
+do_install() {
+       oe_runmake 'DESTDIR=${D}' install
+       ln -sf ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${D}${bindir}/wx-config
+       install -d ${D}${docdir}/${PN}-${PV}
+       install -m 644 -p docs/*.txt      ${D}${docdir}/${PN}-${PV}
+       install -m 644 -p docs/*.htm      ${D}${docdir}/${PN}-${PV}
+}
-- 
cgit v1.2.3


From ec91747176dcfbb05f2a3e87100b67ecdd076013 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Sun, 17 Feb 2008 21:08:59 +0000
Subject: acpid: push gcc patch upstream and consolidate identical patches.

---
 packages/acpid/acpid-1.0.3/.mtn2git_empty |  0
 packages/acpid/acpid-1.0.3/gcc40.patch    | 13 -------------
 packages/acpid/acpid-1.0.4/.mtn2git_empty |  0
 packages/acpid/acpid-1.0.4/gcc40.patch    | 13 -------------
 packages/acpid/acpid/.mtn2git_empty       |  0
 packages/acpid/acpid/gcc40.patch          | 15 +++++++++++++++
 6 files changed, 15 insertions(+), 26 deletions(-)
 delete mode 100644 packages/acpid/acpid-1.0.3/.mtn2git_empty
 delete mode 100644 packages/acpid/acpid-1.0.3/gcc40.patch
 delete mode 100644 packages/acpid/acpid-1.0.4/.mtn2git_empty
 delete mode 100644 packages/acpid/acpid-1.0.4/gcc40.patch
 create mode 100644 packages/acpid/acpid/.mtn2git_empty
 create mode 100644 packages/acpid/acpid/gcc40.patch

(limited to 'packages')

diff --git a/packages/acpid/acpid-1.0.3/.mtn2git_empty b/packages/acpid/acpid-1.0.3/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/acpid/acpid-1.0.3/gcc40.patch b/packages/acpid/acpid-1.0.3/gcc40.patch
deleted file mode 100644
index dbe090ba41..0000000000
--- a/packages/acpid/acpid-1.0.3/gcc40.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: acpid-1.0.3/ud_socket.c
-===================================================================
---- acpid-1.0.3.orig/ud_socket.c	2003-11-17 14:24:58.000000000 -0700
-+++ acpid-1.0.3/ud_socket.c	2005-06-27 14:44:17.785576106 -0700
-@@ -58,7 +58,7 @@
- 	while (1) {
- 		int newsock = 0;
- 		struct sockaddr_un cliaddr;
--		int len = sizeof(struct sockaddr_un);
-+		socklen_t len = sizeof(struct sockaddr_un);
- 
- 		newsock = accept(listenfd, (struct sockaddr *)&cliaddr, &len);
- 		if (newsock < 0) {
diff --git a/packages/acpid/acpid-1.0.4/.mtn2git_empty b/packages/acpid/acpid-1.0.4/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/acpid/acpid-1.0.4/gcc40.patch b/packages/acpid/acpid-1.0.4/gcc40.patch
deleted file mode 100644
index dbe090ba41..0000000000
--- a/packages/acpid/acpid-1.0.4/gcc40.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: acpid-1.0.3/ud_socket.c
-===================================================================
---- acpid-1.0.3.orig/ud_socket.c	2003-11-17 14:24:58.000000000 -0700
-+++ acpid-1.0.3/ud_socket.c	2005-06-27 14:44:17.785576106 -0700
-@@ -58,7 +58,7 @@
- 	while (1) {
- 		int newsock = 0;
- 		struct sockaddr_un cliaddr;
--		int len = sizeof(struct sockaddr_un);
-+		socklen_t len = sizeof(struct sockaddr_un);
- 
- 		newsock = accept(listenfd, (struct sockaddr *)&cliaddr, &len);
- 		if (newsock < 0) {
diff --git a/packages/acpid/acpid/.mtn2git_empty b/packages/acpid/acpid/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/acpid/acpid/gcc40.patch b/packages/acpid/acpid/gcc40.patch
new file mode 100644
index 0000000000..5320cee0bb
--- /dev/null
+++ b/packages/acpid/acpid/gcc40.patch
@@ -0,0 +1,15 @@
+upstream: https://sourceforge.net/tracker/index.php?func=detail&aid=1895615&group_id=33140&atid=407341
+
+Index: acpid-1.0.3/ud_socket.c
+===================================================================
+--- acpid-1.0.3.orig/ud_socket.c	2003-11-17 14:24:58.000000000 -0700
++++ acpid-1.0.3/ud_socket.c	2005-06-27 14:44:17.785576106 -0700
+@@ -58,7 +58,7 @@
+ 	while (1) {
+ 		int newsock = 0;
+ 		struct sockaddr_un cliaddr;
+-		int len = sizeof(struct sockaddr_un);
++		socklen_t len = sizeof(struct sockaddr_un);
+ 
+ 		newsock = accept(listenfd, (struct sockaddr *)&cliaddr, &len);
+ 		if (newsock < 0) {
-- 
cgit v1.2.3


From fb4ada7351bbe36370505d8244c95f47614aa636 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Sun, 17 Feb 2008 21:19:59 +0000
Subject: packages/libmrss/files/better-parse-url-r0.patch: Document what's up
 with this patch, hopefully some one is sending it upstream

---
 packages/libmrss/files/better-parse-url-r0.patch | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'packages')

diff --git a/packages/libmrss/files/better-parse-url-r0.patch b/packages/libmrss/files/better-parse-url-r0.patch
index 94a78110a2..18a3ef56e2 100644
--- a/packages/libmrss/files/better-parse-url-r0.patch
+++ b/packages/libmrss/files/better-parse-url-r0.patch
@@ -1,3 +1,10 @@
+upstream: bakunin_at_autistici_dot_org
+status: API addition not proposed upstream
+comment: API addition to not manually setup the CURL connection and still
+be able to get the transfered feed and save it to secondary storage. done
+by zecke for the OpenMoko RSS reader.
+
+
 Index: libmrss-0.17.2/src/mrss.h
 ===================================================================
 --- libmrss-0.17.2.orig/src/mrss.h	2007-04-02 14:42:55.000000000 +0200
-- 
cgit v1.2.3


From 45bb225e01108328a5006ef0b8238e94737d4f66 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Sun, 17 Feb 2008 21:27:45 +0000
Subject: packages/glibc/zecke-sane-readelf.patch: This was needed because OSX
 has no readelf command by default and thread support of the compiler was
 misdetected to the missing readelf.

---
 packages/glibc/glibc-2.4/zecke-sane-readelf.patch       | 5 +++++
 packages/glibc/glibc-cvs-2.3.5/zecke-sane-readelf.patch | 5 +++++
 2 files changed, 10 insertions(+)

(limited to 'packages')

diff --git a/packages/glibc/glibc-2.4/zecke-sane-readelf.patch b/packages/glibc/glibc-2.4/zecke-sane-readelf.patch
index 023b6a51bc..229db09fb3 100644
--- a/packages/glibc/glibc-2.4/zecke-sane-readelf.patch
+++ b/packages/glibc/glibc-2.4/zecke-sane-readelf.patch
@@ -1,3 +1,8 @@
+upstream: http://sources.redhat.com/bugzilla/show_bug.cgi?id=3004
+status: WONTFIX
+comment: Use OEs version of the readelf version. There might be no
+host system version (e.g. on OSX) or it is not multiarch.
+
 Index: glibc-2.4/configure
 ===================================================================
 --- glibc-2.4.orig/configure	2006-03-06 12:18:56.000000000 +0100
diff --git a/packages/glibc/glibc-cvs-2.3.5/zecke-sane-readelf.patch b/packages/glibc/glibc-cvs-2.3.5/zecke-sane-readelf.patch
index c57494f937..7dc699cfad 100644
--- a/packages/glibc/glibc-cvs-2.3.5/zecke-sane-readelf.patch
+++ b/packages/glibc/glibc-cvs-2.3.5/zecke-sane-readelf.patch
@@ -1,3 +1,8 @@
+upstream: http://sources.redhat.com/bugzilla/show_bug.cgi?id=3004
+status: WONTFIX
+comment: Use OEs version of the readelf version. There might be no
+host system version (e.g. on OSX) or it is not multiarch.
+
 Index: glibc-2.3.2/configure
 ===================================================================
 --- glibc-2.3.2.orig/configure	2006-08-05 20:18:11.000000000 +0200
-- 
cgit v1.2.3


From 813b702be534bd460e69c32ac4671e8be7573204 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Sun, 17 Feb 2008 21:36:24 +0000
Subject: packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch: Document this
 patch and explain why it is a hack

---
 packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'packages')

diff --git a/packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch b/packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch
index 6afb10d6ef..0b401defd8 100644
--- a/packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch
+++ b/packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch
@@ -1,3 +1,16 @@
+upstream: n/a
+status: evil hack
+comment: Including host system headers when cross compiling can lead to weird
+issues, in the best case compile issues, in the worst case crashes. E.g. if you
+are building a uclibc system, you certainly do not want glibc headers or OSX libc
+headers to be picked up. To avoid that this patch is penetalizing certain common
+Linux/Unix host directories.
+
+To send the patch upstream the evil paths should be specified by
+a setting or command-line options. Until now this is a evil hack assuming
+certain host system paths. E.g. /usr/local/ and other common paths should be
+added.
+
 Index: gcc-4.0.2/gcc/c-incpath.c
 ===================================================================
 --- gcc-4.0.2.orig/gcc/c-incpath.c	2005-01-23 16:05:27.000000000 +0100
-- 
cgit v1.2.3


From 1b1d31889caebc06e4a140011ee41db4b2f4c989 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Sun, 17 Feb 2008 21:37:25 +0000
Subject: packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch: When cross compiling we
 want to use gcc's cpp for the cross compiled headers

---
 packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'packages')

diff --git a/packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch
index 42ec190600..921cab6e18 100644
--- a/packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch
+++ b/packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch
@@ -1,3 +1,7 @@
+upstream: n/a
+comment: Use the preprocessor we have just compiled instead the one of
+the system. There might be incompabilities between us and them.
+
 Index: gcc-4.1.1/Makefile.in
 ===================================================================
 --- gcc-4.1.1.orig/Makefile.in	2006-08-06 13:32:44.000000000 +0200
-- 
cgit v1.2.3


From 442bbafc8dfde04b2c082cba2567aa016152ffa2 Mon Sep 17 00:00:00 2001
From: Helge Deller <deller@gmx.de>
Date: Sun, 17 Feb 2008 22:19:04 +0000
Subject: task-base: add crypto_algapi/cryptomgr for task-base-wifi

---
 packages/tasks/task-base.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index bb89ac0c2b..77aa07de00 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r61"
+PR = "r62"
 
 inherit task
 
@@ -345,6 +345,8 @@ RRECOMMENDS_task-base-wifi = "\
     kernel-module-ieee80211-crypt-wep \
     kernel-module-ecb \
     kernel-module-arc4 \
+    kernel-module-crypto_algapi \
+    kernel-module-cryptomgr \
     kernel-module-michael-mic \
     kernel-module-aes"
 
-- 
cgit v1.2.3


From 6b2b68e32c0673c71d31aa40c063d4eb52de2452 Mon Sep 17 00:00:00 2001
From: Helge Deller <deller@gmx.de>
Date: Sun, 17 Feb 2008 22:20:29 +0000
Subject: linux-rp 2.6.24: remove repeated content from pxafb.patch

---
 packages/linux/linux-rp-2.6.24/pxafb.patch | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'packages')

diff --git a/packages/linux/linux-rp-2.6.24/pxafb.patch b/packages/linux/linux-rp-2.6.24/pxafb.patch
index efcfb079b2..7fe693cd91 100644
--- a/packages/linux/linux-rp-2.6.24/pxafb.patch
+++ b/packages/linux/linux-rp-2.6.24/pxafb.patch
@@ -11,16 +11,3 @@ Index: linux-2.6.23/drivers/video/pxafb.c
  		lccr3 = fbi->reg_lccr3;
  		set_hsync_time(fbi, pcd);
  		fbi->reg_lccr3 = (fbi->reg_lccr3 & ~0xff) | LCCR3_PixClkDiv(pcd);
-Index: linux-2.6.23/drivers/video/pxafb.c
-===================================================================
---- linux-2.6.23.orig/drivers/video/pxafb.c	2008-01-25 16:25:21.000000000 -0800
-+++ linux-2.6.23/drivers/video/pxafb.c	2008-01-25 16:32:14.000000000 -0800
-@@ -1194,7 +1194,7 @@
- 		if ((clkinfo->old == 13000))
- 			break;
- 
--		pcd = get_pcd(fbi->fb.var.pixclock);
-+		pcd = get_pcd(fbi,fbi->fb.var.pixclock);
- 		lccr3 = fbi->reg_lccr3;
- 		set_hsync_time(fbi, pcd);
- 		fbi->reg_lccr3 = (fbi->reg_lccr3 & ~0xff) | LCCR3_PixClkDiv(pcd);
-- 
cgit v1.2.3


From b58a2b81ad312b1699f0cdbb6b8162ba91d21ead Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Sun, 17 Feb 2008 23:47:59 +0000
Subject: task-opie-all: drop opie-usermanager.  Fixes bug 3311.

---
 packages/tasks/task-opie-all.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/tasks/task-opie-all.bb b/packages/tasks/task-opie-all.bb
index 4666b4ab8d..5487985fd4 100644
--- a/packages/tasks/task-opie-all.bb
+++ b/packages/tasks/task-opie-all.bb
@@ -50,8 +50,7 @@ RDEPENDS_task-opie-settings = "opie-appearance opie-aqpkg opie-backup opie-butto
                       opie-formatter opie-language opie-launcher-settings \
                       opie-light-and-power opie-mediummount opie-networksettings \
                       opie-packagemanager opie-security opie-sshkeys opie-sysinfo \
-                      opie-systemtime opie-usermanager opie-icon-reload \
-                      opie-vmemo-settings"
+                      opie-systemtime opie-icon-reload opie-vmemo-settings"
 
 RDEPENDS_task-opie-pim = "task-opie-base-pim task-opie-todayplugins task-opie-datebookplugins \
                  opie-mail opie-pimconverter"
-- 
cgit v1.2.3


From 701691dd6d5b1a6c129c455730026ee726d16508 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Sun, 17 Feb 2008 23:57:48 +0000
Subject: libmrss: document better-parse-url-r0.patch being sent upstream.

---
 packages/libmrss/files/better-parse-url-r0.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/libmrss/files/better-parse-url-r0.patch b/packages/libmrss/files/better-parse-url-r0.patch
index 18a3ef56e2..72fa3688a7 100644
--- a/packages/libmrss/files/better-parse-url-r0.patch
+++ b/packages/libmrss/files/better-parse-url-r0.patch
@@ -1,5 +1,5 @@
-upstream: bakunin_at_autistici_dot_org
-status: API addition not proposed upstream
+upstream: mailed to bakunin_at_autistici_dot_org by Laibsch
+status: pending
 comment: API addition to not manually setup the CURL connection and still
 be able to get the transfered feed and save it to secondary storage. done
 by zecke for the OpenMoko RSS reader.
-- 
cgit v1.2.3


From 632f5de2cc8377e4856c5062f3c7c863b090766e Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 18 Feb 2008 00:25:58 +0000
Subject: gcc: add upstream comments to three more, otherwise identical
 patches. * complimentary to 4b9bf269fccb2d8469b9d1ccfe6d73ac060a6b29 *
 "upstream: n/a" should really have a more verbose explanation   is it a hack,
 is upstream being a d0rk, did you try but failed?

---
 packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch | 4 ++++
 packages/gcc/gcc-4.1.2/zecke-xgcc-cpp.patch | 4 ++++
 packages/gcc/gcc-4.2.2/zecke-xgcc-cpp.patch | 4 ++++
 3 files changed, 12 insertions(+)

(limited to 'packages')

diff --git a/packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch
index 42ec190600..921cab6e18 100644
--- a/packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch
+++ b/packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch
@@ -1,3 +1,7 @@
+upstream: n/a
+comment: Use the preprocessor we have just compiled instead the one of
+the system. There might be incompabilities between us and them.
+
 Index: gcc-4.1.1/Makefile.in
 ===================================================================
 --- gcc-4.1.1.orig/Makefile.in	2006-08-06 13:32:44.000000000 +0200
diff --git a/packages/gcc/gcc-4.1.2/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.1.2/zecke-xgcc-cpp.patch
index 42ec190600..921cab6e18 100644
--- a/packages/gcc/gcc-4.1.2/zecke-xgcc-cpp.patch
+++ b/packages/gcc/gcc-4.1.2/zecke-xgcc-cpp.patch
@@ -1,3 +1,7 @@
+upstream: n/a
+comment: Use the preprocessor we have just compiled instead the one of
+the system. There might be incompabilities between us and them.
+
 Index: gcc-4.1.1/Makefile.in
 ===================================================================
 --- gcc-4.1.1.orig/Makefile.in	2006-08-06 13:32:44.000000000 +0200
diff --git a/packages/gcc/gcc-4.2.2/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.2.2/zecke-xgcc-cpp.patch
index 42ec190600..921cab6e18 100644
--- a/packages/gcc/gcc-4.2.2/zecke-xgcc-cpp.patch
+++ b/packages/gcc/gcc-4.2.2/zecke-xgcc-cpp.patch
@@ -1,3 +1,7 @@
+upstream: n/a
+comment: Use the preprocessor we have just compiled instead the one of
+the system. There might be incompabilities between us and them.
+
 Index: gcc-4.1.1/Makefile.in
 ===================================================================
 --- gcc-4.1.1.orig/Makefile.in	2006-08-06 13:32:44.000000000 +0200
-- 
cgit v1.2.3


From c0cb44d08ae453391b643b3e458a349dc00b5a51 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 18 Feb 2008 00:40:37 +0000
Subject: tshark: initial commit of tshark, the text-based version of
 wireshark.  closes 2283. * the latest version 0.99.7 fails do_patch, so I
 left everything at 0.99.4

---
 packages/wireshark/tshark_0.99.4.bb | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 packages/wireshark/tshark_0.99.4.bb

(limited to 'packages')

diff --git a/packages/wireshark/tshark_0.99.4.bb b/packages/wireshark/tshark_0.99.4.bb
new file mode 100644
index 0000000000..4f8f6781bf
--- /dev/null
+++ b/packages/wireshark/tshark_0.99.4.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "tshark is the text based verion of wireshark - a popular network protocol analyzer"
+HOMEPAGE = "http://www.ethereal.com"
+SECTION = "network"
+LICENSE = "GPL"
+DEPENDS = "perl-native gnutls libpcap pcre expat"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
+           file://use-our-lemon.patch;patch=1 \
+	   file://no-host-includes.patch;patch=1"
+
+S=${WORKDIR}/wireshark-${PV}
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-wireshark"
+
+do_compile_prepend() {
+	${BUILD_CC} ${BUILD_CFLAGS} -o rdps rdps.c
+	oe_runmake -C tools/lemon CC="${BUILD_CC} ${BUILD_CFLAGS}" LDFLAGS="${BUILD_LDFLAGS}"
+}
+
-- 
cgit v1.2.3


From 260ca99bdd4b18f0575af0ef9cc063aec09dc367 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 18 Feb 2008 01:22:55 +0000
Subject: djvulibre: replace QTDIR with PALMTOPDIR to enable successful
 compilation.  closes 3044. * use sourceforge mirror * reorder fields
 according to style guide

---
 packages/djvulibre/djvulibre_3.5.19.bb | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'packages')

diff --git a/packages/djvulibre/djvulibre_3.5.19.bb b/packages/djvulibre/djvulibre_3.5.19.bb
index 5ba5751f2d..8a90efe85c 100644
--- a/packages/djvulibre/djvulibre_3.5.19.bb
+++ b/packages/djvulibre/djvulibre_3.5.19.bb
@@ -1,27 +1,23 @@
 DESCRIPTION = "DjVuLibre is an open source (GPL'ed) implementation of DjVu, including viewers, browser plugins, decoders, simple encoders, and utilities."
 LICENSE = "GPL"
-
 DEPENDS = "jpeg libpng tiff"
+PR = "r1"
 
-SRC_URI = "http://downloads.sourceforge.net/djvu/djvulibre-${PV}.tar.gz \
+SRC_URI = "http://{SOURCEFORGE_MIRROR}/djvu/djvulibre-${PV}.tar.gz \
            file://fix-cross-configure.patch;patch=1"
 
-
 inherit qt4x11 autotools pkgconfig
 
 #export QT_LIBS = "${OE_QMAKE_LIBS_QT}"
 #export QT_CFLAGS = "${OE_QMAKE_CXXFLAGS} -I${QTDIR}/include/Qt/ "
 
 EXTRA_OECONF = " --enable-threads \
-                 --with-qt=${QTDIR} "
-
-PACKAGES =+ "libdjvulibre"
-
-FILES_libdjvulibre = "${libdir}/libdjvulibre.so.*"
-FILES_${PN} += "${datadir}/djvu"
+                 --with-qt=${PAMLTOPDIR} "
 
 do_stage() {
         autotools_stage_all
 }
 
-
+PACKAGES =+ "libdjvulibre"
+FILES_libdjvulibre = "${libdir}/libdjvulibre.so.*"
+FILES_${PN} += "${datadir}/djvu"
-- 
cgit v1.2.3


From 8ae01e8bbfb6d2b2638eedbecda66b317f676395 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 18 Feb 2008 01:28:04 +0000
Subject: djvulibre: update to version 3.5.20.

---
 packages/djvulibre/djvulibre_3.5.19.bb | 23 -----------------------
 packages/djvulibre/djvulibre_3.5.20.bb | 23 +++++++++++++++++++++++
 2 files changed, 23 insertions(+), 23 deletions(-)
 delete mode 100644 packages/djvulibre/djvulibre_3.5.19.bb
 create mode 100644 packages/djvulibre/djvulibre_3.5.20.bb

(limited to 'packages')

diff --git a/packages/djvulibre/djvulibre_3.5.19.bb b/packages/djvulibre/djvulibre_3.5.19.bb
deleted file mode 100644
index 8a90efe85c..0000000000
--- a/packages/djvulibre/djvulibre_3.5.19.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "DjVuLibre is an open source (GPL'ed) implementation of DjVu, including viewers, browser plugins, decoders, simple encoders, and utilities."
-LICENSE = "GPL"
-DEPENDS = "jpeg libpng tiff"
-PR = "r1"
-
-SRC_URI = "http://{SOURCEFORGE_MIRROR}/djvu/djvulibre-${PV}.tar.gz \
-           file://fix-cross-configure.patch;patch=1"
-
-inherit qt4x11 autotools pkgconfig
-
-#export QT_LIBS = "${OE_QMAKE_LIBS_QT}"
-#export QT_CFLAGS = "${OE_QMAKE_CXXFLAGS} -I${QTDIR}/include/Qt/ "
-
-EXTRA_OECONF = " --enable-threads \
-                 --with-qt=${PAMLTOPDIR} "
-
-do_stage() {
-        autotools_stage_all
-}
-
-PACKAGES =+ "libdjvulibre"
-FILES_libdjvulibre = "${libdir}/libdjvulibre.so.*"
-FILES_${PN} += "${datadir}/djvu"
diff --git a/packages/djvulibre/djvulibre_3.5.20.bb b/packages/djvulibre/djvulibre_3.5.20.bb
new file mode 100644
index 0000000000..8a90efe85c
--- /dev/null
+++ b/packages/djvulibre/djvulibre_3.5.20.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "DjVuLibre is an open source (GPL'ed) implementation of DjVu, including viewers, browser plugins, decoders, simple encoders, and utilities."
+LICENSE = "GPL"
+DEPENDS = "jpeg libpng tiff"
+PR = "r1"
+
+SRC_URI = "http://{SOURCEFORGE_MIRROR}/djvu/djvulibre-${PV}.tar.gz \
+           file://fix-cross-configure.patch;patch=1"
+
+inherit qt4x11 autotools pkgconfig
+
+#export QT_LIBS = "${OE_QMAKE_LIBS_QT}"
+#export QT_CFLAGS = "${OE_QMAKE_CXXFLAGS} -I${QTDIR}/include/Qt/ "
+
+EXTRA_OECONF = " --enable-threads \
+                 --with-qt=${PAMLTOPDIR} "
+
+do_stage() {
+        autotools_stage_all
+}
+
+PACKAGES =+ "libdjvulibre"
+FILES_libdjvulibre = "${libdir}/libdjvulibre.so.*"
+FILES_${PN} += "${datadir}/djvu"
-- 
cgit v1.2.3


From 2e5342507b4e589c1d3dcbffe8a8d2617326e979 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 18 Feb 2008 02:11:37 +0000
Subject: qclockchange: update to version 0.1b.  Closes 2653.

---
 packages/qclockchange/files/.mtn2git_empty       |   0
 packages/qclockchange/files/qclockchange.desktop |   6 ++++++
 packages/qclockchange/files/qclockchange.png     | Bin 0 -> 5472 bytes
 packages/qclockchange/qclockchange_0.1a.bb       |  22 ---------------------
 packages/qclockchange/qclockchange_0.1b.bb       |  24 +++++++++++++++++++++++
 5 files changed, 30 insertions(+), 22 deletions(-)
 create mode 100644 packages/qclockchange/files/.mtn2git_empty
 create mode 100644 packages/qclockchange/files/qclockchange.desktop
 create mode 100644 packages/qclockchange/files/qclockchange.png
 delete mode 100644 packages/qclockchange/qclockchange_0.1a.bb
 create mode 100644 packages/qclockchange/qclockchange_0.1b.bb

(limited to 'packages')

diff --git a/packages/qclockchange/files/.mtn2git_empty b/packages/qclockchange/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/qclockchange/files/qclockchange.desktop b/packages/qclockchange/files/qclockchange.desktop
new file mode 100644
index 0000000000..9463623883
--- /dev/null
+++ b/packages/qclockchange/files/qclockchange.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Comment= Changes the CPU frequency
+Exec=qclockchange
+Icon=qclockchange
+Type=Application
+Name=Qclockchange
diff --git a/packages/qclockchange/files/qclockchange.png b/packages/qclockchange/files/qclockchange.png
new file mode 100644
index 0000000000..861fe2eecc
Binary files /dev/null and b/packages/qclockchange/files/qclockchange.png differ
diff --git a/packages/qclockchange/qclockchange_0.1a.bb b/packages/qclockchange/qclockchange_0.1a.bb
deleted file mode 100644
index 0061c830c9..0000000000
--- a/packages/qclockchange/qclockchange_0.1a.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "Program that allows you to set the CCCR registers on PXA Zauruses."
-SECTION = "opie/settings"
-PRIORITY = "optional"
-LICENSE = "GPL"
-AUTHOR = "piro <piro400@occn.zaq.ne.jp>"
-HOMEPAGE = "http://www.piro.hopto.org/~piro/pukiwiki/pukiwiki.php?%5B%5B%A5%AB%A1%BC%A5%CD%A5%EB%A5%D1%A5%C3%A5%C1%A4%F2%A4%DE%A4%C8%A4%E1%A4%EB%5D%5D"
-APPTYPE="binary"
-PR = "r1"
-
-SRC_URI = "http://www.piro.hopto.org/~piro/zaurus/qclockchange-${PV}.tar.gz"
-
-inherit palmtop
-
-do_install() {
-	install -d ${D}${palmtopdir}/bin/ \
-               ${D}${palmtopdir}/pics \
-               ${D}${palmtopdir}/apps/Settings
-
-	install -m 0755 qclockchange ${D}${palmtopdir}/bin/qclockchange
-	install -m 0644 ipkg/opt/QtPalmtop/pics/qclockchange.png ${D}${palmtopdir}/pics/qclockchange.png
-	install -m 0644 ipkg/opt/QtPalmtop/apps/Settings/qclockchange.desktop ${D}${palmtopdir}/apps/Settings/qclockchange.desktop
-}
diff --git a/packages/qclockchange/qclockchange_0.1b.bb b/packages/qclockchange/qclockchange_0.1b.bb
new file mode 100644
index 0000000000..7980618f97
--- /dev/null
+++ b/packages/qclockchange/qclockchange_0.1b.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Program that allows you to set the CCCR registers on PXA Zauruses."
+SECTION = "opie/settings"
+PRIORITY = "optional"
+LICENSE = "GPL"
+AUTHOR = "piro <piro400@occn.zaq.ne.jp>"
+HOMEPAGE = "http://piro.sytes.net/~piro/zaurus/"
+APPTYPE="binary"
+PR = "r0"
+
+SRC_URI = "http://piro.sytes.net/~piro/zaurus/etc/qclockchange-${PV}.tar.gz \
+	   file://qclockchange.png \
+	   file://qclockchange.desktop "
+
+inherit palmtop
+
+do_install() {
+	install -d ${D}${palmtopdir}/bin/ \
+               ${D}${palmtopdir}/pics \
+               ${D}${palmtopdir}/apps/Settings
+
+	install -m 0755 bin/qclockchange ${D}${palmtopdir}/bin/qclockchange
+	install -m 0644 ${WORKDIR}/qclockchange.png ${D}${palmtopdir}/pics/qclockchange.png
+	install -m 0644 ${WORKDIR}/qclockchange.desktop ${D}${palmtopdir}/apps/Settings/qclockchange.desktop
+}
-- 
cgit v1.2.3


From d49b83f25ab47fbcbc3281be6edf9f4e89bce85b Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 18 Feb 2008 02:46:36 +0000
Subject: icewm: RRECOMENDS ttf-dejavu-sans to make sure some font is
 installed.  partly closes 1506. * if there is a more general solution, let
 your voice be heard.

---
 packages/icewm/icewm_1.2.20.bb | 3 ++-
 packages/icewm/icewm_1.2.30.bb | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/icewm/icewm_1.2.20.bb b/packages/icewm/icewm_1.2.20.bb
index b6a90a54a4..1567e985e2 100644
--- a/packages/icewm/icewm_1.2.20.bb
+++ b/packages/icewm/icewm_1.2.20.bb
@@ -2,7 +2,8 @@ SECTION = "x11/wm"
 DESCRIPTION = "IceWM Window Manager"
 LICENSE = "GPL"
 DEPENDS = "virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native"
-PR = "r1"
+RRECOMMENDS = "ttf-dejavu-sans"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \
 	   file://makefile.patch;patch=1 \
diff --git a/packages/icewm/icewm_1.2.30.bb b/packages/icewm/icewm_1.2.30.bb
index 4e7b7125ec..3dfffb1ae8 100644
--- a/packages/icewm/icewm_1.2.30.bb
+++ b/packages/icewm/icewm_1.2.30.bb
@@ -2,7 +2,8 @@ SECTION = "x11/wm"
 DESCRIPTION = "IceWM Window Manager"
 LICENSE = "GPL"
 DEPENDS = "virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native"
-PR = "r0"
+RRECOMMENDS = "ttf-dejavu-sans"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \
 	   file://makefile.patch;patch=1 \
-- 
cgit v1.2.3


From 98a496542c02d7775a6fb5ec45851d3bc5009f2e Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 18 Feb 2008 02:55:49 +0000
Subject: gnome-doc-utils: add libxslt-native to DEPENDS and reorder some
 fields according to StyleGuide

---
 packages/gnome/gnome-doc-utils_0.10.3.bb | 6 +++---
 packages/gnome/gnome-doc-utils_0.12.0.bb | 8 ++++----
 packages/gnome/gnome-doc-utils_0.7.1.bb  | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'packages')

diff --git a/packages/gnome/gnome-doc-utils_0.10.3.bb b/packages/gnome/gnome-doc-utils_0.10.3.bb
index 315cdbd160..c5390128cf 100644
--- a/packages/gnome/gnome-doc-utils_0.10.3.bb
+++ b/packages/gnome/gnome-doc-utils_0.10.3.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL LGPL"
-DEPENDS = "libxml2 libxslt"
+DEPENDS = "libxml2 libxslt libxslt-native"
 
 PR = "r0"
 
@@ -7,10 +7,10 @@ inherit gnome
 
 EXTRA_OECONF = "--disable-scrollkeeper"
 
-FILES_${PN} += "${datadir}/xml*"
-
 do_stage() {
 	mkdir -p  ${STAGING_DATADIR}/xml/gnome/xslt/
 	cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/
 	autotools_stage_all
 }
+
+FILES_${PN} += "${datadir}/xml*"
diff --git a/packages/gnome/gnome-doc-utils_0.12.0.bb b/packages/gnome/gnome-doc-utils_0.12.0.bb
index f190a5ae13..ff62257aa8 100644
--- a/packages/gnome/gnome-doc-utils_0.12.0.bb
+++ b/packages/gnome/gnome-doc-utils_0.12.0.bb
@@ -1,5 +1,5 @@
-LICENSE = "GPL/LGPL"
-DEPENDS = "libxml2 libxslt"
+LICENSE = "GPL LGPL"
+DEPENDS = "libxml2 libxslt libxslt-native"
 
 PR = "r1"
 
@@ -7,10 +7,10 @@ inherit gnome
 
 EXTRA_OECONF = "--disable-scrollkeeper"
 
-FILES_${PN} += "${datadir}/xml*"
-
 do_stage() {
 	mkdir -p  ${STAGING_DATADIR}/xml/gnome/xslt/
 	cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/
 	autotools_stage_all
 }
+
+FILES_${PN} += "${datadir}/xml*"
diff --git a/packages/gnome/gnome-doc-utils_0.7.1.bb b/packages/gnome/gnome-doc-utils_0.7.1.bb
index 86a36c4bd7..ff62257aa8 100644
--- a/packages/gnome/gnome-doc-utils_0.7.1.bb
+++ b/packages/gnome/gnome-doc-utils_0.7.1.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL LGPL"
-DEPENDS = "libxml2 libxslt"
+DEPENDS = "libxml2 libxslt libxslt-native"
 
 PR = "r1"
 
@@ -7,10 +7,10 @@ inherit gnome
 
 EXTRA_OECONF = "--disable-scrollkeeper"
 
-FILES_${PN} += "${datadir}/xml*"
-
 do_stage() {
 	mkdir -p  ${STAGING_DATADIR}/xml/gnome/xslt/
 	cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/
 	autotools_stage_all
 }
+
+FILES_${PN} += "${datadir}/xml*"
-- 
cgit v1.2.3


From 0066592ec6273dfe870fa877ca315ba45e636da2 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 18 Feb 2008 03:00:16 +0000
Subject: gnome-doc-utils: unify

---
 packages/gnome/gnome-doc-utils.inc       | 16 ++++++++++++++++
 packages/gnome/gnome-doc-utils_0.10.3.bb | 15 +--------------
 packages/gnome/gnome-doc-utils_0.12.0.bb | 15 +--------------
 packages/gnome/gnome-doc-utils_0.7.1.bb  | 15 +--------------
 4 files changed, 19 insertions(+), 42 deletions(-)
 create mode 100644 packages/gnome/gnome-doc-utils.inc

(limited to 'packages')

diff --git a/packages/gnome/gnome-doc-utils.inc b/packages/gnome/gnome-doc-utils.inc
new file mode 100644
index 0000000000..ff62257aa8
--- /dev/null
+++ b/packages/gnome/gnome-doc-utils.inc
@@ -0,0 +1,16 @@
+LICENSE = "GPL LGPL"
+DEPENDS = "libxml2 libxslt libxslt-native"
+
+PR = "r1"
+
+inherit gnome
+
+EXTRA_OECONF = "--disable-scrollkeeper"
+
+do_stage() {
+	mkdir -p  ${STAGING_DATADIR}/xml/gnome/xslt/
+	cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/
+	autotools_stage_all
+}
+
+FILES_${PN} += "${datadir}/xml*"
diff --git a/packages/gnome/gnome-doc-utils_0.10.3.bb b/packages/gnome/gnome-doc-utils_0.10.3.bb
index c5390128cf..cfb4788076 100644
--- a/packages/gnome/gnome-doc-utils_0.10.3.bb
+++ b/packages/gnome/gnome-doc-utils_0.10.3.bb
@@ -1,16 +1,3 @@
-LICENSE = "GPL LGPL"
-DEPENDS = "libxml2 libxslt libxslt-native"
+require gnome-doc-utils.inc
 
 PR = "r0"
-
-inherit gnome
-
-EXTRA_OECONF = "--disable-scrollkeeper"
-
-do_stage() {
-	mkdir -p  ${STAGING_DATADIR}/xml/gnome/xslt/
-	cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/
-	autotools_stage_all
-}
-
-FILES_${PN} += "${datadir}/xml*"
diff --git a/packages/gnome/gnome-doc-utils_0.12.0.bb b/packages/gnome/gnome-doc-utils_0.12.0.bb
index ff62257aa8..2499ac36e4 100644
--- a/packages/gnome/gnome-doc-utils_0.12.0.bb
+++ b/packages/gnome/gnome-doc-utils_0.12.0.bb
@@ -1,16 +1,3 @@
-LICENSE = "GPL LGPL"
-DEPENDS = "libxml2 libxslt libxslt-native"
+require gnome-doc-utils.inc
 
 PR = "r1"
-
-inherit gnome
-
-EXTRA_OECONF = "--disable-scrollkeeper"
-
-do_stage() {
-	mkdir -p  ${STAGING_DATADIR}/xml/gnome/xslt/
-	cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/
-	autotools_stage_all
-}
-
-FILES_${PN} += "${datadir}/xml*"
diff --git a/packages/gnome/gnome-doc-utils_0.7.1.bb b/packages/gnome/gnome-doc-utils_0.7.1.bb
index ff62257aa8..2499ac36e4 100644
--- a/packages/gnome/gnome-doc-utils_0.7.1.bb
+++ b/packages/gnome/gnome-doc-utils_0.7.1.bb
@@ -1,16 +1,3 @@
-LICENSE = "GPL LGPL"
-DEPENDS = "libxml2 libxslt libxslt-native"
+require gnome-doc-utils.inc
 
 PR = "r1"
-
-inherit gnome
-
-EXTRA_OECONF = "--disable-scrollkeeper"
-
-do_stage() {
-	mkdir -p  ${STAGING_DATADIR}/xml/gnome/xslt/
-	cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/
-	autotools_stage_all
-}
-
-FILES_${PN} += "${datadir}/xml*"
-- 
cgit v1.2.3


From 0c576349f827441d562ac51bc4f1d5258e49a002 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 18 Feb 2008 03:28:52 +0000
Subject: gnome-desktop: unify

---
 packages/gnome/gnome-desktop.inc       | 16 ++++++++++++++++
 packages/gnome/gnome-desktop_2.10.2.bb | 16 +++-------------
 packages/gnome/gnome-desktop_2.16.1.bb | 20 +++-----------------
 packages/gnome/gnome-desktop_2.18.3.bb | 21 ++++-----------------
 packages/gnome/gnome-desktop_2.7.90.bb | 13 ++++---------
 5 files changed, 30 insertions(+), 56 deletions(-)
 create mode 100644 packages/gnome/gnome-desktop.inc

(limited to 'packages')

diff --git a/packages/gnome/gnome-desktop.inc b/packages/gnome/gnome-desktop.inc
new file mode 100644
index 0000000000..aeabf4f41e
--- /dev/null
+++ b/packages/gnome/gnome-desktop.inc
@@ -0,0 +1,16 @@
+DESCRIPTION = "GNOME library for reading .desktop files"
+SECTION = "x11/gnome"
+LICENSE = "GPL"
+DEPENDS = "gnome-common libgnomeui"
+
+EXTRA_OECONF = "--disable-scrollkeeper"
+
+do_configure_prepend () {
+	cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
+}
+
+do_stage () {
+	autotools_stage_all
+}
+
+FILES_${PN} += "${datadir}/gnome-about"
diff --git a/packages/gnome/gnome-desktop_2.10.2.bb b/packages/gnome/gnome-desktop_2.10.2.bb
index b8e098f40c..55add53cce 100644
--- a/packages/gnome/gnome-desktop_2.10.2.bb
+++ b/packages/gnome/gnome-desktop_2.10.2.bb
@@ -1,17 +1,7 @@
-LICENSE = "GPL"
-SECTION = "x11/gnome"
+require gnome-desktop.inc
+
 PR = "r1"
-DESCRIPTION = "GNOME library for reading .desktop files"
-inherit gnome pkgconfig
 
-DEPENDS = "gnome-common libgnomeui"
+inherit gnome pkgconfig
 
 EXTRA_AUTORECONF = "-I ${STAGING_DATADIR}/aclocal/gnome2-macros"
-
-do_configure_prepend () {
-	cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
-}
-
-do_stage () {
-autotools_stage_all
-}
diff --git a/packages/gnome/gnome-desktop_2.16.1.bb b/packages/gnome/gnome-desktop_2.16.1.bb
index 69de709350..292984ab7d 100644
--- a/packages/gnome/gnome-desktop_2.16.1.bb
+++ b/packages/gnome/gnome-desktop_2.16.1.bb
@@ -1,25 +1,11 @@
-LICENSE = "GPL"
-SECTION = "x11/gnome"
+require gnome-desktop.inc
+
 PR = "r2"
-DESCRIPTION = "GNOME library for reading .desktop files"
 inherit gnome pkgconfig
 
-DEPENDS = "gnome-common gnome-doc-utils libgnomeui"
+DEPENDS += "gnome-doc-utils"
 
 SRC_URI += "file://scrollkeeper.patch;patch=1 \
             file://no-desktop-docs.patch;patch=1;pnum=0"
 
-EXTRA_OECONF = "--disable-scrollkeeper"
-
 EXTRA_AUTORECONF = "-I ${STAGING_DATADIR}/aclocal/gnome2-macros"
-
-do_configure_prepend () {
-	cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
-}
-
-FILES_${PN} += "${datadir}/gnome-about"
-
-
-do_stage () {
-	autotools_stage_all
-}
diff --git a/packages/gnome/gnome-desktop_2.18.3.bb b/packages/gnome/gnome-desktop_2.18.3.bb
index c2888bf2a4..7b9a5932e1 100644
--- a/packages/gnome/gnome-desktop_2.18.3.bb
+++ b/packages/gnome/gnome-desktop_2.18.3.bb
@@ -1,23 +1,10 @@
-LICENSE = "GPL"
-SECTION = "x11/gnome"
+require gnome-desktop.inc
+
 PR = "r2"
-DESCRIPTION = "GNOME library for reading .desktop files"
+
 inherit gnome pkgconfig
 
-DEPENDS = "gnome-common gnome-doc-utils gnome-vfs libgnomeui"
+DEPENDS += "gnome-doc-utils gnome-vfs"
 
 SRC_URI += "file://scrollkeeper.patch;patch=1 \
             file://no-desktop-docs.patch;patch=1;pnum=0"
-
-EXTRA_OECONF = "--disable-scrollkeeper"
-
-do_configure_prepend () {
-	cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
-}
-
-FILES_${PN} += "${datadir}/gnome-about"
-
-
-do_stage () {
-	autotools_stage_all
-}
diff --git a/packages/gnome/gnome-desktop_2.7.90.bb b/packages/gnome/gnome-desktop_2.7.90.bb
index c7fd61470d..53b70245ca 100644
--- a/packages/gnome/gnome-desktop_2.7.90.bb
+++ b/packages/gnome/gnome-desktop_2.7.90.bb
@@ -1,17 +1,12 @@
-LICENSE = "GPL"
-SECTION = "x11/gnome"
+require gnome-desktop.inc
+
 PR = "r0"
-DESCRIPTION = "GNOME library for reading .desktop files"
-inherit gnome
 
-DEPENDS = "gnome-common libgnomeui"
+inherit gnome
 
+EXTRA_OECONF = ""
 EXTRA_AUTORECONF = "-I ${STAGING_DATADIR}/aclocal/gnome2-macros"
 
-do_configure_prepend () {
-	cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
-}
-
 do_stage () {
 	install -d ${STAGING_INCDIR}/gnome-desktop-2.0/libgnome/
 #	install -d ${STAGING_INCDIR}/gnome-desktop-2.0/libgnomeui/
-- 
cgit v1.2.3


From ad1e99f5dcbcb0860b17a53a93e4d9ee82737497 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 18 Feb 2008 03:46:12 +0000
Subject: tshark: fix SRC_URI

---
 packages/wireshark/tshark_0.99.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/wireshark/tshark_0.99.4.bb b/packages/wireshark/tshark_0.99.4.bb
index 4f8f6781bf..7338efdda7 100644
--- a/packages/wireshark/tshark_0.99.4.bb
+++ b/packages/wireshark/tshark_0.99.4.bb
@@ -4,7 +4,7 @@ SECTION = "network"
 LICENSE = "GPL"
 DEPENDS = "perl-native gnutls libpcap pcre expat"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
+SRC_URI = "${SOURCEFORGE_MIRROR}/wireshark/wireshark-${PV}.tar.bz2 \
            file://use-our-lemon.patch;patch=1 \
 	   file://no-host-includes.patch;patch=1"
 
-- 
cgit v1.2.3


From 03b5351cd7dc2bc54de804036ba8d5aa542828a3 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 18 Feb 2008 04:12:46 +0000
Subject: gnome-desktop: remove EXTRA_AUTORECONF from 2.10 and 2.16 recipe *
 same thing that got 2.18 version to compile in
 4f51dba47b3fab8347a4183dda20e0be798b3928 * version 2.7.90 still does not
 compile successfully, leaving unchanged

---
 packages/gnome/gnome-desktop_2.10.2.bb | 2 --
 packages/gnome/gnome-desktop_2.16.1.bb | 2 --
 2 files changed, 4 deletions(-)

(limited to 'packages')

diff --git a/packages/gnome/gnome-desktop_2.10.2.bb b/packages/gnome/gnome-desktop_2.10.2.bb
index 55add53cce..2bf249ddb6 100644
--- a/packages/gnome/gnome-desktop_2.10.2.bb
+++ b/packages/gnome/gnome-desktop_2.10.2.bb
@@ -3,5 +3,3 @@ require gnome-desktop.inc
 PR = "r1"
 
 inherit gnome pkgconfig
-
-EXTRA_AUTORECONF = "-I ${STAGING_DATADIR}/aclocal/gnome2-macros"
diff --git a/packages/gnome/gnome-desktop_2.16.1.bb b/packages/gnome/gnome-desktop_2.16.1.bb
index 292984ab7d..fb45b134ae 100644
--- a/packages/gnome/gnome-desktop_2.16.1.bb
+++ b/packages/gnome/gnome-desktop_2.16.1.bb
@@ -7,5 +7,3 @@ DEPENDS += "gnome-doc-utils"
 
 SRC_URI += "file://scrollkeeper.patch;patch=1 \
             file://no-desktop-docs.patch;patch=1;pnum=0"
-
-EXTRA_AUTORECONF = "-I ${STAGING_DATADIR}/aclocal/gnome2-macros"
-- 
cgit v1.2.3


From 9efa32537d850d8283f44a728577d043bf7b2a98 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 18 Feb 2008 04:17:19 +0000
Subject: sqlite3: drop a bunch of patches from version specific directories
 that are also available from sqlite3/ dir.

---
 packages/sqlite/sqlite3-3.2.2/libtool.patch        | 25 ------
 packages/sqlite/sqlite3-3.2.5/libtool.patch        | 25 ------
 packages/sqlite/sqlite3-3.2.7/libtool.patch        | 25 ------
 packages/sqlite/sqlite3-3.3.12/cross-compile.patch | 92 ----------------------
 packages/sqlite/sqlite3-3.3.12/libtool.patch       | 25 ------
 packages/sqlite/sqlite3-3.3.13/cross-compile.patch | 92 ----------------------
 packages/sqlite/sqlite3-3.3.13/libtool.patch       | 25 ------
 packages/sqlite/sqlite3-3.3.17/libtool.patch       | 25 ------
 packages/sqlite/sqlite3-3.4.1/libtool.patch        | 25 ------
 9 files changed, 359 deletions(-)
 delete mode 100644 packages/sqlite/sqlite3-3.2.2/libtool.patch
 delete mode 100644 packages/sqlite/sqlite3-3.2.5/libtool.patch
 delete mode 100644 packages/sqlite/sqlite3-3.2.7/libtool.patch
 delete mode 100644 packages/sqlite/sqlite3-3.3.12/cross-compile.patch
 delete mode 100644 packages/sqlite/sqlite3-3.3.12/libtool.patch
 delete mode 100644 packages/sqlite/sqlite3-3.3.13/cross-compile.patch
 delete mode 100644 packages/sqlite/sqlite3-3.3.13/libtool.patch
 delete mode 100644 packages/sqlite/sqlite3-3.3.17/libtool.patch
 delete mode 100644 packages/sqlite/sqlite3-3.4.1/libtool.patch

(limited to 'packages')

diff --git a/packages/sqlite/sqlite3-3.2.2/libtool.patch b/packages/sqlite/sqlite3-3.2.2/libtool.patch
deleted file mode 100644
index ccf9993ed2..0000000000
--- a/packages/sqlite/sqlite3-3.2.2/libtool.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: sqlite-3.2.1/Makefile.in
-===================================================================
---- sqlite-3.2.1.orig/Makefile.in	2005-03-23 17:09:39.000000000 +0100
-+++ sqlite-3.2.1/Makefile.in	2005-04-25 23:11:20.000000000 +0200
-@@ -15,7 +15,10 @@
- # The toplevel directory of the source tree.  This is the directory
- # that contains this "Makefile.in" and the "configure.in" script.
- #
--TOP = @srcdir@
-+TOP = $(srcdir)
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+top_builddir = .
- 
- # C Compiler and options for use in building executables that
- # will run on the platform that is doing the build.
-@@ -96,7 +99,7 @@
- exec_prefix = @exec_prefix@
- libdir = @libdir@
- INSTALL = @INSTALL@
--LIBTOOL = ./libtool
-+LIBTOOL = @LIBTOOL@
- ALLOWRELEASE = @ALLOWRELEASE@
- 
- # libtool compile/link/install
diff --git a/packages/sqlite/sqlite3-3.2.5/libtool.patch b/packages/sqlite/sqlite3-3.2.5/libtool.patch
deleted file mode 100644
index ccf9993ed2..0000000000
--- a/packages/sqlite/sqlite3-3.2.5/libtool.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: sqlite-3.2.1/Makefile.in
-===================================================================
---- sqlite-3.2.1.orig/Makefile.in	2005-03-23 17:09:39.000000000 +0100
-+++ sqlite-3.2.1/Makefile.in	2005-04-25 23:11:20.000000000 +0200
-@@ -15,7 +15,10 @@
- # The toplevel directory of the source tree.  This is the directory
- # that contains this "Makefile.in" and the "configure.in" script.
- #
--TOP = @srcdir@
-+TOP = $(srcdir)
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+top_builddir = .
- 
- # C Compiler and options for use in building executables that
- # will run on the platform that is doing the build.
-@@ -96,7 +99,7 @@
- exec_prefix = @exec_prefix@
- libdir = @libdir@
- INSTALL = @INSTALL@
--LIBTOOL = ./libtool
-+LIBTOOL = @LIBTOOL@
- ALLOWRELEASE = @ALLOWRELEASE@
- 
- # libtool compile/link/install
diff --git a/packages/sqlite/sqlite3-3.2.7/libtool.patch b/packages/sqlite/sqlite3-3.2.7/libtool.patch
deleted file mode 100644
index ccf9993ed2..0000000000
--- a/packages/sqlite/sqlite3-3.2.7/libtool.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: sqlite-3.2.1/Makefile.in
-===================================================================
---- sqlite-3.2.1.orig/Makefile.in	2005-03-23 17:09:39.000000000 +0100
-+++ sqlite-3.2.1/Makefile.in	2005-04-25 23:11:20.000000000 +0200
-@@ -15,7 +15,10 @@
- # The toplevel directory of the source tree.  This is the directory
- # that contains this "Makefile.in" and the "configure.in" script.
- #
--TOP = @srcdir@
-+TOP = $(srcdir)
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+top_builddir = .
- 
- # C Compiler and options for use in building executables that
- # will run on the platform that is doing the build.
-@@ -96,7 +99,7 @@
- exec_prefix = @exec_prefix@
- libdir = @libdir@
- INSTALL = @INSTALL@
--LIBTOOL = ./libtool
-+LIBTOOL = @LIBTOOL@
- ALLOWRELEASE = @ALLOWRELEASE@
- 
- # libtool compile/link/install
diff --git a/packages/sqlite/sqlite3-3.3.12/cross-compile.patch b/packages/sqlite/sqlite3-3.3.12/cross-compile.patch
deleted file mode 100644
index 31d4f0d162..0000000000
--- a/packages/sqlite/sqlite3-3.3.12/cross-compile.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- sqlite-3.3.7/configure.ac.orig	2006-08-21 00:20:50.000000000 +0200
-+++ sqlite-3.3.7/configure.ac	2006-08-21 00:22:35.000000000 +0200
-@@ -187,10 +187,11 @@
- default_build_cflags="-g"
- if test "$config_BUILD_CC" = ""; then
-   AC_PROG_CC
--  if test "$cross_compiling" = "yes"; then
--    AC_MSG_ERROR([unable to find a compiler for building build tools])
--  fi
--  BUILD_CC=$CC
-+#  if test "$cross_compiling" = "yes"; then
-+#    AC_MSG_ERROR([unable to find a compiler for building build tools])
-+#  fi
-+#  BUILD_CC=$CC
-+BUILD_CC=gcc
-   default_build_cflags=$CFLAGS
- else
-   BUILD_CC=$config_BUILD_CC
-@@ -238,6 +239,12 @@
-   TARGET_LINK=$config_TARGET_LINK
- fi
- AC_MSG_RESULT($TARGET_LINK)
-+if test "$config_TARGET_LFLAGS" != ""; then
-+  TARGET_LFLAGS=$config_TARGET_LFLAGS
-+  else
-+    TARGET_LFLAGS=$BUILD_LFLAGS
-+  fi
-+AC_MSG_RESULT($TARGET_LFLAGS)
- AC_MSG_CHECKING([switches on the target compiler])
- if test "$config_TARGET_TFLAGS" != ""; then
-   TARGET_TFLAGS=$config_TARGET_TFLAGS
-@@ -592,15 +599,7 @@
- # Figure out what C libraries are required to compile programs
- # that use "readline()" library.
- #
--if test "$config_TARGET_READLINE_LIBS" != ""; then
--  TARGET_READLINE_LIBS="$config_TARGET_READLINE_LIBS"
--else
--  CC=$TARGET_CC
--  LIBS=""
--  AC_SEARCH_LIBS(tgetent, [readline ncurses curses termcap])
--  AC_CHECK_LIB([readline], [readline])
--  TARGET_READLINE_LIBS="$LIBS"
--fi
-+TARGET_READLINE_LIBS="-lreadline"
- AC_SUBST(TARGET_READLINE_LIBS)
- 
- ##########
-@@ -615,41 +614,8 @@
- ##########
- # Figure out where to get the READLINE header files.
- #
--AC_MSG_CHECKING([readline header files])
--found=no
--if test "$config_TARGET_READLINE_INC" != ""; then
--  TARGET_READLINE_INC=$config_TARGET_READLINE_INC
--  found=yes
--fi
--if test "$found" = "yes"; then
--  AC_MSG_RESULT($TARGET_READLINE_INC)
--else
--  AC_MSG_RESULT(not specified: still searching...)
--  AC_CHECK_HEADER(readline.h, [found=yes])
--fi
--if test "$found" = "no"; then
--  for dir in /usr /usr/local /usr/local/readline /usr/contrib /mingw; do
--    AC_CHECK_FILE($dir/include/readline.h, found=yes)
--    if test "$found" = "yes"; then
--      TARGET_READLINE_INC="-I$dir/include"
--      break
--    fi
--    AC_CHECK_FILE($dir/include/readline/readline.h, found=yes)
--    if test "$found" = "yes"; then
--      TARGET_READLINE_INC="-I$dir/include/readline"
--      break
--    fi
--  done
--fi
--if test "$found" = "yes"; then
--  if test "$TARGET_READLINE_LIBS" = ""; then
--    TARGET_HAVE_READLINE=0
--  else
--    TARGET_HAVE_READLINE=1
--  fi
--else
--  TARGET_HAVE_READLINE=0
--fi
-+TARGET_READLINE_INC=""
-+TARGET_HAVE_READLINE=1
- AC_SUBST(TARGET_READLINE_INC)
- AC_SUBST(TARGET_HAVE_READLINE)
- 
diff --git a/packages/sqlite/sqlite3-3.3.12/libtool.patch b/packages/sqlite/sqlite3-3.3.12/libtool.patch
deleted file mode 100644
index ccf9993ed2..0000000000
--- a/packages/sqlite/sqlite3-3.3.12/libtool.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: sqlite-3.2.1/Makefile.in
-===================================================================
---- sqlite-3.2.1.orig/Makefile.in	2005-03-23 17:09:39.000000000 +0100
-+++ sqlite-3.2.1/Makefile.in	2005-04-25 23:11:20.000000000 +0200
-@@ -15,7 +15,10 @@
- # The toplevel directory of the source tree.  This is the directory
- # that contains this "Makefile.in" and the "configure.in" script.
- #
--TOP = @srcdir@
-+TOP = $(srcdir)
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+top_builddir = .
- 
- # C Compiler and options for use in building executables that
- # will run on the platform that is doing the build.
-@@ -96,7 +99,7 @@
- exec_prefix = @exec_prefix@
- libdir = @libdir@
- INSTALL = @INSTALL@
--LIBTOOL = ./libtool
-+LIBTOOL = @LIBTOOL@
- ALLOWRELEASE = @ALLOWRELEASE@
- 
- # libtool compile/link/install
diff --git a/packages/sqlite/sqlite3-3.3.13/cross-compile.patch b/packages/sqlite/sqlite3-3.3.13/cross-compile.patch
deleted file mode 100644
index 31d4f0d162..0000000000
--- a/packages/sqlite/sqlite3-3.3.13/cross-compile.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- sqlite-3.3.7/configure.ac.orig	2006-08-21 00:20:50.000000000 +0200
-+++ sqlite-3.3.7/configure.ac	2006-08-21 00:22:35.000000000 +0200
-@@ -187,10 +187,11 @@
- default_build_cflags="-g"
- if test "$config_BUILD_CC" = ""; then
-   AC_PROG_CC
--  if test "$cross_compiling" = "yes"; then
--    AC_MSG_ERROR([unable to find a compiler for building build tools])
--  fi
--  BUILD_CC=$CC
-+#  if test "$cross_compiling" = "yes"; then
-+#    AC_MSG_ERROR([unable to find a compiler for building build tools])
-+#  fi
-+#  BUILD_CC=$CC
-+BUILD_CC=gcc
-   default_build_cflags=$CFLAGS
- else
-   BUILD_CC=$config_BUILD_CC
-@@ -238,6 +239,12 @@
-   TARGET_LINK=$config_TARGET_LINK
- fi
- AC_MSG_RESULT($TARGET_LINK)
-+if test "$config_TARGET_LFLAGS" != ""; then
-+  TARGET_LFLAGS=$config_TARGET_LFLAGS
-+  else
-+    TARGET_LFLAGS=$BUILD_LFLAGS
-+  fi
-+AC_MSG_RESULT($TARGET_LFLAGS)
- AC_MSG_CHECKING([switches on the target compiler])
- if test "$config_TARGET_TFLAGS" != ""; then
-   TARGET_TFLAGS=$config_TARGET_TFLAGS
-@@ -592,15 +599,7 @@
- # Figure out what C libraries are required to compile programs
- # that use "readline()" library.
- #
--if test "$config_TARGET_READLINE_LIBS" != ""; then
--  TARGET_READLINE_LIBS="$config_TARGET_READLINE_LIBS"
--else
--  CC=$TARGET_CC
--  LIBS=""
--  AC_SEARCH_LIBS(tgetent, [readline ncurses curses termcap])
--  AC_CHECK_LIB([readline], [readline])
--  TARGET_READLINE_LIBS="$LIBS"
--fi
-+TARGET_READLINE_LIBS="-lreadline"
- AC_SUBST(TARGET_READLINE_LIBS)
- 
- ##########
-@@ -615,41 +614,8 @@
- ##########
- # Figure out where to get the READLINE header files.
- #
--AC_MSG_CHECKING([readline header files])
--found=no
--if test "$config_TARGET_READLINE_INC" != ""; then
--  TARGET_READLINE_INC=$config_TARGET_READLINE_INC
--  found=yes
--fi
--if test "$found" = "yes"; then
--  AC_MSG_RESULT($TARGET_READLINE_INC)
--else
--  AC_MSG_RESULT(not specified: still searching...)
--  AC_CHECK_HEADER(readline.h, [found=yes])
--fi
--if test "$found" = "no"; then
--  for dir in /usr /usr/local /usr/local/readline /usr/contrib /mingw; do
--    AC_CHECK_FILE($dir/include/readline.h, found=yes)
--    if test "$found" = "yes"; then
--      TARGET_READLINE_INC="-I$dir/include"
--      break
--    fi
--    AC_CHECK_FILE($dir/include/readline/readline.h, found=yes)
--    if test "$found" = "yes"; then
--      TARGET_READLINE_INC="-I$dir/include/readline"
--      break
--    fi
--  done
--fi
--if test "$found" = "yes"; then
--  if test "$TARGET_READLINE_LIBS" = ""; then
--    TARGET_HAVE_READLINE=0
--  else
--    TARGET_HAVE_READLINE=1
--  fi
--else
--  TARGET_HAVE_READLINE=0
--fi
-+TARGET_READLINE_INC=""
-+TARGET_HAVE_READLINE=1
- AC_SUBST(TARGET_READLINE_INC)
- AC_SUBST(TARGET_HAVE_READLINE)
- 
diff --git a/packages/sqlite/sqlite3-3.3.13/libtool.patch b/packages/sqlite/sqlite3-3.3.13/libtool.patch
deleted file mode 100644
index ccf9993ed2..0000000000
--- a/packages/sqlite/sqlite3-3.3.13/libtool.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: sqlite-3.2.1/Makefile.in
-===================================================================
---- sqlite-3.2.1.orig/Makefile.in	2005-03-23 17:09:39.000000000 +0100
-+++ sqlite-3.2.1/Makefile.in	2005-04-25 23:11:20.000000000 +0200
-@@ -15,7 +15,10 @@
- # The toplevel directory of the source tree.  This is the directory
- # that contains this "Makefile.in" and the "configure.in" script.
- #
--TOP = @srcdir@
-+TOP = $(srcdir)
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+top_builddir = .
- 
- # C Compiler and options for use in building executables that
- # will run on the platform that is doing the build.
-@@ -96,7 +99,7 @@
- exec_prefix = @exec_prefix@
- libdir = @libdir@
- INSTALL = @INSTALL@
--LIBTOOL = ./libtool
-+LIBTOOL = @LIBTOOL@
- ALLOWRELEASE = @ALLOWRELEASE@
- 
- # libtool compile/link/install
diff --git a/packages/sqlite/sqlite3-3.3.17/libtool.patch b/packages/sqlite/sqlite3-3.3.17/libtool.patch
deleted file mode 100644
index ccf9993ed2..0000000000
--- a/packages/sqlite/sqlite3-3.3.17/libtool.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: sqlite-3.2.1/Makefile.in
-===================================================================
---- sqlite-3.2.1.orig/Makefile.in	2005-03-23 17:09:39.000000000 +0100
-+++ sqlite-3.2.1/Makefile.in	2005-04-25 23:11:20.000000000 +0200
-@@ -15,7 +15,10 @@
- # The toplevel directory of the source tree.  This is the directory
- # that contains this "Makefile.in" and the "configure.in" script.
- #
--TOP = @srcdir@
-+TOP = $(srcdir)
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+top_builddir = .
- 
- # C Compiler and options for use in building executables that
- # will run on the platform that is doing the build.
-@@ -96,7 +99,7 @@
- exec_prefix = @exec_prefix@
- libdir = @libdir@
- INSTALL = @INSTALL@
--LIBTOOL = ./libtool
-+LIBTOOL = @LIBTOOL@
- ALLOWRELEASE = @ALLOWRELEASE@
- 
- # libtool compile/link/install
diff --git a/packages/sqlite/sqlite3-3.4.1/libtool.patch b/packages/sqlite/sqlite3-3.4.1/libtool.patch
deleted file mode 100644
index ccf9993ed2..0000000000
--- a/packages/sqlite/sqlite3-3.4.1/libtool.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: sqlite-3.2.1/Makefile.in
-===================================================================
---- sqlite-3.2.1.orig/Makefile.in	2005-03-23 17:09:39.000000000 +0100
-+++ sqlite-3.2.1/Makefile.in	2005-04-25 23:11:20.000000000 +0200
-@@ -15,7 +15,10 @@
- # The toplevel directory of the source tree.  This is the directory
- # that contains this "Makefile.in" and the "configure.in" script.
- #
--TOP = @srcdir@
-+TOP = $(srcdir)
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+top_builddir = .
- 
- # C Compiler and options for use in building executables that
- # will run on the platform that is doing the build.
-@@ -96,7 +99,7 @@
- exec_prefix = @exec_prefix@
- libdir = @libdir@
- INSTALL = @INSTALL@
--LIBTOOL = ./libtool
-+LIBTOOL = @LIBTOOL@
- ALLOWRELEASE = @ALLOWRELEASE@
- 
- # libtool compile/link/install
-- 
cgit v1.2.3


From fe620072876ebaa842f1493cf15d6b2ccf78ce82 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 18 Feb 2008 04:28:36 +0000
Subject: sqlite3: update to latest stable (3.5.6)

---
 packages/sqlite/sqlite3_3.5.2.bb | 1 -
 packages/sqlite/sqlite3_3.5.6.bb | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 packages/sqlite/sqlite3_3.5.2.bb
 create mode 100644 packages/sqlite/sqlite3_3.5.6.bb

(limited to 'packages')

diff --git a/packages/sqlite/sqlite3_3.5.2.bb b/packages/sqlite/sqlite3_3.5.2.bb
deleted file mode 100644
index 53fd96c705..0000000000
--- a/packages/sqlite/sqlite3_3.5.2.bb
+++ /dev/null
@@ -1 +0,0 @@
-require sqlite3.inc
diff --git a/packages/sqlite/sqlite3_3.5.6.bb b/packages/sqlite/sqlite3_3.5.6.bb
new file mode 100644
index 0000000000..53fd96c705
--- /dev/null
+++ b/packages/sqlite/sqlite3_3.5.6.bb
@@ -0,0 +1 @@
+require sqlite3.inc
-- 
cgit v1.2.3


From ab9b018ebdc0673c65d69016a6b4c354af62980e Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 18 Feb 2008 11:05:06 +0000
Subject: amule: initial commit.  closes 717 for OE.

---
 packages/amule/.mtn2git_empty       |  0
 pa