Version updates & misc patch cleanup
cover Version updates & misc patch cleanup
Mainly updates to newer upstream versions, with some no longer needed patches dropped.
It took me a while to create a pull request. Apparently git request-pull has changed significantly recently, and scripts/create-pull-request has not been updated accordingly.
- ML
The following changes since commit e72aac2ae9e5fce1715fa04b7e94034fd06892d9:
alsa-lib: libasound should runtime depends on alsa-conf (2014-09-03 11:30:11 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib 1d09577ffa2838c6465f034555db36dd8fc3476a
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=cazfi/up
Marko Lindqvist (6):
gtk+2: update to 2.24.24
libpng: drop unnecessary automake requirement lowering patch
libpng: update to 1.6.13
pixman: update to 0.32.6
pango: update to 1.36.6
gtk+3: update to 3.12.2
...utton-do-not-prelight-in-touchscreen-mode.patch | 0
...Duplicate-the-exec-string-returned-by-gtk.patch | 0
.../cellrenderer-cairo.patch | 0
.../configure-nm.patch | 0
.../configurefix.patch | 0
.../{gtk+-2.24.22 => gtk+-2.24.24}/doc-fixes.patch | 0
.../entry-cairo.patch | 0
.../hardcoded_libtool.patch | 0
.../run-iconcache.patch | 11 +++---
.../toggle-font.diff | 0
.../{gtk+-2.24.22 => gtk+-2.24.24}/xsettings.patch | 0
meta/recipes-gnome/gtk+/gtk+3.inc | 6 ++-
.../fix-build-when-wayland-backend-enabled.patch | 43 ----------------------
.../gtk+/{gtk+3_3.10.7.bb => gtk+3_3.12.2.bb} | 5 +--
.../gtk+/{gtk+_2.24.22.bb => gtk+_2.24.24.bb} | 4 +-
.../pango/{pango_1.36.5.bb => pango_1.36.6.bb} | 4 +-
.../{pixman_0.32.4.bb => pixman_0.32.6.bb} | 4 +-
...0001-configure-lower-automake-requirement.patch | 31 ----------------
.../libpng/{libpng_1.6.10.bb => libpng_1.6.13.bb} | 11 +++---
19 files changed, 24 insertions(+), 95 deletions(-)
rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/cellrenderer-cairo.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/configure-nm.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/configurefix.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/doc-fixes.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/entry-cairo.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/hardcoded_libtool.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/run-iconcache.patch (72%)
rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/toggle-font.diff (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/xsettings.patch (100%)
delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/fix-build-when-wayland-backend-enabled.patch
rename meta/recipes-gnome/gtk+/{gtk+3_3.10.7.bb => gtk+3_3.12.2.bb} (75%)
rename meta/recipes-gnome/gtk+/{gtk+_2.24.22.bb => gtk+_2.24.24.bb} (93%)
rename meta/recipes-graphics/pango/{pango_1.36.5.bb => pango_1.36.6.bb} (56%)
rename meta/recipes-graphics/xorg-lib/{pixman_0.32.4.bb => pixman_0.32.6.bb} (89%)
delete mode 100644 meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch
rename meta/recipes-multimedia/libpng/{libpng_1.6.10.bb => libpng_1.6.13.bb} (58%)Signature · 1 line
2.1.0
PATCH 1/6 gtk+2: update to 2.24.24
---
.../0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch | 0
...bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch | 0
.../{gtk+-2.24.22 => gtk+-2.24.24}/cellrenderer-cairo.patch | 0
.../gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/configure-nm.patch | 0
.../gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/configurefix.patch | 0
.../gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/doc-fixes.patch | 0
.../gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/entry-cairo.patch | 0
.../{gtk+-2.24.22 => gtk+-2.24.24}/hardcoded_libtool.patch | 0
.../gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/run-iconcache.patch | 11 ++++++-----
.../gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/toggle-font.diff | 0
.../gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/xsettings.patch | 0
meta/recipes-gnome/gtk+/{gtk+_2.24.22.bb => gtk+_2.24.24.bb} | 4 ++--
12 files changed, 8 insertions(+), 7 deletions(-)
rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/cellrenderer-cairo.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/configure-nm.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/configurefix.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/doc-fixes.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/entry-cairo.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/hardcoded_libtool.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/run-iconcache.patch (72%)
rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/toggle-font.diff (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/xsettings.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+_2.24.22.bb => gtk+_2.24.24.bb} (93%)meta/recipes-gnome/gtk+/gtk+-2.24.24/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch renamed from meta/recipes-gnome/gtk+/gtk+-2.24.22/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch +0 -0
meta/recipes-gnome/gtk+/gtk+-2.24.24/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch renamed from meta/recipes-gnome/gtk+/gtk+-2.24.22/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch +0 -0
meta/recipes-gnome/gtk+/gtk+-2.24.24/cellrenderer-cairo.patch renamed from meta/recipes-gnome/gtk+/gtk+-2.24.22/cellrenderer-cairo.patch +0 -0
meta/recipes-gnome/gtk+/gtk+-2.24.24/configure-nm.patch renamed from meta/recipes-gnome/gtk+/gtk+-2.24.22/configure-nm.patch +0 -0
meta/recipes-gnome/gtk+/gtk+-2.24.24/configurefix.patch renamed from meta/recipes-gnome/gtk+/gtk+-2.24.22/configurefix.patch +0 -0
meta/recipes-gnome/gtk+/gtk+-2.24.24/doc-fixes.patch renamed from meta/recipes-gnome/gtk+/gtk+-2.24.22/doc-fixes.patch +0 -0
meta/recipes-gnome/gtk+/gtk+-2.24.24/entry-cairo.patch renamed from meta/recipes-gnome/gtk+/gtk+-2.24.22/entry-cairo.patch +0 -0
meta/recipes-gnome/gtk+/gtk+-2.24.24/hardcoded_libtool.patch renamed from meta/recipes-gnome/gtk+/gtk+-2.24.22/hardcoded_libtool.patch +0 -0
meta/recipes-gnome/gtk+/gtk+-2.24.24/run-iconcache.patch renamed from meta/recipes-gnome/gtk+/gtk+-2.24.22/run-iconcache.patch +6 -5
@@ -1,21 +1,22 @@ Upstream-Status: Inappropriate [configuration] -Index: gtk+-2.21.2/gtk/Makefile.am -=================================================================== ---- gtk+-2.21.2.orig/gtk/Makefile.am 2010-06-22 17:21:41.000000000 +0800 -+++ gtk+-2.21.2/gtk/Makefile.am 2010-06-22 17:28:12.000000000 +0800 -@@ -1376,11 +1376,11 @@ +diff -Nurd gtk+-2.24.24/gtk/Makefile.am gtk+-2.24.24/gtk/Makefile.am +--- gtk+-2.24.24/gtk/Makefile.am 2014-06-23 18:08:14.000000000 +0300 ++++ gtk+-2.24.24/gtk/Makefile.am 2014-09-03 23:45:12.669307700 +0300 +@@ -1391,12 +1391,12 @@ ./gtk-update-icon-cache endif -gtkbuiltincache.h: @REBUILD@ stamp-icons - $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST) - $(gtk_update_icon_cache_program) --force --ignore-theme-index \ +- --include-image-data \ - --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ - mv gtkbuiltincache.h.tmp gtkbuiltincache.h +#gtkbuiltincache.h: @REBUILD@ stamp-icons +# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST) +# $(gtk_update_icon_cache_program) --force --ignore-theme-index \ ++# --include-image-data \ +# --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ +# mv gtkbuiltincache.h.tmp gtkbuiltincache.h
meta/recipes-gnome/gtk+/gtk+-2.24.24/toggle-font.diff renamed from meta/recipes-gnome/gtk+/gtk+-2.24.22/toggle-font.diff +0 -0
meta/recipes-gnome/gtk+/gtk+-2.24.24/xsettings.patch renamed from meta/recipes-gnome/gtk+/gtk+-2.24.22/xsettings.patch +0 -0
meta/recipes-gnome/gtk+/gtk+_2.24.24.bb renamed from meta/recipes-gnome/gtk+/gtk+_2.24.22.bb +2 -2
@@ -28,8 +28,8 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \ # file://combo-arrow-size.patch;striplevel=0 # file://configurefix.patch -SRC_URI[md5sum] = "5fbbfb7637bbd571a572a2dae0e736d2" -SRC_URI[sha256sum] = "b114b6e9fb389bf3aa8a6d09576538f58dce740779653084046852fb4140ae7f" +SRC_URI[md5sum] = "f80ac8aa95ea8482ad89656d0370752e" +SRC_URI[sha256sum] = "12ceb2e198c82bfb93eb36348b6e9293c8fdcd60786763d04cfec7ebe7ed3d6d" EXTRA_OECONF = "--enable-xkb --disable-glibtest --disable-cups --disable-xinerama"
Signature · 1 line
2.1.0
PATCH 2/6 libpng: drop unnecessary automake requirement lowering patch
Automake recipe provides automake 1.14.1 anyway
--- ...0001-configure-lower-automake-requirement.patch | 31 ---------------------- meta/recipes-multimedia/libpng/libpng_1.6.10.bb | 1 - 2 files changed, 32 deletions(-) delete mode 100644 meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch
meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch deleted +0 -31
@@ -1,31 +0,0 @@ -From fff7cbc01e061a235852f385866fe75fb17867e3 Mon Sep 17 00:00:00 2001 -From: Valentin Popa <[email protected]> -Date: Tue, 26 Nov 2013 12:06:55 +0200 -Subject: [PATCH] configure: lower automake requirement - -We're not using parallel tests in OE-core yet - -Signed-off-by: Valentin Popa <[email protected]> -Signed-off-by: Koen Kooi <[email protected]> - -Upstream-Status: Inapropriate [OE specific build hack] ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 28200c3..fab2515 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -27,7 +27,7 @@ AC_CONFIG_MACRO_DIR([scripts]) - # dist-xz requires automake 1.11 or later - # 1.12.2 fixes a security issue in 1.11.2 and 1.12.1 - # 1.13 is required for parallel tests --AM_INIT_AUTOMAKE([1.13 foreign dist-xz color-tests silent-rules subdir-objects]) -+AM_INIT_AUTOMAKE([1.12.2 foreign dist-xz color-tests silent-rules subdir-objects]) - # The following line causes --disable-maintainer-mode to be the default to - # configure, this is necessary because libpng distributions cannot rely on the - # time stamps of the autotools generated files being correct --- -1.8.3.2 -
meta/recipes-multimedia/libpng/libpng_1.6.10.bb +0 -1
@@ -9,7 +9,6 @@ DEPENDS = "zlib" LIBV = "16" SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz \ - file://0001-configure-lower-automake-requirement.patch \ " SRC_URI[md5sum] = "5f414b20f683b1d96b163c89e3eff768"
Signature · 1 line
2.1.0
PATCH 3/6 libpng: update to 1.6.13
In reply to Marko LindqvistLicense terms have not changed. In case of LICENSE and png.h lines 0-15 the version numbers and release dates have changed. In case of png.h lines 229-343 the text has not changed at all, but old line numbers were not pointing to correctly to the licensing terms segment.
---
.../libpng/{libpng_1.6.10.bb => libpng_1.6.13.bb} | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
rename meta/recipes-multimedia/libpng/{libpng_1.6.10.bb => libpng_1.6.13.bb} (62%)meta/recipes-multimedia/libpng/libpng_1.6.13.bb renamed from meta/recipes-multimedia/libpng/libpng_1.6.10.bb +5 -5
@@ -2,17 +2,17 @@ SUMMARY = "PNG image format decoding library" HOMEPAGE = "http://www.libpng.org/" SECTION = "libs" LICENSE = "Libpng" -LIC_FILES_CHKSUM = "file://LICENSE;md5=cb7a834ba2891bc30b8577e49963a435 \ - file://png.h;endline=15;md5=853b11c4a19ec66decd641efd756bc2c \ - file://png.h;beginline=209;endline=323;md5=cface34a7db6b71eaa828fe934951f81" +LIC_FILES_CHKSUM = "file://LICENSE;md5=46401ee4b225b9ec066cb96cf1025c0f \ + file://png.h;endline=15;md5=8167a17735fc618d1df109f8b0f839a6 \ + file://png.h;beginline=229;endline=343;md5=5cdf8564a14e2f00339e4437a83b4913" DEPENDS = "zlib" LIBV = "16" SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz \ " -SRC_URI[md5sum] = "5f414b20f683b1d96b163c89e3eff768" -SRC_URI[sha256sum] = "4003f0fd0e36110a2b742fc5b9e1ab93ed7a7ab57ae8dc65f0e8101458775a56" +SRC_URI[md5sum] = "9822c25466f060142359f80ed142c9e5" +SRC_URI[sha256sum] = "d9c8ce54a5fc8052ed794ca65b553384a74c0608b09ae163cbbb07176018e625" BINCONFIG = "${bindir}/libpng-config ${bindir}/libpng16-config"
Signature · 1 line
2.1.0
PATCH 4/6 pixman: update to 0.32.6
In reply to Marko Lindqvist---
meta/recipes-graphics/xorg-lib/{pixman_0.32.4.bb => pixman_0.32.6.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-lib/{pixman_0.32.4.bb => pixman_0.32.6.bb} (89%)meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb renamed from meta/recipes-graphics/xorg-lib/pixman_0.32.4.bb +2 -2
@@ -31,7 +31,7 @@ SRC_URI += "\ file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \ " -SRC_URI[md5sum] = "cdb566504fe9daf6728c7b03cc7ea228" -SRC_URI[sha256sum] = "ae2bd664057e330d41b40336ed296d3512318ce7f2401cc42601f2613d371e4c" +SRC_URI[md5sum] = "8a9e8f14743a39cf303803f369c1f344" +SRC_URI[sha256sum] = "201fc0d7d6bc0017496f2bd27b3ca14224aea0df6b624c5ee2dc0307a4ff14a4" REQUIRED_DISTRO_FEATURES = ""
Signature · 1 line
2.1.0
PATCH 5/6 pango: update to 1.36.6
In reply to Marko Lindqvist---
meta/recipes-graphics/pango/{pango_1.36.5.bb => pango_1.36.6.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/pango/{pango_1.36.5.bb => pango_1.36.6.bb} (56%)meta/recipes-graphics/pango/pango_1.36.6.bb renamed from meta/recipes-graphics/pango/pango_1.36.5.bb +2 -2
@@ -8,5 +8,5 @@ SRC_URI += "file://run-ptest \ file://multilib-fix-clean.patch \ " -SRC_URI[archive.md5sum] = "2500930093c3ed38acb40e4255bce2f1" -SRC_URI[archive.sha256sum] = "be0e94b2e5c7459f0b6db21efab6253556c8f443837200b8736d697071276ac8" +SRC_URI[archive.md5sum] = "1c27523c3f3a4efe4d9d303d0d240320" +SRC_URI[archive.sha256sum] = "4c53c752823723875078b91340f32136aadb99e91c0f6483f024f978a02c8624"
Signature · 1 line
2.1.0
PATCH 6/6 gtk+3: update to 3.12.2
In reply to Marko Lindqvistfix-build-when-wayland-backend-enabled.patch removed as the issue is fixed in upstream.
---
meta/recipes-gnome/gtk+/gtk+3.inc | 6 ++-
.../fix-build-when-wayland-backend-enabled.patch | 43 ----------------------
.../gtk+/{gtk+3_3.10.7.bb => gtk+3_3.12.2.bb} | 5 +--
3 files changed, 7 insertions(+), 47 deletions(-)
delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/fix-build-when-wayland-backend-enabled.patch
rename meta/recipes-gnome/gtk+/{gtk+3_3.10.7.bb => gtk+3_3.12.2.bb} (75%)meta/recipes-gnome/gtk+/gtk+3.inc +5 -1
@@ -49,7 +49,11 @@ LIBV = "3.0.0" FILES_${PN}-demo = "${bindir}/gtk3-demo \ ${bindir}/gtk3-demo-application \ ${bindir}/gtk3-widget-factory \ - ${datadir}/gtk-3.0/demo" + ${datadir}/gtk-3.0/demo \ + ${datadir}/applications/gtk3-demo.desktop \ + ${datadir}/applications/gtk3-widget-factory.desktop \ + ${datadir}/icons/hicolor/*/apps/gtk3-demo.png \ + ${datadir}/icons/hicolor/*/apps/gtk3-widget-factory.png" # The demo uses PNG files and mime type sniffing, so ensure that these # dependencies are present.
meta/recipes-gnome/gtk+/gtk+3/fix-build-when-wayland-backend-enabled.patch deleted +0 -43
43 lines not on this page · raw message
meta/recipes-gnome/gtk+/gtk+3_3.12.2.bb renamed from meta/recipes-gnome/gtk+/gtk+3_3.10.7.bb +2 -3
@@ -4,12 +4,11 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ file://hardcoded_libtool.patch \ - file://fix-build-when-wayland-backend-enabled.patch \ file://fix-flags-for-native.patch \ " -SRC_URI[md5sum] = "18a81944a8506231529a76bf2b68372b" -SRC_URI[sha256sum] = "b7e9de15385031cff43897e7e59f6692eaabf500f36eef80e6b9d6486ad49427" +SRC_URI[md5sum] = "0d6d8f9f79132b3b47475d047b369b1c" +SRC_URI[sha256sum] = "61d74eea74231b1ea4b53084a9d6fc9917ab0e1d71b69d92cbf60a4b4fb385d0" S = "${WORKDIR}/gtk+-${PV}"
Signature · 1 line
2.1.0
Re: [PATCH 4/6] pixman: update to 0.32.6
In reply to Marko LindqvistQuoted 1 line · Marko Lindqvist
meta/recipes-graphics/xorg-lib/{pixman_0.32.4.bb => pixman_0.32.6.bb} | 4 ++--Before we get another submission for this patch, it's stalling as it fails to build on qemumips.
Ross