diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-01-30 15:04:45 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-10 14:38:44 +0000 |
commit | a142cbd47eb78b4ea63459286d97ab5e769c7bdc (patch) | |
tree | ea9296d1fccd617a7257258064aaf5b89c4f9c55 /meta/recipes-gnome/gnome | |
parent | 65d296a235a7d2f2689c530c91557ed6263afc01 (diff) | |
download | poky-a142cbd47eb78b4ea63459286d97ab5e769c7bdc.tar.gz |
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
(From OE-Core rev: 50ad5230ea9e0982cdfda23fb9fcfccf89d28f29)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gnome')
-rw-r--r-- | meta/recipes-gnome/gnome/gconf_3.2.3.bb | 2 | ||||
-rw-r--r-- | meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.3.bb index a0b8d0c632..a12cb9b639 100644 --- a/meta/recipes-gnome/gnome/gconf_3.2.3.bb +++ b/meta/recipes-gnome/gnome/gconf_3.2.3.bb | |||
@@ -9,7 +9,7 @@ POLKIT_libc-uclibc = "" | |||
9 | DEPENDS = "glib-2.0 gtk+ dbus dbus-glib libxml2 intltool-native ${POLKIT}" | 9 | DEPENDS = "glib-2.0 gtk+ dbus dbus-glib libxml2 intltool-native ${POLKIT}" |
10 | DEPENDS_virtclass-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native" | 10 | DEPENDS_virtclass-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native" |
11 | 11 | ||
12 | PR = "r6" | 12 | PR = "r7" |
13 | 13 | ||
14 | inherit gnomebase | 14 | inherit gnomebase |
15 | 15 | ||
diff --git a/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb b/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb index c40044ff97..8fb7c7a2b1 100644 --- a/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb +++ b/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb | |||
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | |||
11 | 11 | ||
12 | SECTION = "x11/gnome" | 12 | SECTION = "x11/gnome" |
13 | 13 | ||
14 | PR = "r4" | 14 | PR = "r5" |
15 | 15 | ||
16 | inherit autotools gnome pkgconfig | 16 | inherit autotools gnome pkgconfig |
17 | 17 | ||