summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch9
-rw-r--r--meta-gnome/recipes-gnome/metacity/metacity_3.52.0.bb (renamed from meta-gnome/recipes-gnome/metacity/metacity_3.50.0.bb)2
2 files changed, 4 insertions, 7 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 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 @@
1From ec0e52b49c9b6869413c9544c2ed44710ab91141 Mon Sep 17 00:00:00 2001 1From d36e65f3e31c882f62d5cfeb7b0e1441d5fdc821 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Sat, 14 Apr 2018 16:15:59 +0800 3Date: Sat, 14 Apr 2018 16:15:59 +0800
4Subject: [PATCH] drop zenity detection 4Subject: [PATCH] drop zenity detection
@@ -13,10 +13,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
13 1 file changed, 5 deletions(-) 13 1 file changed, 5 deletions(-)
14 14
15diff --git a/configure.ac b/configure.ac 15diff --git a/configure.ac b/configure.ac
16index 528b7d2..8932ae6 100644 16index bbb4db8..2010d78 100644
17--- a/configure.ac 17--- a/configure.ac
18+++ b/configure.ac 18+++ b/configure.ac
19@@ -337,11 +337,6 @@ fi 19@@ -336,11 +336,6 @@ fi
20 20
21 AM_CONDITIONAL(HAVE_SM, test "$found_sm" = "yes") 21 AM_CONDITIONAL(HAVE_SM, test "$found_sm" = "yes")
22 22
@@ -28,6 +28,3 @@ index 528b7d2..8932ae6 100644
28 AC_SEARCH_LIBS([dlsym], [dl], [], [ 28 AC_SEARCH_LIBS([dlsym], [dl], [], [
29 AC_MSG_ERROR([unable to find the dlsym() function]) 29 AC_MSG_ERROR([unable to find the dlsym() function])
30 ]) 30 ])
31--
322.31.1
33
diff --git a/meta-gnome/recipes-gnome/metacity/metacity_3.50.0.bb b/meta-gnome/recipes-gnome/metacity/metacity_3.52.0.bb
index e6921e6de3..32f0801706 100644
--- a/meta-gnome/recipes-gnome/metacity/metacity_3.50.0.bb
+++ b/meta-gnome/recipes-gnome/metacity/metacity_3.52.0.bb
@@ -24,7 +24,7 @@ REQUIRED_DISTRO_FEATURES = "x11"
24GNOMEBASEBUILDCLASS = "autotools" 24GNOMEBASEBUILDCLASS = "autotools"
25inherit gnomebase gsettings gettext upstream-version-is-even features_check 25inherit gnomebase gsettings gettext upstream-version-is-even features_check
26 26
27SRC_URI[archive.sha256sum] = "18e9b106438d46394e4148bcb83acc6367312be54559cdb564e270c1ccaeb60f" 27SRC_URI[archive.sha256sum] = "a72438ace6d5903ae79338c6098b1b35ab91c8a97c4323701d3bef1f3eeb191c"
28SRC_URI += "file://0001-drop-zenity-detection.patch" 28SRC_URI += "file://0001-drop-zenity-detection.patch"
29 29
30PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,libxinerama" 30PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,libxinerama"