From b2112e9f85ada538fdb2360d9c834e98da5d2072 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 7 Jul 2009 13:57:52 +0100 Subject: mutter: Update after recent upstream changes and renaming Signed-off-by: Richard Purdie --- ...nfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch | 10 ++++++++++ ...nfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch | 10 ++++++++++ meta/packages/mutter/mutter/fix_pkgconfig.patch | 10 +++++----- meta/packages/mutter/mutter_git.bb | 18 ++++++++++-------- 4 files changed, 35 insertions(+), 13 deletions(-) create mode 100644 meta/packages/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch create mode 100644 meta/packages/mutter/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch (limited to 'meta/packages') diff --git a/meta/packages/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch b/meta/packages/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch new file mode 100644 index 000000000..3714383bc --- /dev/null +++ b/meta/packages/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch @@ -0,0 +1,10 @@ +Index: git/src/metacity-plugins.pc.in +=================================================================== +--- git.orig/src/metacity-plugins.pc.in 2008-12-17 22:42:19.000000000 +0000 ++++ git/src/metacity-plugins.pc.in 2008-12-17 22:42:25.000000000 +0000 +@@ -14,4 +14,4 @@ + Requires: @CLUTTER_PACKAGE@ + Version: @VERSION@ + Libs: @CLUTTER_LIBS@ +-Cflags: @CLUTTER_CFLAGS@ -DWITH_CLUTTER -I${includedir}/metacity-1/metacity-private -DMETACITY_MAJOR_VERSION=${metacity_major_version} -DMETACITY_MINOR_VERSION=${metacity_minor_version} -DMETACITY_MICRO_VERSION=${metacity_micro_version} -DMETACITY_CLUTTER_PLUGIN_API_VERSION=${metacity_clutter_plugin_api_version} -DMUTTER_PLUGIN_DIR=\"${mutterplugindir}\" ++Cflags: -DWITH_CLUTTER -I${includedir}/metacity-1/metacity-private -DMETACITY_MAJOR_VERSION=${metacity_major_version} -DMETACITY_MINOR_VERSION=${metacity_minor_version} -DMETACITY_MICRO_VERSION=${metacity_micro_version} -DMETACITY_CLUTTER_PLUGIN_API_VERSION=${metacity_clutter_plugin_api_version} -DMUTTER_PLUGIN_DIR=\"${mutterplugindir}\" diff --git a/meta/packages/mutter/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch b/meta/packages/mutter/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch new file mode 100644 index 000000000..3714383bc --- /dev/null +++ b/meta/packages/mutter/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch @@ -0,0 +1,10 @@ +Index: git/src/metacity-plugins.pc.in +=================================================================== +--- git.orig/src/metacity-plugins.pc.in 2008-12-17 22:42:19.000000000 +0000 ++++ git/src/metacity-plugins.pc.in 2008-12-17 22:42:25.000000000 +0000 +@@ -14,4 +14,4 @@ + Requires: @CLUTTER_PACKAGE@ + Version: @VERSION@ + Libs: @CLUTTER_LIBS@ +-Cflags: @CLUTTER_CFLAGS@ -DWITH_CLUTTER -I${includedir}/metacity-1/metacity-private -DMETACITY_MAJOR_VERSION=${metacity_major_version} -DMETACITY_MINOR_VERSION=${metacity_minor_version} -DMETACITY_MICRO_VERSION=${metacity_micro_version} -DMETACITY_CLUTTER_PLUGIN_API_VERSION=${metacity_clutter_plugin_api_version} -DMUTTER_PLUGIN_DIR=\"${mutterplugindir}\" ++Cflags: -DWITH_CLUTTER -I${includedir}/metacity-1/metacity-private -DMETACITY_MAJOR_VERSION=${metacity_major_version} -DMETACITY_MINOR_VERSION=${metacity_minor_version} -DMETACITY_MICRO_VERSION=${metacity_micro_version} -DMETACITY_CLUTTER_PLUGIN_API_VERSION=${metacity_clutter_plugin_api_version} -DMUTTER_PLUGIN_DIR=\"${mutterplugindir}\" diff --git a/meta/packages/mutter/mutter/fix_pkgconfig.patch b/meta/packages/mutter/mutter/fix_pkgconfig.patch index 3714383bc..5ac5ecc60 100644 --- a/meta/packages/mutter/mutter/fix_pkgconfig.patch +++ b/meta/packages/mutter/mutter/fix_pkgconfig.patch @@ -1,10 +1,10 @@ -Index: git/src/metacity-plugins.pc.in +Index: git/src/mutter-plugins.pc.in =================================================================== ---- git.orig/src/metacity-plugins.pc.in 2008-12-17 22:42:19.000000000 +0000 -+++ git/src/metacity-plugins.pc.in 2008-12-17 22:42:25.000000000 +0000 +--- git.orig/src/mutter-plugins.pc.in 2009-07-03 17:30:39.000000000 +0100 ++++ git/src/mutter-plugins.pc.in 2009-07-03 18:03:09.000000000 +0100 @@ -14,4 +14,4 @@ Requires: @CLUTTER_PACKAGE@ Version: @VERSION@ Libs: @CLUTTER_LIBS@ --Cflags: @CLUTTER_CFLAGS@ -DWITH_CLUTTER -I${includedir}/metacity-1/metacity-private -DMETACITY_MAJOR_VERSION=${metacity_major_version} -DMETACITY_MINOR_VERSION=${metacity_minor_version} -DMETACITY_MICRO_VERSION=${metacity_micro_version} -DMETACITY_CLUTTER_PLUGIN_API_VERSION=${metacity_clutter_plugin_api_version} -DMUTTER_PLUGIN_DIR=\"${mutterplugindir}\" -+Cflags: -DWITH_CLUTTER -I${includedir}/metacity-1/metacity-private -DMETACITY_MAJOR_VERSION=${metacity_major_version} -DMETACITY_MINOR_VERSION=${metacity_minor_version} -DMETACITY_MICRO_VERSION=${metacity_micro_version} -DMETACITY_CLUTTER_PLUGIN_API_VERSION=${metacity_clutter_plugin_api_version} -DMUTTER_PLUGIN_DIR=\"${mutterplugindir}\" +-Cflags: @CLUTTER_CFLAGS@ -DWITH_CLUTTER -I${includedir}/mutter/mutter-private -DMUTTER_MAJOR_VERSION=${mutter_major_version} -DMUTTER_MINOR_VERSION=${mutter_minor_version} -DMUTTER_MICRO_VERSION=${mutter_micro_version} -DMUTTER_PLUGIN_API_VERSION=${mutter_plugin_api_version} -DMUTTER_PLUGIN_DIR=\"${plugindir}\" ++Cflags: -DWITH_CLUTTER -I${includedir}/mutter/mutter-private -DMUTTER_MAJOR_VERSION=${mutter_major_version} -DMUTTER_MINOR_VERSION=${mutter_minor_version} -DMUTTER_MICRO_VERSION=${mutter_micro_version} -DMUTTER_PLUGIN_API_VERSION=${mutter_plugin_api_version} -DMUTTER_PLUGIN_DIR=\"${plugindir}\" diff --git a/meta/packages/mutter/mutter_git.bb b/meta/packages/mutter/mutter_git.bb index 7a0e87d1b..cebdc7cf0 100644 --- a/meta/packages/mutter/mutter_git.bb +++ b/meta/packages/mutter/mutter_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Metacity is the boring window manager for the adult in you. Mutte LICENSE = "GPLv2" DEPENDS = "startup-notification gtk+ gconf clutter gdk-pixbuf-csource-native intltool glib-2.0-native" # gobject-introspection -PR = "r9" +PR = "r10" PV = "2.25.1+git${SRCPV}" inherit gnome update-alternatives @@ -13,13 +13,15 @@ inherit gnome update-alternatives SRC_URI = "git://git.moblin.org/mutter.git;protocol=git;branch=master \ file://nodocs.patch;patch=1 \ file://nozenity.patch;patch=1 \ - file://crosscompile.patch;patch=1 \ - file://fix_pkgconfig.patch;patch=1" + file://crosscompile.patch;patch=1;rev=7adb574bb3fa3880eb85dbc86e580cf3452d57c4 \ + file://fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch;patch=1;rev=7adb574bb3fa3880eb85dbc86e580cf3452d57c4 \ + file://fix_pkgconfig.patch;patch=1;notrev=7adb574bb3fa3880eb85dbc86e580cf3452d57c4 \ + " S = "${WORKDIR}/git" ALTERNATIVE_NAME = "x-window-manager" ALTERNATIVE_LINK = "${bindir}/x-window-manager" -ALTERNATIVE_PATH = "${bindir}/metacity" +ALTERNATIVE_PATH = "${bindir}/mutter" ALTERNATIVE_PRIORITY = "11" EXTRA_OECONF += "--disable-verbose \ @@ -29,8 +31,8 @@ EXTRA_OECONF += "--disable-verbose \ #RDEPENDS_${PN} = "zenity" -FILES_${PN} += "${datadir}/themes ${libdir}/metacity/plugins/clutter/*.so" -FILES_${PN}-dbg += "${libdir}/metacity/plugins/clutter/.debug/*" +FILES_${PN} += "${datadir}/themes ${libdir}/mutter/plugins/*.so ${datadir}/gnome/wm-properties/" +FILES_${PN}-dbg += "${libdir}/mutter/plugins/.debug/*" export CC_FOR_BUILD = "${BUILD_CC}" export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE}/glib-2.0 -I${STAGING_INCDIR_NATIVE}/glib-2.0/include" @@ -52,8 +54,8 @@ fi . ${sysconfdir}/init.d/functions -gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type list --list-type string --set /apps/metacity/general/clutter_plugins '[default]' +gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type list --list-type string --set /apps/mutter/general/clutter_plugins '[default]' -gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type bool --set /apps/metacity/general/compositing_manager true +gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type bool --set /apps/mutter/general/compositing_manager true } -- cgit v1.2.3