metacity-clutter: Fix .pc file issue

diff --git a/meta/packages/gnome/metacity-clutter/fix_pkgconfig.patch b/meta/packages/gnome/metacity-clutter/fix_pkgconfig.patch
new file mode 100644 (file)
index 0000000..3714383
--- /dev/null
+++ b/meta/packages/gnome/metacity-clutter/fix_pkgconfig.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/gnome/metacity-clutter_git.bb b/meta/packages/gnome/metacity-clutter_git.bb
index c95f4de383d4113fa175847081ff3de1a6d88bb8..e06714ccda579027f326d0bfa8b0f944db96fa5b 100644 (file)
--- a/meta/packages/gnome/metacity-clutter_git.bb
+++ b/meta/packages/gnome/metacity-clutter_git.bb
@@ -2,11 +2,12 @@ SECTION = "x11/wm"
 DESCRIPTION = "Metacity is the boring window manager for the adult in you."
 LICENSE = "GPL"
 DEPENDS = "startup-notification gtk+ gconf clutter-0.8 gdk-pixbuf-csource-native"
-PR = "r3"
+PR = "r4"
 PV = "2.25.1+git${SRCREV}"
 inherit gnome update-alternatives
 
-SRC_URI = "git://git.o-hand.com/metacity-clutter.git;protocol=git;branch=clutter"
+SRC_URI = "git://git.o-hand.com/metacity-clutter.git;protocol=git;branch=clutter \
+           file://fix_pkgconfig.patch;patch=1"
 S = "${WORKDIR}/git"
 
 ALTERNATIVE_NAME = "x-window-manager"