From 796db55dc7cf57faf85d4c8243da73c1278fb2cb Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 1 Apr 2024 22:50:42 +0800 Subject: metacity: upgrade 3.50.0 -> 3.52.0 0001-drop-zenity-detection.patch refreshed for 3.53.0 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../metacity/0001-drop-zenity-detection.patch | 9 ++--- .../recipes-gnome/metacity/metacity_3.50.0.bb | 40 ---------------------- .../recipes-gnome/metacity/metacity_3.52.0.bb | 40 ++++++++++++++++++++++ 3 files changed, 43 insertions(+), 46 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/metacity/metacity_3.50.0.bb create mode 100644 meta-gnome/recipes-gnome/metacity/metacity_3.52.0.bb 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 6bebaaba8f..cd46824c39 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 @@ -1,4 +1,4 @@ -From ec0e52b49c9b6869413c9544c2ed44710ab91141 Mon Sep 17 00:00:00 2001 +From d36e65f3e31c882f62d5cfeb7b0e1441d5fdc821 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Sat, 14 Apr 2018 16:15:59 +0800 Subject: [PATCH] drop zenity detection @@ -13,10 +13,10 @@ Signed-off-by: Hongxu Jia 1 file changed, 5 deletions(-) diff --git a/configure.ac b/configure.ac -index 528b7d2..8932ae6 100644 +index bbb4db8..2010d78 100644 --- a/configure.ac +++ b/configure.ac -@@ -337,11 +337,6 @@ fi +@@ -336,11 +336,6 @@ fi AM_CONDITIONAL(HAVE_SM, test "$found_sm" = "yes") @@ -28,6 +28,3 @@ index 528b7d2..8932ae6 100644 AC_SEARCH_LIBS([dlsym], [dl], [], [ AC_MSG_ERROR([unable to find the dlsym() function]) ]) --- -2.31.1 - diff --git a/meta-gnome/recipes-gnome/metacity/metacity_3.50.0.bb b/meta-gnome/recipes-gnome/metacity/metacity_3.50.0.bb deleted file mode 100644 index e6921e6de3..0000000000 --- a/meta-gnome/recipes-gnome/metacity/metacity_3.50.0.bb +++ /dev/null @@ -1,40 +0,0 @@ -SECTION = "x11/wm" -SUMMARY = "Metacity is the boring window manager for the adult in you" -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=b4cce53560b8e619ffa7c830fb8761aa \ - file://src/include/main.h;endline=24;md5=72148ede07a6dadd01de6a882d20a9ad" - -PE = "1" - -DEPENDS = " \ - gdk-pixbuf-native \ - gtk+3 \ - gsettings-desktop-schemas \ - startup-notification \ - libcanberra \ - libgtop \ - libxres \ - libxpresent \ -" - - -# depends on startup-notification which depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -GNOMEBASEBUILDCLASS = "autotools" -inherit gnomebase gsettings gettext upstream-version-is-even features_check - -SRC_URI[archive.sha256sum] = "18e9b106438d46394e4148bcb83acc6367312be54559cdb564e270c1ccaeb60f" -SRC_URI += "file://0001-drop-zenity-detection.patch" - -PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,libxinerama" -# enable as neccessary until new warnings are dealt with -PACKAGECONFIG[werror] = "--enable-Werror,--disable-Werror,," - -FILES:${PN} += " \ - ${datadir}/themes \ - ${datadir}/gnome-control-center \ - ${datadir}/gnome\ -" - -RDEPENDS:${PN} += "gsettings-desktop-schemas" diff --git a/meta-gnome/recipes-gnome/metacity/metacity_3.52.0.bb b/meta-gnome/recipes-gnome/metacity/metacity_3.52.0.bb new file mode 100644 index 0000000000..32f0801706 --- /dev/null +++ b/meta-gnome/recipes-gnome/metacity/metacity_3.52.0.bb @@ -0,0 +1,40 @@ +SECTION = "x11/wm" +SUMMARY = "Metacity is the boring window manager for the adult in you" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b4cce53560b8e619ffa7c830fb8761aa \ + file://src/include/main.h;endline=24;md5=72148ede07a6dadd01de6a882d20a9ad" + +PE = "1" + +DEPENDS = " \ + gdk-pixbuf-native \ + gtk+3 \ + gsettings-desktop-schemas \ + startup-notification \ + libcanberra \ + libgtop \ + libxres \ + libxpresent \ +" + + +# depends on startup-notification which depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +GNOMEBASEBUILDCLASS = "autotools" +inherit gnomebase gsettings gettext upstream-version-is-even features_check + +SRC_URI[archive.sha256sum] = "a72438ace6d5903ae79338c6098b1b35ab91c8a97c4323701d3bef1f3eeb191c" +SRC_URI += "file://0001-drop-zenity-detection.patch" + +PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,libxinerama" +# enable as neccessary until new warnings are dealt with +PACKAGECONFIG[werror] = "--enable-Werror,--disable-Werror,," + +FILES:${PN} += " \ + ${datadir}/themes \ + ${datadir}/gnome-control-center \ + ${datadir}/gnome\ +" + +RDEPENDS:${PN} += "gsettings-desktop-schemas" -- cgit v1.2.3-54-g00ecf