From b58a2b81ad312b1699f0cdbb6b8162ba91d21ead Mon Sep 17 00:00:00 2001 From: Rolf Leggewie 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 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 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 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 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 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 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 " -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 " +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 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 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 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 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 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 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 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 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 Date: Mon, 18 Feb 2008 11:05:06 +0000 Subject: amule: initial commit. closes 717 for OE. --- packages/amule/.mtn2git_empty | 0 packages/amule/amule_2.1.3.bb | 25 +++++++++++++++++++++++++ packages/amule/files/.mtn2git_empty | 0 packages/amule/files/parser.patch | 20 ++++++++++++++++++++ 4 files changed, 45 insertions(+) create mode 100644 packages/amule/.mtn2git_empty create mode 100644 packages/amule/amule_2.1.3.bb create mode 100644 packages/amule/files/.mtn2git_empty create mode 100644 packages/amule/files/parser.patch (limited to 'packages') diff --git a/packages/amule/.mtn2git_empty b/packages/amule/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/amule/amule_2.1.3.bb b/packages/amule/amule_2.1.3.bb new file mode 100644 index 0000000000..b160203ffd --- /dev/null +++ b/packages/amule/amule_2.1.3.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "aMule is an eMule-like client for the eD2k \ +and Kademlia networks, supporting multiple platforms." +HOMEPAGE = "http://www.amule.org" +LICENSE = "GPL" +SECTION = "web" +PRIORITY = "optional" +DEPENDS = "wxbase" + + +SRC_URI = "${SOURCEFORGE_MIRROR}/amule/aMule-${PV}.tar.bz2 \ + file://parser.patch;patch=1" + +S = "${WORKDIR}/aMule-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-amulecmd \ + --enable-webserver \ + --disable-monolithic \ + --enable-amule-daemon \ + --disable-nls" +# --enable-optimize" + +FILES_${PN} += " \ + ${libdir}/xchat" diff --git a/packages/amule/files/.mtn2git_empty b/packages/amule/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/amule/files/parser.patch b/packages/amule/files/parser.patch new file mode 100644 index 0000000000..ee77c42380 --- /dev/null +++ b/packages/amule/files/parser.patch @@ -0,0 +1,20 @@ +diff -ur aMule-2.1.0_orig/src/Parser.cpp aMule-2.1.0/src/Parser.cpp +--- aMule-2.1.0_orig/src/Parser.cpp 2005-12-20 05:13:25.000000000 +0100 ++++ aMule-2.1.0/src/Parser.cpp 2006-01-29 15:16:45.000000000 +0100 +@@ -203,14 +203,14 @@ + # define YYMALLOC malloc + # if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \ + && (defined (__STDC__) || defined (__cplusplus))) +-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ ++/*void *malloc (YYSIZE_T);*/ /* INFRINGES ON USER NAME SPACE */ + # endif + # endif + # ifndef YYFREE + # define YYFREE free + # if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \ + && (defined (__STDC__) || defined (__cplusplus))) +-void free (void *); /* INFRINGES ON USER NAME SPACE */ ++/*void free (void *);*/ /* INFRINGES ON USER NAME SPACE */ + # endif + # endif + # ifdef __cplusplus -- cgit v1.2.3 From e40c4bc863160289dbd9d0e7bc5164c0c9ecae7c Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Mon, 18 Feb 2008 14:13:32 +0000 Subject: renderproto: Lower preference of v. 0.9.3 since it breaks xserver-kdrive-xomap. --- packages/xorg-proto/renderproto_0.9.3.bb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages') diff --git a/packages/xorg-proto/renderproto_0.9.3.bb b/packages/xorg-proto/renderproto_0.9.3.bb index 3d20b24afd..f1d19df46e 100644 --- a/packages/xorg-proto/renderproto_0.9.3.bb +++ b/packages/xorg-proto/renderproto_0.9.3.bb @@ -2,3 +2,5 @@ require xorg-proto-common.inc CONFLICTS = "renderext" PE = "1" + +DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From effac7639d733d602eefafd90f7bb59fb8c934ee Mon Sep 17 00:00:00 2001 From: Jeremy Laine Date: Mon, 18 Feb 2008 14:49:56 +0000 Subject: linux-2.6.2[34]: rename mpc8313e-rdb LEDs --- .../linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch | 10 +++++----- .../linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch b/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch index be322be927..1116ce3998 100644 --- a/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch +++ b/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch @@ -20,8 +20,8 @@ diff -urN linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.23/driver @@ -0,0 +1,171 @@ +/* + * drivers/leds/leds-mpc8313e-rdb.c -+ * Copyright (C) 2007 Leon Woestenberg + * Copyright (C) 2007 Jeremy Laine ++ * Copyright (C) 2007 Leon Woestenberg + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of this archive for @@ -99,21 +99,21 @@ diff -urN linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.23/driver + }, + { + .cdev = { -+ .name = "mpc8313:green", ++ .name = "mpc8313:led5", + .brightness_set = mpc8313leds_set, + }, + .bitmask = 32, + }, + { + .cdev = { -+ .name = "mpc8313:yellow", ++ .name = "mpc8313:led6", + .brightness_set = mpc8313leds_set, + }, + .bitmask = 64, + }, + { + .cdev = { -+ .name = "mpc8313:red", ++ .name = "mpc8313:led7", + .brightness_set = mpc8313leds_set, + }, + .bitmask = 128, @@ -186,7 +186,7 @@ diff -urN linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.23/driver +module_init(mpc8313leds_init); +module_exit(mpc8313leds_exit); + -+MODULE_AUTHOR("Leon Woestenberg "); ++MODULE_AUTHOR("Jeremy Laine "); +MODULE_DESCRIPTION("MPC8313E-RDB LED driver"); +MODULE_LICENSE("GPL"); diff -urN linux-2.6.23.orig/drivers/leds/Makefile linux-2.6.23/drivers/leds/Makefile diff --git a/packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch b/packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch index f1dca9d8e1..5336905a66 100644 --- a/packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch +++ b/packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch @@ -20,8 +20,8 @@ diff -urN linux-2.6.24.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.24/driver @@ -0,0 +1,171 @@ +/* + * drivers/leds/leds-mpc8313e-rdb.c -+ * Copyright (C) 2007 Leon Woestenberg + * Copyright (C) 2007 Jeremy Laine ++ * Copyright (C) 2007 Leon Woestenberg + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of this archive for @@ -99,21 +99,21 @@ diff -urN linux-2.6.24.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.24/driver + }, + { + .cdev = { -+ .name = "mpc8313:green", ++ .name = "mpc8313:led5", + .brightness_set = mpc8313leds_set, + }, + .bitmask = 32, + }, + { + .cdev = { -+ .name = "mpc8313:yellow", ++ .name = "mpc8313:led6", + .brightness_set = mpc8313leds_set, + }, + .bitmask = 64, + }, + { + .cdev = { -+ .name = "mpc8313:red", ++ .name = "mpc8313:led7", + .brightness_set = mpc8313leds_set, + }, + .bitmask = 128, @@ -186,7 +186,7 @@ diff -urN linux-2.6.24.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.24/driver +module_init(mpc8313leds_init); +module_exit(mpc8313leds_exit); + -+MODULE_AUTHOR("Leon Woestenberg "); ++MODULE_AUTHOR("Jeremy Laine "); +MODULE_DESCRIPTION("MPC8313E-RDB LED driver"); +MODULE_LICENSE("GPL"); diff -urN linux-2.6.24.orig/drivers/leds/Makefile linux-2.6.24/drivers/leds/Makefile -- cgit v1.2.3 From 24b026d78e9e80318f8eb744754aeaa9034267ad Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 18 Feb 2008 14:51:12 +0000 Subject: osb-ncore: Add missing DEPENDS on gperf-native --- packages/gtk-webcore/osb-nrcore.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gtk-webcore/osb-nrcore.inc b/packages/gtk-webcore/osb-nrcore.inc index 7cbf0ce890..a6a1832853 100644 --- a/packages/gtk-webcore/osb-nrcore.inc +++ b/packages/gtk-webcore/osb-nrcore.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://gtk-webcore.sourceforge.net/" PRIORITY = "optional" SECTION = "gpe" LICENSE = "GPL" -DEPENDS = "glib-2.0 gtk+ pango osb-jscore libxt" +DEPENDS = "glib-2.0 gtk+ pango osb-jscore libxt gperf-native" LEAD_SONAME = "libnrcore.so" -- cgit v1.2.3 From 5d4ce8a8a30c9c595f5868da6ed14eebd0fd2683 Mon Sep 17 00:00:00 2001 From: Jeremy Laine Date: Mon, 18 Feb 2008 15:13:30 +0000 Subject: linux-2.6.23: for mpc8313e-rdb, modularise kernel some more to reduce size --- packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig | 84 +++------------------- packages/linux/linux_2.6.23.bb | 2 +- 2 files changed, 9 insertions(+), 77 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig b/packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig index 3cc17679c1..d842308fc9 100644 --- a/packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig +++ b/packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig @@ -687,7 +687,7 @@ CONFIG_EEPROM_93CX6=m # SCSI device support # # CONFIG_RAID_ATTRS is not set -CONFIG_SCSI=y +CONFIG_SCSI=m CONFIG_SCSI_DMA=y # CONFIG_SCSI_TGT is not set # CONFIG_SCSI_NETLINK is not set @@ -696,11 +696,11 @@ CONFIG_SCSI_PROC_FS=y # # SCSI support type (disk, tape, CD-ROM) # -CONFIG_BLK_DEV_SD=y +CONFIG_BLK_DEV_SD=m # CONFIG_CHR_DEV_ST is not set # CONFIG_CHR_DEV_OSST is not set # CONFIG_BLK_DEV_SR is not set -CONFIG_CHR_DEV_SG=y +# CONFIG_CHR_DEV_SG is not set # CONFIG_CHR_DEV_SCH is not set # @@ -715,45 +715,11 @@ CONFIG_SCSI_WAIT_SCAN=m # # SCSI Transports # -CONFIG_SCSI_SPI_ATTRS=y +CONFIG_SCSI_SPI_ATTRS=m # CONFIG_SCSI_FC_ATTRS is not set # CONFIG_SCSI_ISCSI_ATTRS is not set # CONFIG_SCSI_SAS_LIBSAS is not set -CONFIG_SCSI_LOWLEVEL=y -# CONFIG_ISCSI_TCP is not set -# CONFIG_BLK_DEV_3W_XXXX_RAID is not set -# CONFIG_SCSI_3W_9XXX is not set -# CONFIG_SCSI_ACARD is not set -# CONFIG_SCSI_AACRAID is not set -# CONFIG_SCSI_AIC7XXX is not set -# CONFIG_SCSI_AIC7XXX_OLD is not set -# CONFIG_SCSI_AIC79XX is not set -# CONFIG_SCSI_AIC94XX is not set -# CONFIG_SCSI_DPT_I2O is not set -# CONFIG_SCSI_ARCMSR is not set -# CONFIG_MEGARAID_NEWGEN is not set -# CONFIG_MEGARAID_LEGACY is not set -# CONFIG_MEGARAID_SAS is not set -# CONFIG_SCSI_HPTIOP is not set -# CONFIG_SCSI_BUSLOGIC is not set -# CONFIG_SCSI_DMX3191D is not set -# CONFIG_SCSI_EATA is not set -# CONFIG_SCSI_FUTURE_DOMAIN is not set -# CONFIG_SCSI_GDTH is not set -# CONFIG_SCSI_IPS is not set -# CONFIG_SCSI_INITIO is not set -# CONFIG_SCSI_INIA100 is not set -# CONFIG_SCSI_STEX is not set -# CONFIG_SCSI_SYM53C8XX_2 is not set -# CONFIG_SCSI_QLOGIC_1280 is not set -# CONFIG_SCSI_QLA_FC is not set -# CONFIG_SCSI_QLA_ISCSI is not set -# CONFIG_SCSI_LPFC is not set -# CONFIG_SCSI_DC395x is not set -# CONFIG_SCSI_DC390T is not set -# CONFIG_SCSI_NSP32 is not set -# CONFIG_SCSI_DEBUG is not set -# CONFIG_SCSI_SRP is not set +# CONFIG_SCSI_LOWLEVEL is not set # CONFIG_ATA is not set # CONFIG_MD is not set @@ -796,34 +762,7 @@ CONFIG_CICADA_PHY=y # CONFIG_BROADCOM_PHY is not set # CONFIG_ICPLUS_PHY is not set # CONFIG_FIXED_PHY is not set -CONFIG_NET_ETHERNET=y -CONFIG_MII=y -# CONFIG_HAPPYMEAL is not set -# CONFIG_SUNGEM is not set -# CONFIG_CASSINI is not set -# CONFIG_NET_VENDOR_3COM is not set -# CONFIG_NET_TULIP is not set -# CONFIG_HP100 is not set -CONFIG_NET_PCI=y -# CONFIG_PCNET32 is not set -# CONFIG_AMD8111_ETH is not set -# CONFIG_ADAPTEC_STARFIRE is not set -# CONFIG_B44 is not set -# CONFIG_FORCEDETH is not set -# CONFIG_DGRS is not set -# CONFIG_EEPRO100 is not set -CONFIG_E100=y -# CONFIG_FEALNX is not set -# CONFIG_NATSEMI is not set -# CONFIG_NE2K_PCI is not set -# CONFIG_8139CP is not set -# CONFIG_8139TOO is not set -# CONFIG_SIS900 is not set -# CONFIG_EPIC100 is not set -# CONFIG_SUNDANCE is not set -# CONFIG_TLAN is not set -# CONFIG_VIA_RHINE is not set -# CONFIG_SC92031 is not set +# CONFIG_NET_ETHERNET is not set CONFIG_NETDEV_1000=y # CONFIG_ACENIC is not set # CONFIG_DL2K is not set @@ -843,14 +782,7 @@ CONFIG_GIANFAR=y CONFIG_GFAR_NAPI=y # CONFIG_QLA3XXX is not set # CONFIG_ATL1 is not set -CONFIG_NETDEV_10000=y -# CONFIG_CHELSIO_T1 is not set -# CONFIG_CHELSIO_T3 is not set -# CONFIG_IXGB is not set -# CONFIG_S2IO is not set -# CONFIG_MYRI10GE is not set -# CONFIG_NETXEN_NIC is not set -# CONFIG_MLX4_CORE is not set +# CONFIG_NETDEV_10000 is not set # CONFIG_TR is not set # @@ -1470,7 +1402,7 @@ CONFIG_USB_UHCI_HCD=y # # may also be needed; see USB_STORAGE Help for more information # -CONFIG_USB_STORAGE=y +CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set # CONFIG_USB_STORAGE_DATAFAB is not set # CONFIG_USB_STORAGE_FREECOM is not set diff --git a/packages/linux/linux_2.6.23.bb b/packages/linux/linux_2.6.23.bb index f754e6be83..ffc1820229 100644 --- a/packages/linux/linux_2.6.23.bb +++ b/packages/linux/linux_2.6.23.bb @@ -10,7 +10,7 @@ DEFAULT_PREFERENCE_avr32 = "1" DEPENDS_append_mpc8313e-rdb = " dtc-native" DEPENDS_append_mpc8323e-rdb = " dtc-native" -PR = "r11" +PR = "r12" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \ file://binutils-buildid-arm.patch;patch=1 \ -- cgit v1.2.3 From ffd4a5b48f26451870c89660a1b92b1d4f9a4073 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 18 Feb 2008 16:20:02 +0000 Subject: osb-nrcore: Disable PARALLEL_MAKE as it breaks with it set. --- packages/gtk-webcore/osb-nrcore.inc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'packages') diff --git a/packages/gtk-webcore/osb-nrcore.inc b/packages/gtk-webcore/osb-nrcore.inc index a6a1832853..6fd1d22580 100644 --- a/packages/gtk-webcore/osb-nrcore.inc +++ b/packages/gtk-webcore/osb-nrcore.inc @@ -9,6 +9,9 @@ LEAD_SONAME = "libnrcore.so" inherit autotools pkgconfig +#/khtml/css/cssproperties.h failes to generate properly with high parallel makes +PARALLEL_MAKE = "" + do_configure () { autotools_do_configure cd ${S} -- cgit v1.2.3 From 7d427c988107e61e6d9b9f949af49398caa204e4 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 18 Feb 2008 16:20:58 +0000 Subject: calibrateproto, libxcalibrate: Update recipes to SRCREV and a new tag since the patches were merged upstream --- packages/xorg-lib/libxcalibrate/.mtn2git_empty | 0 packages/xorg-lib/libxcalibrate/coords.patch | 50 -------------------- packages/xorg-lib/libxcalibrate_git.bb | 6 +-- packages/xorg-proto/calibrateproto/.mtn2git_empty | 0 packages/xorg-proto/calibrateproto/coords.patch | 56 ----------------------- packages/xorg-proto/calibrateproto_git.bb | 6 +-- 6 files changed, 4 insertions(+), 114 deletions(-) delete mode 100644 packages/xorg-lib/libxcalibrate/.mtn2git_empty delete mode 100644 packages/xorg-lib/libxcalibrate/coords.patch delete mode 100644 packages/xorg-proto/calibrateproto/.mtn2git_empty delete mode 100644 packages/xorg-proto/calibrateproto/coords.patch (limited to 'packages') diff --git a/packages/xorg-lib/libxcalibrate/.mtn2git_empty b/packages/xorg-lib/libxcalibrate/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xorg-lib/libxcalibrate/coords.patch b/packages/xorg-lib/libxcalibrate/coords.patch deleted file mode 100644 index 19cf1639f6..0000000000 --- a/packages/xorg-lib/libxcalibrate/coords.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- - xcalibrate.c | 26 ++++++++++++++++++++++++++ - xcalibrate.h | 2 ++ - 2 files changed, 28 insertions(+) - -Index: XCalibrate/xcalibrate.c -=================================================================== ---- XCalibrate.orig/xcalibrate.c 2007-06-30 14:12:22.000000000 +0100 -+++ XCalibrate/xcalibrate.c 2007-06-30 14:18:10.000000000 +0100 -@@ -227,3 +227,29 @@ XCalibrateSetRawMode (Display *dpy, Bool - SyncHandle (); - return 0; - } -+ -+Status -+XCalibrateScreenToCoord (Display *dpy, int *x, int *y) -+{ -+ XExtDisplayInfo *info = XCalibrateFindDisplay (dpy); -+ xXCalibrateScreenToCoordReq *req; -+ xXCalibrateScreenToCoordReply rep; -+ LockDisplay (dpy); -+ GetReq (XCalibrateScreenToCoord, req); -+ req->reqType = info->codes->major_opcode; -+ req->xCalibrateReqType = X_XCalibrateScreenToCoord; -+ req->x = *x; -+ req->y = *y; -+ if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) -+ { -+ UnlockDisplay (dpy); -+ SyncHandle (); -+ return 1; -+ } -+ *x = rep.x; -+ *y = rep.y; -+ UnlockDisplay (dpy); -+ SyncHandle (); -+ return 0; -+} -+ -Index: XCalibrate/xcalibrate.h -=================================================================== ---- XCalibrate.orig/xcalibrate.h 2007-06-30 14:16:16.000000000 +0100 -+++ XCalibrate/xcalibrate.h 2007-06-30 14:16:38.000000000 +0100 -@@ -43,4 +43,6 @@ Status XCalibrateQueryVersion (Display * - - Status XCalibrateSetRawMode (Display *dpy, Bool enable); - -+Status XCalibrateScreenToCoord (Display *dpy, int *x, int *y); -+ - #endif diff --git a/packages/xorg-lib/libxcalibrate_git.bb b/packages/xorg-lib/libxcalibrate_git.bb index 99f11e40fd..24b4a1f067 100644 --- a/packages/xorg-lib/libxcalibrate_git.bb +++ b/packages/xorg-lib/libxcalibrate_git.bb @@ -3,11 +3,9 @@ require xorg-lib-common.inc DESCRIPTION = " Touchscreen calibration client library" LICENSE = "BSD-X" DEPENDS = "virtual/libx11 calibrateproto libxext" -PV = "0.0+git${SRCDATE}" -PR = "r2" +PV = "0.0+git${SRCREV}" -SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git;tag=4be232e30cd33a44a1ce6d3ec429ee6101540c62 \ - file://coords.patch;patch=1" +SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git" S = "${WORKDIR}/git" diff --git a/packages/xorg-proto/calibrateproto/.mtn2git_empty b/packages/xorg-proto/calibrateproto/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xorg-proto/calibrateproto/coords.patch b/packages/xorg-proto/calibrateproto/coords.patch deleted file mode 100644 index 8f44b029c5..0000000000 --- a/packages/xorg-proto/calibrateproto/coords.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- - xcalibrateproto.h | 25 +++++++++++++++++++++++++ - xcalibratewire.h | 3 ++- - 2 files changed, 27 insertions(+), 1 deletion(-) - -Index: XCalibrateExt/xcalibrateproto.h -=================================================================== ---- XCalibrateExt.orig/xcalibrateproto.h 2004-06-02 20:18:47.000000000 +0100 -+++ XCalibrateExt/xcalibrateproto.h 2007-06-30 14:17:29.000000000 +0100 -@@ -78,6 +78,31 @@ typedef struct { - - #define sz_xXCalibrateRawModeReply 32 - -+typedef struct { -+ CARD8 reqType; -+ CARD8 xCalibrateReqType; -+ CARD16 length B16; -+ CARD32 x B32; -+ CARD32 y B32; -+} xXCalibrateScreenToCoordReq; -+ -+#define sz_xXCalibrateScreenToCoordReq 12 -+ -+typedef struct { -+ BYTE type; /* X_Reply */ -+ BYTE pad1; -+ CARD16 sequenceNumber B16; -+ CARD32 x; -+ CARD32 y; -+ CARD32 pad2 B32; -+ CARD32 pad3 B32; -+ CARD32 pad4 B32; -+ CARD32 pad5 B32; -+ CARD32 pad6 B32; -+} xXCalibrateScreenToCoordReply; -+ -+#define sz_xXCalibrateScreenToCoordReply 32 -+ - /* Events */ - - typedef struct { -Index: XCalibrateExt/xcalibratewire.h -=================================================================== ---- XCalibrateExt.orig/xcalibratewire.h 2004-06-02 20:18:47.000000000 +0100 -+++ XCalibrateExt/xcalibratewire.h 2007-06-30 14:17:29.000000000 +0100 -@@ -31,8 +31,9 @@ - - #define X_XCalibrateQueryVersion 0 - #define X_XCalibrateRawMode 1 -+#define X_XCalibrateScreenToCoord 2 - --#define XCalibrateNumberRequests (X_XCalibrateSetRawMode + 1) -+#define XCalibrateNumberRequests (X_XCalibrateScreenToCoord + 1) - - #define X_XCalibrateRawTouchscreen 0 - diff --git a/packages/xorg-proto/calibrateproto_git.bb b/packages/xorg-proto/calibrateproto_git.bb index 60308601b9..02d20b5038 100644 --- a/packages/xorg-proto/calibrateproto_git.bb +++ b/packages/xorg-proto/calibrateproto_git.bb @@ -2,10 +2,8 @@ require xorg-proto-common.inc DESCRIPTION = "Touchscreen calibration protocol" -PV = "0.0+git${SRCDATE}" +PV = "0.0+git${SRCREV}" PR = "r1" -SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git;tag=a1d5ef0c73fbef3e758c51b57ac69ba9567bae04 \ - file://coords.patch;patch=1" - +SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git" S = "${WORKDIR}/git" -- cgit v1.2.3 From 8217f2c1337c6e270030ee3a182c6aa2a06f905f Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Mon, 18 Feb 2008 16:21:43 +0000 Subject: osso-gnome-vfs2: Move include to fix SRC_URI. --- packages/maemo4/osso-gnome-vfs2_2.16.3.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/maemo4/osso-gnome-vfs2_2.16.3.bb b/packages/maemo4/osso-gnome-vfs2_2.16.3.bb index 4d2e9aa94e..45a373fd11 100644 --- a/packages/maemo4/osso-gnome-vfs2_2.16.3.bb +++ b/packages/maemo4/osso-gnome-vfs2_2.16.3.bb @@ -6,12 +6,13 @@ DESCRIPTION = "gnomevfs - osso variant" P