diff options
Diffstat (limited to 'packages')
16 files changed, 115 insertions, 25 deletions
diff --git a/packages/aiostress/aiostress_0.0.bb b/packages/aiostress/aiostress_0.0.bb index 8b4085ad4f..9ebc20d371 100644 --- a/packages/aiostress/aiostress_0.0.bb +++ b/packages/aiostress/aiostress_0.0.bb @@ -1,8 +1,9 @@ DESCRIPTION = "Asynchronous I/O stress util" LICENSE = "GPLv2" DEPENDS = "libaio" +PR="r1" -SRC_URI = "ftp://ftp.suse.com/pub/people/mason/utils/aio-stress.c;md5sum=727e5fc3566837b3ea72f887d048769b" +SRC_URI = "http://mirrors.easynews.com/linux/suse/people/mason/utils/aio-stress.c" S = "${WORKDIR}" diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc index f87d4df0d1..2171cbd6d5 100644 --- a/packages/avahi/avahi.inc +++ b/packages/avahi/avahi.inc @@ -7,8 +7,10 @@ LICENSE = "GPL" PR="r4" DEPENDS = "expat libdaemon dbus glib-2.0" -RRECOMMENDS = "libnss-mdns" -RRECOMMENDS_avahi-daemon = "libnss-mdns" + +# uclibc has no nss +RRECOMMENDS_append_linux = "libnss-mdns" +RRECOMMENDS_avahi-daemon_append_linux = "libnss-mdns" RDEPENDS_avahi-daemon = "sysvinit-pidof" SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ diff --git a/packages/libmrss/files/atom-right-date.patch b/packages/libmrss/files/atom-right-date.patch deleted file mode 100644 index ba231b2ab4..0000000000 --- a/packages/libmrss/files/atom-right-date.patch +++ /dev/null @@ -1,15 +0,0 @@ -tm_mon goes from 0-11 written dates from 1-12. It is too late to consider security -here. The worst that can happen is that tm_mon == 0 gets negative but I assume -glibc to do range checking. -Index: libmrss-0.17.1/src/mrss_parser.c -=================================================================== ---- libmrss-0.17.1.orig/src/mrss_parser.c 2007-04-08 02:42:23.000000000 +0200 -+++ libmrss-0.17.1/src/mrss_parser.c 2007-04-08 02:43:37.000000000 +0200 -@@ -150,6 +150,7 @@ - { - char datebuf[256]; - stm.tm_year -= 1900; -+ stm.tm_mon -= 1; - - if (!data->c_locale - && !(data->c_locale = newlocale (LC_ALL_MASK, "C", NULL))) diff --git a/packages/libmrss/files/better-parse-url-r0.patch b/packages/libmrss/files/better-parse-url-r0.patch new file mode 100644 index 0000000000..94a78110a2 --- /dev/null +++ b/packages/libmrss/files/better-parse-url-r0.patch @@ -0,0 +1,90 @@ +Index: libmrss-0.17.2/src/mrss.h +=================================================================== +--- libmrss-0.17.2.orig/src/mrss.h 2007-04-02 14:42:55.000000000 +0200 ++++ libmrss-0.17.2/src/mrss.h 2007-05-19 20:56:08.000000000 +0200 +@@ -523,6 +523,22 @@ + mrss_t ** mrss, + mrss_options_t * options); + ++/** ++ * Like the previous function but you take ownership of the downloaded buffer in case of success ++ * \param url The url to be parsed ++ * \param mrss the pointer to your data struct ++ * \param options a pointer to a options data struct ++ * \param feed_content a pointer to the buffer with the document. This is not NULL terminated ++ * \param feed_size the size of the buffer above ++ * \return the error code ++ */ ++mrss_error_t mrss_parse_url_and_transfer_buffer ++ (char * url, ++ mrss_t ** mrss, ++ mrss_options_t * options, ++ char ** feed_content, ++ int * feed_size); ++ + /** + * Parses a file and creates the data struct of the feed RSS url + * \param file The file to be parsed +Index: libmrss-0.17.2/src/mrss_parser.c +=================================================================== +--- libmrss-0.17.2.orig/src/mrss_parser.c 2007-05-19 20:47:08.000000000 +0200 ++++ libmrss-0.17.2/src/mrss_parser.c 2007-05-19 20:56:37.000000000 +0200 +@@ -1075,13 +1075,20 @@ + mrss_error_t + mrss_parse_url (char *url, mrss_t ** ret) + { +- return mrss_parse_url_with_options (url, ret, NULL); ++ return mrss_parse_url_and_transfer_buffer (url, ret, NULL, NULL, NULL); + } + + mrss_error_t + mrss_parse_url_with_options (char *url, mrss_t ** ret, + mrss_options_t * options) + { ++ return mrss_parse_url_and_transfer_buffer (url, ret, options, NULL, NULL); ++} ++ ++mrss_error_t ++mrss_parse_url_and_transfer_buffer (char *url, mrss_t ** ret, ++ mrss_options_t * options, char **download_buffer, int *download_size) ++{ + nxml_t *doc; + mrss_error_t err; + char *buffer; +@@ -1117,7 +1124,8 @@ + + if (nxml_parse_buffer (doc, buffer, size) != NXML_OK) + { +- free (buffer); ++ if (!download_buffer) ++ free (buffer); + nxml_free (doc); + + return MRSS_ERR_PARSER; +@@ -1127,7 +1135,8 @@ + { + if (!((*ret)->file = strdup (url))) + { +- free (buffer); ++ if (!download_buffer) ++ free (buffer); + + mrss_free (*ret); + nxml_free (doc); +@@ -1138,9 +1147,15 @@ + (*ret)->size = size; + } + +- free (buffer); ++ if (!download_buffer) ++ free (buffer); + nxml_free (doc); + ++ /* transfer ownership */ ++ if (download_buffer) ++ *download_buffer = buffer; ++ if (download_size) ++ *download_size = size; + return err; + } + diff --git a/packages/libmrss/libmrss_0.17.1.bb b/packages/libmrss/libmrss_0.17.2.bb index 6476ee58c6..f536468479 100644 --- a/packages/libmrss/libmrss_0.17.1.bb +++ b/packages/libmrss/libmrss_0.17.2.bb @@ -8,7 +8,7 @@ PR = "r1" inherit autotools pkgconfig SRC_URI = "http://www2.autistici.org/bakunin/libmrss/libmrss-${PV}.tar.gz \ - file://atom-right-date.patch;patch=1 " + file://better-parse-url-r0.patch;patch=1 " do_stage() { autotools_stage_all diff --git a/packages/linux/ixp4xx-kernel/2.6.21/defconfig b/packages/linux/ixp4xx-kernel/2.6.21/defconfig index 1bf8a6317a..15b4ba5829 100644 --- a/packages/linux/ixp4xx-kernel/2.6.21/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.21/defconfig @@ -1164,7 +1164,6 @@ CONFIG_I2C_IXP4XX=y # CONFIG_I2C_NFORCE2 is not set # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT_LIGHT is not set -# CONFIG_I2C_PASEMI is not set # CONFIG_I2C_PROSAVAGE is not set # CONFIG_I2C_SAVAGE4 is not set # CONFIG_I2C_SIS5595 is not set diff --git a/packages/linux/ixp4xx-kernel_2.6.21.bb b/packages/linux/ixp4xx-kernel_2.6.21.1.bb index 59951942c2..8025465058 100644 --- a/packages/linux/ixp4xx-kernel_2.6.21.bb +++ b/packages/linux/ixp4xx-kernel_2.6.21.1.bb @@ -6,7 +6,7 @@ # http://trac.nslu2-linux.org/kernel/ # # The revision that is pulled from SVN is specified below -IXP4XX_KERNEL_SVN_REV = "839" +IXP4XX_KERNEL_SVN_REV = "847" # # The directory containing the patches to be applied is # specified below diff --git a/packages/clucene/.mtn2git_empty b/packages/nonworking/clucene/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/clucene/.mtn2git_empty +++ b/packages/nonworking/clucene/.mtn2git_empty diff --git a/packages/clucene/clucene-0.8.12-pre/.mtn2git_empty b/packages/nonworking/clucene/clucene-0.8.12-pre/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/clucene/clucene-0.8.12-pre/.mtn2git_empty +++ b/packages/nonworking/clucene/clucene-0.8.12-pre/.mtn2git_empty diff --git a/packages/clucene/clucene-0.8.12-pre/compile-fix.patch b/packages/nonworking/clucene/clucene-0.8.12-pre/compile-fix.patch index 5f6c8f1911..5f6c8f1911 100644 --- a/packages/clucene/clucene-0.8.12-pre/compile-fix.patch +++ b/packages/nonworking/clucene/clucene-0.8.12-pre/compile-fix.patch diff --git a/packages/clucene/clucene_0.8.12-pre.bb b/packages/nonworking/clucene/clucene_0.8.12-pre.bb index 2c8122c921..2c8122c921 100644 --- a/packages/clucene/clucene_0.8.12-pre.bb +++ b/packages/nonworking/clucene/clucene_0.8.12-pre.bb diff --git a/packages/pimlico/tasks.inc b/packages/pimlico/tasks.inc index 9b7c245ad3..797969db62 100644 --- a/packages/pimlico/tasks.inc +++ b/packages/pimlico/tasks.inc @@ -1,6 +1,6 @@ DESCRIPTION = "Task list application" LICENSE = "GPL" SECTION = "x11" -DEPENDS = "glib-2.0 gtk+ eds-dbus" +DEPENDS = "glib-2.0 libsexy gtk+ eds-dbus" inherit autotools pkgconfig gtk-icon-cache diff --git a/packages/pimlico/tasks_0.5.bb b/packages/pimlico/tasks_0.5.bb new file mode 100644 index 0000000000..d3e1b695e9 --- /dev/null +++ b/packages/pimlico/tasks_0.5.bb @@ -0,0 +1,5 @@ +require tasks.inc + +PR = "r0" + +SRC_URI = "http://pimlico-project.org/sources/${PN}/${P}.tar.gz" diff --git a/packages/python/python-pycairo_1.2.2.bb b/packages/python/python-pycairo_1.2.2.bb index 46638d2794..22ba095aa2 100644 --- a/packages/python/python-pycairo_1.2.2.bb +++ b/packages/python/python-pycairo_1.2.2.bb @@ -3,7 +3,7 @@ SECTION = "python-devel" HOMEPAGE = "http://cairographics.org/pycairo" LICENSE = "LGPL MPL" DEPENDS = "cairo" -PR = "ml1" +PR = "ml2" SRC_URI = "http://cairographics.org/releases/pycairo-${PV}.tar.gz \ file://fix-pkgconfig-dir.patch;patch=1" @@ -16,3 +16,5 @@ do_stage() { install -m 0644 cairo/pycairo.h ${STAGING_INCDIR} } + +FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/cairo/.debug" diff --git a/packages/python/python-pygobject_2.12.3.bb b/packages/python/python-pygobject_2.12.3.bb index 04ba363857..d09349575b 100644 --- a/packages/python/python-pygobject_2.12.3.bb +++ b/packages/python/python-pygobject_2.12.3.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Python GObject bindings" SECTION = "devel/python" LICENSE = "LGPL" DEPENDS = "python-pygobject-native" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.12/pygobject-${PV}.tar.bz2 \ file://python-path.patch;patch=1" @@ -20,3 +20,6 @@ do_stage() { install -d ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/ cp docs/style.css ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/ } + +FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/gobject/.debug" + diff --git a/packages/python/python-pygtk2_2.10.3.bb b/packages/python/python-pygtk2_2.10.3.bb index f7366af401..a71765dfbc 100644 --- a/packages/python/python-pygtk2_2.10.3.bb +++ b/packages/python/python-pygtk2_2.10.3.bb @@ -5,7 +5,7 @@ DEPENDS = "gtk+ libglade python-pycairo python-pygobject" RDEPENDS = "python-shell" SRCNAME = "pygtk" LICENSE = "LGPL" -PR = "ml2" +PR = "ml3" SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \ file://fix-gtkunixprint.patch;patch=1 \ @@ -21,6 +21,9 @@ do_configure_prepend() { install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ } +FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/*/.debug" +FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/.debug" + do_stage() { autotools_stage_includes sed -i s:/usr/share:${STAGING_DATADIR}: codegen/pygtk-codegen-2.0 |