From 5d4d462df035164733b06c4763765c9324d939d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 16 May 2021 01:38:47 +0200 Subject: [PATCH] gimp: upgrade 2.10.22 -> 2.10.24 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backported patch can go Signed-off-by: Andreas Müller Signed-off-by: Khem Raj --- ...-with-linux-input-handling-with-upco.patch | 58 ------------------- .../gimp/{gimp_2.10.22.bb => gimp_2.10.24.bb} | 6 +- 2 files changed, 2 insertions(+), 62 deletions(-) delete mode 100644 meta-gnome/recipes-gimp/gimp/gimp/0001-configure.ac-fix-with-linux-input-handling-with-upco.patch rename meta-gnome/recipes-gimp/gimp/{gimp_2.10.22.bb => gimp_2.10.24.bb} (90%) diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-configure.ac-fix-with-linux-input-handling-with-upco.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-configure.ac-fix-with-linux-input-handling-with-upco.patch deleted file mode 100644 index 7e12487c7b..0000000000 --- a/meta-gnome/recipes-gimp/gimp/gimp/0001-configure.ac-fix-with-linux-input-handling-with-upco.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 1b66e4cca6d95f4607599bcbdd4afeb601aee84e Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Sun, 25 Oct 2020 18:09:21 +0000 -Subject: [PATCH] configure.ac: fix `--with-linux-input` handling with upcoming autoconf-2.70 - -Upcoming autoconf-2.70 exposes deficiency in configure.ac: - -``` -$ autoconf-2.70_beta2 && ./configure --host=x86_64-pc-linux-gnu -./configure: line 1430: 5: Bad file descriptor -checking whether is declared... ./configure: line 1432: ${+y}: bad -``` - -It happens because macros are called with parameters using insufficient quoting. - -More details at https://lists.gnu.org/archive/html/bug-autoconf/2020-10/msg00027.html - -The fix only amends `--with-linux-input`. Other cases of underquoting -will need to be handled separately. - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gimp/-/commit/cebeb90a87105cd6e35bcb357d53cc04c828ca21] -Fix-by: Zack Weinberg -Signed-off-by: Sergei Trofimovich ---- - configure.ac | 17 ++++++++--------- - 1 file changed, 8 insertions(+), 9 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6e2c193..afbcdd8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2138,15 +2138,14 @@ fi - AC_ARG_WITH(linux-input, [ --without-linux-input don't build linux input event controller module]) - - have_linux_input="no (linux input support disabled)" --if test "x$with_linux_input" != "xno"; then -- AC_CHECK_HEADER(linux/input.h, -- AC_CHECK_DECL(KEY_OK, -- have_linux_input=yes, -- have_linux_input="no (needs Linux 2.6)", -- [#include ])) --fi -- --AM_CONDITIONAL(HAVE_LINUX_INPUT, test "x$have_linux_input" = xyes) -+AS_IF([test "x$with_linux_input" != "xno"], -+ [AC_CHECK_HEADER([linux/input.h], -+ [AC_CHECK_DECL([KEY_OK], -+ [have_linux_input=yes], -+ [have_linux_input="no (needs Linux 2.6)"], -+ [#include ])])]) -+ -+AM_CONDITIONAL([HAVE_LINUX_INPUT], [test "x$have_linux_input" = xyes]) - - - ############################### --- -2.30.0 - diff --git a/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb b/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb similarity index 90% rename from meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb rename to meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb index 717716e1f9..237d08a093 100644 --- a/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb +++ b/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb @@ -43,10 +43,8 @@ REQUIRED_DISTRO_FEATURES = "x11" SHPV = "${@gnome_verdir("${PV}")}" -SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2 \ - file://0001-configure.ac-fix-with-linux-input-handling-with-upco.patch \ - " -SRC_URI[sha256sum] = "2db84b57f3778d80b3466d7c21a21d22e315c7b062de2883cbaaeda9a0f618bb" +SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2" +SRC_URI[sha256sum] = "bd1bb762368c0dd3175cf05006812dd676949c3707e21f4e6857435cb435989e" EXTRA_OECONF = "--disable-python \ --without-webkit \