diff options
Diffstat (limited to 'import-layers/meta-openembedded/meta-gnome/recipes-gnome/metacity')
5 files changed, 67 insertions, 90 deletions
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch new file mode 100644 index 000000000..3493e511b --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch @@ -0,0 +1,33 @@ +From ec0e52b49c9b6869413c9544c2ed44710ab91141 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] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.ac | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5f9e7e9..80b32c7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -359,11 +359,6 @@ fi + + AM_CONDITIONAL(HAVE_SM, test "$found_sm" = "yes") + +-AC_PATH_PROG(ZENITY, zenity, no) +-if test x"$ZENITY" = xno; then +- AC_MSG_ERROR([zenity not found in your path - needed for dialogs]) +-fi +- + dnl ************************************************************************** + dnl Check for Vulkan support + dnl ************************************************************************** +-- +1.8.3.1 + diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity/0001-ui-Define-_GNU_SOURCE.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity/0001-ui-Define-_GNU_SOURCE.patch deleted file mode 100644 index 539d756b3..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity/0001-ui-Define-_GNU_SOURCE.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e7fd072f0df968f342878b77098e97ff07ed28d7 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 14 Jul 2017 10:26:31 -0700 -Subject: [PATCH] ui: Define _GNU_SOURCE - -it becomes portable across musl and glibc - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/ui/theme.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/ui/theme.c b/src/ui/theme.c -index 84b57a0..c7eafc8 100644 ---- a/src/ui/theme.c -+++ b/src/ui/theme.c -@@ -60,6 +60,7 @@ - #include <gtk/gtk.h> - #include <string.h> - #include <stdlib.h> -+#define _GNU_SOURCE - #define __USE_XOPEN - #include <math.h> - --- -2.13.3 - diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity/remove-yelp-help-rules-var.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity/remove-yelp-help-rules-var.patch deleted file mode 100644 index 1970e9afb..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity/remove-yelp-help-rules-var.patch +++ /dev/null @@ -1,28 +0,0 @@ -Remove unused variable (YELP_HELP_RULES) - -Upstream-Status: Pending -Signed-off-by: Constantin Musca <constantinx.musca@intel.com> - -Index: metacity-2.34.13/doc/creating_themes/Makefile.am -=================================================================== ---- metacity-2.34.13.orig/doc/creating_themes/Makefile.am -+++ metacity-2.34.13/doc/creating_themes/Makefile.am -@@ -1,6 +1,5 @@ - ### This part of Makefile.am can be customized by you. - --@YELP_HELP_RULES@ - - # The name of the directory in /usr/share/gnome/help/, - # and the name of the main .xml file: -Index: metacity-2.34.13/doc/creating_themes/Makefile.in -=================================================================== ---- metacity-2.34.13.orig/doc/creating_themes/Makefile.in -+++ metacity-2.34.13/doc/creating_themes/Makefile.in -@@ -455,7 +455,6 @@ uninstall-am: - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am - - --@YELP_HELP_RULES@ - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb deleted file mode 100644 index 370de7000..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb +++ /dev/null @@ -1,35 +0,0 @@ -SECTION = "x11/wm" -SUMMARY = "Metacity is the boring window manager for the adult in you" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://src/include/main.h;endline=24;md5=c2242df552c880280315989bab626b90" - -DEPENDS = "gsettings-desktop-schemas startup-notification gtk+ gconf gdk-pixbuf-native libcanberra gnome-doc-utils libgtop intltool-native" -PR = "r1" - -inherit gnomebase update-alternatives distro_features_check -# depends on startup-notification which depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -GNOME_COMPRESS_TYPE = "xz" - -SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ - file://remove-yelp-help-rules-var.patch \ - file://0001-ui-Define-_GNU_SOURCE.patch \ - " -SRC_URI[archive.md5sum] = "6d89b71672d4fa49fc87f83d610d0ef6" -SRC_URI[archive.sha256sum] = "8cf4dbf0da0a6f36357ce7db7f829ec685908a7792453c662fb8184572b91075" - -ALTERNATIVE_${PN} = "x-window-manager" -ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/metacity" -ALTERNATIVE_PRIORITY = "10" - -EXTRA_OECONF += "--disable-xinerama" - -do_configure_prepend() { - sed -i -e 's:$ZENITY:$NOZENITY:g' -e 's:-Werror::g' ${S}/configure.in -} - -FILES_${PN} += "${datadir}/themes ${datadir}/gnome-control-center ${datadir}/gnome" -RDEPENDS_${PN} += "gsettings-desktop-schemas" - diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.38.0.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.38.0.bb new file mode 100644 index 000000000..48fc9144d --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.38.0.bb @@ -0,0 +1,34 @@ +SECTION = "x11/wm" +SUMMARY = "Metacity is the boring window manager for the adult in you" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b4cce53560b8e619ffa7c830fb8761aa \ + file://src/include/main.h;endline=24;md5=72148ede07a6dadd01de6a882d20a9ad" + +DEPENDS = "gsettings-desktop-schemas startup-notification \ + gnome-doc-utils gdk-pixbuf-native \ + gtk+3 glib-2.0 libcanberra libgtop intltool-native" + +inherit autotools gettext gnomebase distro_features_check +# depends on startup-notification which depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI = "git://github.com/GNOME/metacity.git;branch=master \ + file://0001-drop-zenity-detection.patch \ +" + +S = "${WORKDIR}/git" +SRCREV = "c0d4b2fc0fcd6f2d3c37da935923f9e9ed5eb99f" + +EXTRA_OECONF += "--disable-xinerama" + +do_configure_prepend() { + cd ${S} + aclocal --install || exit 1 + autoreconf --verbose --force --install -Wno-portability || exit 1 + cd - + +} + +FILES_${PN} += "${datadir}/themes ${datadir}/gnome-control-center ${datadir}/gnome" +RDEPENDS_${PN} += "gsettings-desktop-schemas" + |