From b969536a696bd8b49ac3911206f9523baaf1b77b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Fri, 31 Dec 2021 18:30:01 +0100 Subject: [PATCH] metacity: upgrade 3.40.0 -> 3.42.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit refresh/remove patch Version 3.42.0 ============== - Enable XPresent compositor. (#13) - Fix regression in opacity handling. (#19) - Fix tooltip style. (#25) - Updated translations. Signed-off-by: Andreas Müller Signed-off-by: Khem Raj --- .../metacity/0001-drop-zenity-detection.patch | 12 ++-- ...ild-with-disable-dependency-tracking.patch | 65 ------------------- ...{metacity_3.40.0.bb => metacity_3.42.0.bb} | 7 +- 3 files changed, 8 insertions(+), 76 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/metacity/metacity/0001-fix-build-with-disable-dependency-tracking.patch rename meta-gnome/recipes-gnome/metacity/{metacity_3.40.0.bb => metacity_3.42.0.bb} (81%) diff --git a/meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch b/meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch index 3493e511be9..315d4e4366d 100644 --- a/meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch +++ b/meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch @@ -13,10 +13,10 @@ Signed-off-by: Hongxu Jia 1 file changed, 5 deletions(-) diff --git a/configure.ac b/configure.ac -index 5f9e7e9..80b32c7 100644 +index 528b7d2..8932ae6 100644 --- a/configure.ac +++ b/configure.ac -@@ -359,11 +359,6 @@ fi +@@ -337,11 +337,6 @@ fi AM_CONDITIONAL(HAVE_SM, test "$found_sm" = "yes") @@ -25,9 +25,9 @@ index 5f9e7e9..80b32c7 100644 - AC_MSG_ERROR([zenity not found in your path - needed for dialogs]) -fi - - dnl ************************************************************************** - dnl Check for Vulkan support - dnl ************************************************************************** + AC_SEARCH_LIBS([dlsym], [dl], [], [ + AC_MSG_ERROR([unable to find the dlsym() function]) + ]) -- -1.8.3.1 +2.31.1 diff --git a/meta-gnome/recipes-gnome/metacity/metacity/0001-fix-build-with-disable-dependency-tracking.patch b/meta-gnome/recipes-gnome/metacity/metacity/0001-fix-build-with-disable-dependency-tracking.patch deleted file mode 100644 index 864d0baa2a8..00000000000 --- a/meta-gnome/recipes-gnome/metacity/metacity/0001-fix-build-with-disable-dependency-tracking.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 632670273cc880917e78a152a3ae39e209b57864 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?= - -Date: Sat, 28 Aug 2021 05:58:25 +0200 -Subject: [PATCH] fix build with --disable-dependency-tracking -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -With split build and source directories AND --disable-dependency-tracking -(like the way Yocto builds are done) there's a reproducible make -failure on my Fedora 33 build host: - -| Making all in src -| make[2]: Entering directory '.../metacity/1_3.40.0-r0/build/src' -| .../metacity/1_3.40.0-r0/recipe-sysroot-native/usr/bin/glib-mkenums --template ../../metacity-3.40.0/src/core/meta-enum-types.c.in ../../metacity-3.40.0/src/core/window-private.h ../../metacity-3.40.0/src/include/meta-compositor.h > \ -| meta-enum-types.c.tmp && mv meta-enum-types.c.tmp core/meta-enum-types.c -| .../metacity/1_3.40.0-r0/recipe-sysroot-native/usr/bin/glib-mkenums --template ../../metacity-3.40.0/src/core/meta-enum-types.h.in ../../metacity-3.40.0/src/core/window-private.h ../../metacity-3.40.0/src/include/meta-compositor.h > \ -| meta-enum-types.h.tmp && mv meta-enum-types.h.tmp core/meta-enum-types.h -| mv: cannot move 'meta-enum-types.c.tmp' to 'core/meta-enum-types.c'mv: cannot move 'meta-enum-types.h.tmp' to 'core/meta-enum-types.h': No such file or directory -| : No such file or directory -| make[2]: *** [Makefile:2240: core/meta-enum-types.c] Error 1 - -https://gitlab.gnome.org/GNOME/metacity/-/merge_requests/24 - -Upstream-Status: Pending - -Signed-off-by: Zoltán Böszörményi ---- - configure.ac | 1 + - src/Makefile.am | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/configure.ac b/configure.ac -index ebb00b85..04aafb94 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -139,6 +139,7 @@ dnl ************************************************************************** - AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}") - - AC_PROG_CC -+AC_PROG_MKDIR_P - AC_ISC_POSIX - AC_HEADER_STDC - -diff --git a/src/Makefile.am b/src/Makefile.am -index f86af600..4aa3fdae 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -204,10 +204,12 @@ ENUM_TYPES = \ - $(NULL) - - core/meta-enum-types.c: core/meta-enum-types.c.in $(ENUM_TYPES) Makefile.am -+ $(MKDIR_P) core - $(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/core/meta-enum-types.c.in $(ENUM_TYPES) > \ - meta-enum-types.c.tmp && mv meta-enum-types.c.tmp core/meta-enum-types.c - - core/meta-enum-types.h: core/meta-enum-types.h.in $(ENUM_TYPES) Makefile.am -+ $(MKDIR_P) core - $(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/core/meta-enum-types.h.in $(ENUM_TYPES) > \ - meta-enum-types.h.tmp && mv meta-enum-types.h.tmp core/meta-enum-types.h - --- -2.31.1 - diff --git a/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb b/meta-gnome/recipes-gnome/metacity/metacity_3.42.0.bb similarity index 81% rename from meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb rename to meta-gnome/recipes-gnome/metacity/metacity_3.42.0.bb index e7570ec5970..58479cf7b3c 100644 --- a/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb +++ b/meta-gnome/recipes-gnome/metacity/metacity_3.42.0.bb @@ -23,11 +23,8 @@ REQUIRED_DISTRO_FEATURES = "x11" inherit gnomebase gsettings gettext upstream-version-is-even features_check -SRC_URI[archive.sha256sum] = "224c1f65487eac21f0c1d9856152343768ee726c48b1a8a2835a46a8ad9015b5" -SRC_URI += " \ - file://0001-drop-zenity-detection.patch \ - file://0001-fix-build-with-disable-dependency-tracking.patch \ -" +SRC_URI[archive.sha256sum] = "d89d679dcfed9b5eef18f06e2dcb33a7ab543d53b358fa89ce65593c231eeebc" +SRC_URI += "file://0001-drop-zenity-detection.patch" PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,libxinerama" # enable as neccessary until new warnings are dealt with