summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/packages/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch10
-rw-r--r--meta/packages/mutter/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch10
-rw-r--r--meta/packages/mutter/mutter/fix_pkgconfig.patch10
-rw-r--r--meta/packages/mutter/mutter_git.bb18
4 files changed, 35 insertions, 13 deletions
diff --git a/meta/packages/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch b/meta/packages/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch
new file mode 100644
index 0000000000..3714383bc1
--- /dev/null
+++ b/meta/packages/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch
@@ -0,0 +1,10 @@
1Index: git/src/metacity-plugins.pc.in
2===================================================================
3--- git.orig/src/metacity-plugins.pc.in 2008-12-17 22:42:19.000000000 +0000
4+++ git/src/metacity-plugins.pc.in 2008-12-17 22:42:25.000000000 +0000
5@@ -14,4 +14,4 @@
6 Requires: @CLUTTER_PACKAGE@
7 Version: @VERSION@
8 Libs: @CLUTTER_LIBS@
9-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}\"
10+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 0000000000..3714383bc1
--- /dev/null
+++ b/meta/packages/mutter/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch
@@ -0,0 +1,10 @@
1Index: git/src/metacity-plugins.pc.in
2===================================================================
3--- git.orig/src/metacity-plugins.pc.in 2008-12-17 22:42:19.000000000 +0000
4+++ git/src/metacity-plugins.pc.in 2008-12-17 22:42:25.000000000 +0000
5@@ -14,4 +14,4 @@
6 Requires: @CLUTTER_PACKAGE@
7 Version: @VERSION@
8 Libs: @CLUTTER_LIBS@
9-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}\"
10+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 3714383bc1..5ac5ecc609 100644
--- a/meta/packages/mutter/mutter/fix_pkgconfig.patch
+++ b/meta/packages/mutter/mutter/fix_pkgconfig.patch
@@ -1,10 +1,10 @@
1Index: git/src/metacity-plugins.pc.in 1Index: git/src/mutter-plugins.pc.in
2=================================================================== 2===================================================================
3--- git.orig/src/metacity-plugins.pc.in 2008-12-17 22:42:19.000000000 +0000 3--- git.orig/src/mutter-plugins.pc.in 2009-07-03 17:30:39.000000000 +0100
4+++ git/src/metacity-plugins.pc.in 2008-12-17 22:42:25.000000000 +0000 4+++ git/src/mutter-plugins.pc.in 2009-07-03 18:03:09.000000000 +0100
5@@ -14,4 +14,4 @@ 5@@ -14,4 +14,4 @@
6 Requires: @CLUTTER_PACKAGE@ 6 Requires: @CLUTTER_PACKAGE@
7 Version: @VERSION@ 7 Version: @VERSION@
8 Libs: @CLUTTER_LIBS@ 8 Libs: @CLUTTER_LIBS@
9-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}\" 9-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}\"
10+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}\" 10+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 7a0e87d1bc..cebdc7cf08 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
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4DEPENDS = "startup-notification gtk+ gconf clutter gdk-pixbuf-csource-native intltool glib-2.0-native" 4DEPENDS = "startup-notification gtk+ gconf clutter gdk-pixbuf-csource-native intltool glib-2.0-native"
5# gobject-introspection 5# gobject-introspection
6PR = "r9" 6PR = "r10"
7PV = "2.25.1+git${SRCPV}" 7PV = "2.25.1+git${SRCPV}"
8inherit gnome update-alternatives 8inherit gnome update-alternatives
9 9
@@ -13,13 +13,15 @@ inherit gnome update-alternatives
13SRC_URI = "git://git.moblin.org/mutter.git;protocol=git;branch=master \ 13SRC_URI = "git://git.moblin.org/mutter.git;protocol=git;branch=master \
14 file://nodocs.patch;patch=1 \ 14 file://nodocs.patch;patch=1 \
15 file://nozenity.patch;patch=1 \ 15 file://nozenity.patch;patch=1 \
16 file://crosscompile.patch;patch=1 \ 16 file://crosscompile.patch;patch=1;rev=7adb574bb3fa3880eb85dbc86e580cf3452d57c4 \
17 file://fix_pkgconfig.patch;patch=1" 17 file://fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch;patch=1;rev=7adb574bb3fa3880eb85dbc86e580cf3452d57c4 \
18 file://fix_pkgconfig.patch;patch=1;notrev=7adb574bb3fa3880eb85dbc86e580cf3452d57c4 \
19 "
18S = "${WORKDIR}/git" 20S = "${WORKDIR}/git"
19 21
20ALTERNATIVE_NAME = "x-window-manager" 22ALTERNATIVE_NAME = "x-window-manager"
21ALTERNATIVE_LINK = "${bindir}/x-window-manager" 23ALTERNATIVE_LINK = "${bindir}/x-window-manager"
22ALTERNATIVE_PATH = "${bindir}/metacity" 24ALTERNATIVE_PATH = "${bindir}/mutter"
23ALTERNATIVE_PRIORITY = "11" 25ALTERNATIVE_PRIORITY = "11"
24 26
25EXTRA_OECONF += "--disable-verbose \ 27EXTRA_OECONF += "--disable-verbose \
@@ -29,8 +31,8 @@ EXTRA_OECONF += "--disable-verbose \
29 31
30#RDEPENDS_${PN} = "zenity" 32#RDEPENDS_${PN} = "zenity"
31 33
32FILES_${PN} += "${datadir}/themes ${libdir}/metacity/plugins/clutter/*.so" 34FILES_${PN} += "${datadir}/themes ${libdir}/mutter/plugins/*.so ${datadir}/gnome/wm-properties/"
33FILES_${PN}-dbg += "${libdir}/metacity/plugins/clutter/.debug/*" 35FILES_${PN}-dbg += "${libdir}/mutter/plugins/.debug/*"
34 36
35export CC_FOR_BUILD = "${BUILD_CC}" 37export CC_FOR_BUILD = "${BUILD_CC}"
36export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE}/glib-2.0 -I${STAGING_INCDIR_NATIVE}/glib-2.0/include" 38export 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
52 54
53. ${sysconfdir}/init.d/functions 55. ${sysconfdir}/init.d/functions
54 56
55gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type list --list-type string --set /apps/metacity/general/clutter_plugins '[default]' 57gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type list --list-type string --set /apps/mutter/general/clutter_plugins '[default]'
56 58
57gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type bool --set /apps/metacity/general/compositing_manager true 59gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type bool --set /apps/mutter/general/compositing_manager true
58} 60}
59 61
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-18 03:50:28 +0000