From 50ad5230ea9e0982cdfda23fb9fcfccf89d28f29 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 30 Jan 2012 15:04:45 -0800 Subject: zlib: Upgrade 1.2.5 -> 1.2.6 Dont use autotools, it really not so autoconf like. the configure script gets updated with every release of zlib and we overwrite that. Instead use the upstream provided configure copyright year was changed in zlib.h which caused change in LIC_FILE_CHECKSUM fix.inverted.LFS.logic.patch is already applied upstream so drop it Drop the configure.ac and Makefile.am scripts since we do not autoreconf anymore and do not inherit autotools anymore Bump PR for depending recipes so a rebuild it ensues so that they dont depend on .la anymore and add missing dependencies discovered during incremental build Signed-off-by: Khem Raj --- meta/recipes-sato/eds/eds-dbus_2.20.0.bb | 2 +- meta/recipes-sato/eds/eds-dbus_git.bb | 2 +- meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb | 2 +- meta/recipes-sato/owl-video-widget/libowl-av_git.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'meta/recipes-sato') diff --git a/meta/recipes-sato/eds/eds-dbus_2.20.0.bb b/meta/recipes-sato/eds/eds-dbus_2.20.0.bb index d13476b4e8..067346aa27 100644 --- a/meta/recipes-sato/eds/eds-dbus_2.20.0.bb +++ b/meta/recipes-sato/eds/eds-dbus_2.20.0.bb @@ -6,7 +6,7 @@ LICENSE = "LGPLv2 & LGPLv2+" DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib libsoup libglade" -PR = "r2" +PR = "r3" SRC_URI = "http://ftp.gnome.org/pub/GNOME/mobile/2.23/2.23.92/sources/evolution-data-server-dbus-${PV}.tar.gz \ file://oh-contact.patch;striplevel=0 \ diff --git a/meta/recipes-sato/eds/eds-dbus_git.bb b/meta/recipes-sato/eds/eds-dbus_git.bb index 6a8436c7f9..0405a02c91 100644 --- a/meta/recipes-sato/eds/eds-dbus_git.bb +++ b/meta/recipes-sato/eds/eds-dbus_git.bb @@ -12,7 +12,7 @@ DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libi SRCREV = "7337d11aed576e7caaa12b4e881ad8d33668799f" PV = "2.30+git${SRCPV}" -PR = "r4" +PR = "r5" SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \ file://oh-contact.patch;striplevel=0 \ diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb index 78111f7302..0514164f4f 100644 --- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb +++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb @@ -13,7 +13,7 @@ DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" SRCREV = "cdf7a22716b87468f10573f622d5c7a58a684e35" PV = "0.0+git${SRCPV}" -PR = "r2" +PR = "r3" RPROVIDES_${PN} = "matchbox-panel" RREPLACES_${PN} = "matchbox-panel" diff --git a/meta/recipes-sato/owl-video-widget/libowl-av_git.bb b/meta/recipes-sato/owl-video-widget/libowl-av_git.bb index 176b61ffc5..f1a4f88bb8 100644 --- a/meta/recipes-sato/owl-video-widget/libowl-av_git.bb +++ b/meta/recipes-sato/owl-video-widget/libowl-av_git.bb @@ -14,7 +14,7 @@ RRECOMMENDS_${PN} = "gst-meta-audio gst-meta-video" SRCREV = "1379fd230a32509e94971961183f1031f469737a" PV = "0.1+git${SRCPV}" -PR = "r0" +PR = "r1" SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ -- cgit 1.2.3-korg