This is more or less a recipe-rewrite: * get sources from GNOME * cleanup DEPENDS * give up tailored configure * make xinerama a PACKAGECONFIG
Signed-off-by: Andreas Müller <[email protected]> --- ...{metacity_3.32.0.bb => metacity_3.34.1.bb} | 41 +++++++++---------- 1 file changed, 19 insertions(+), 22 deletions(-) rename meta-gnome/recipes-gnome/metacity/{metacity_3.32.0.bb => metacity_3.34.1.bb} (44%) diff --git a/meta-gnome/recipes-gnome/metacity/metacity_3.32.0.bb b/meta-gnome/recipes-gnome/metacity/metacity_3.34.1.bb similarity index 44% rename from meta-gnome/recipes-gnome/metacity/metacity_3.32.0.bb rename to meta-gnome/recipes-gnome/metacity/metacity_3.34.1.bb index 8f15c5774..d8c8b5389 100644 --- a/meta-gnome/recipes-gnome/metacity/metacity_3.32.0.bb +++ b/meta-gnome/recipes-gnome/metacity/metacity_3.34.1.bb @@ -6,36 +6,33 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b4cce53560b8e619ffa7c830fb8761aa \ PE = "1" -DEPENDS = "gsettings-desktop-schemas startup-notification \ - gnome-doc-utils gdk-pixbuf-native \ - gtk+3 glib-2.0 libcanberra libgtop intltool-native" +DEPENDS = " \ + gdk-pixbuf-native \ + gtk+3 \ + gsettings-desktop-schemas \ + startup-notification \ + libcanberra \ + libgtop \ +" + -inherit autotools gettext gnomebase 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 = "bf1bfbadf47eff97703df17e95b15168e2034222" +inherit gnomebase gsettings gettext upstream-version-is-even features_check -EXTRA_OECONF += "--disable-xinerama" - -PACKAGECONFIG ?= "" +SRC_URI[archive.md5sum] = "c0c10204e4d6d024cb413042c1de316b" +SRC_URI[archive.sha256sum] = "31c7d1045c390afb3bf405735b0b26c459197cbf43af37c469eb8918ce3a453d" +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,," -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\ +" -FILES_${PN} += "${datadir}/themes ${datadir}/gnome-control-center ${datadir}/gnome" RDEPENDS_${PN} += "gsettings-desktop-schemas" - -- 2.21.0 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
