diff options
Diffstat (limited to 'meta-gnome/recipes-gnome/metacity')
| -rw-r--r-- | meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch | 11 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/metacity/metacity_3.52.0.bb (renamed from meta-gnome/recipes-gnome/metacity/metacity_3.42.0.bb) | 5 |
2 files changed, 7 insertions, 9 deletions
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 315d4e4366..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,11 +1,11 @@ -From ec0e52b49c9b6869413c9544c2ed44710ab91141 Mon Sep 17 00:00:00 2001 +From d36e65f3e31c882f62d5cfeb7b0e1441d5fdc821 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Sat, 14 Apr 2018 16:15:59 +0800 Subject: [PATCH] drop zenity detection OE does not support zenity -Upstream-Status: inappropriate [OE specific] +Upstream-Status: Inappropriate [OE specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- @@ -13,10 +13,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 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.42.0.bb b/meta-gnome/recipes-gnome/metacity/metacity_3.52.0.bb index 58479cf7b3..32f0801706 100644 --- a/meta-gnome/recipes-gnome/metacity/metacity_3.42.0.bb +++ b/meta-gnome/recipes-gnome/metacity/metacity_3.52.0.bb @@ -1,6 +1,6 @@ SECTION = "x11/wm" SUMMARY = "Metacity is the boring window manager for the adult in you" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b4cce53560b8e619ffa7c830fb8761aa \ file://src/include/main.h;endline=24;md5=72148ede07a6dadd01de6a882d20a9ad" @@ -21,9 +21,10 @@ DEPENDS = " \ # 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] = "d89d679dcfed9b5eef18f06e2dcb33a7ab543d53b358fa89ce65593c231eeebc" +SRC_URI[archive.sha256sum] = "a72438ace6d5903ae79338c6098b1b35ab91c8a97c4323701d3bef1f3eeb191c" SRC_URI += "file://0001-drop-zenity-detection.patch" PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,libxinerama" |