From 6675b568d92d680fc1261d9a09eff2f824402061 Mon Sep 17 00:00:00 2001 From: Jon Nettleton Date: Thu, 7 May 2009 21:29:44 -0400 Subject: [PATCH] Update gnome-shell for renamed Mutter Adjust references to the mutter binary and plugin locations to account for the rework of Mutter to install as 'mutter' instead of 'metacity' http://bugzilla.gnome.org/show_bug.cgi?id=581814 --- configure.ac | 16 +++++++++------- src/Makefile.am | 20 ++++++++++---------- src/gnome-shell.in | 4 ++-- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/configure.ac b/configure.ac index 503369076..b01e6aa3f 100644 --- a/configure.ac +++ b/configure.ac @@ -40,7 +40,7 @@ fi AM_CONDITIONAL(BUILD_RECORDER, $build_recorder) -PKG_CHECK_MODULES(MUTTER_PLUGIN, gtk+-2.0 dbus-glib-1 metacity-plugins gjs-gi-1.0 xscrnsaver libgnome-menu $recorder_modules gconf-2.0 gdk-x11-2.0 clutter-x11-0.9 clutter-glx-0.9) +PKG_CHECK_MODULES(MUTTER_PLUGIN, gtk+-2.0 dbus-glib-1 mutter-plugins gjs-gi-1.0 xscrnsaver libgnome-menu $recorder_modules gconf-2.0 gdk-x11-2.0 clutter-x11-0.9 clutter-glx-0.9) PKG_CHECK_MODULES(TIDY, clutter-0.9) PKG_CHECK_MODULES(BIG, clutter-0.9 gtk+-2.0 librsvg-2.0) PKG_CHECK_MODULES(GDMUSER, dbus-glib-1 gtk+-2.0) @@ -51,11 +51,13 @@ PKG_CHECK_MODULES(TASKPANEL, libwnck-1.0 dbus-glib-1) # it becomes stable. PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0) -META_BIN_DIR=`$PKG_CONFIG --variable=exec_prefix metacity-plugins`/bin +MUTTER_BIN_DIR=`$PKG_CONFIG --variable=exec_prefix mutter-plugins`/bin # FIXME: metacity-plugins.pc should point directly to its .gir file -META_LIB_DIR=`$PKG_CONFIG --variable=libdir metacity-plugins` -AC_SUBST(META_BIN_DIR) -AC_SUBST(META_LIB_DIR) +MUTTER_LIB_DIR=`$PKG_CONFIG --variable=libdir mutter-plugins` +MUTTER_PLUGIN_DIR=`$PKG_CONFIG --variable=plugindir mutter-plugins` +AC_SUBST(MUTTER_BIN_DIR) +AC_SUBST(MUTTER_LIB_DIR) +AC_SUBST(MUTTER_PLUGIN_DIR) GJS_JS_DIR=`$PKG_CONFIG --variable=jsdir gjs-1.0` GJS_JS_NATIVE_DIR=`$PKG_CONFIG --variable=jsnativedir gjs-1.0` @@ -92,8 +94,8 @@ if test "x$GCC" = "xyes"; then fi changequote([,])dnl -AC_PATH_PROG(metacity, [metacity]) -AC_SUBST(metacity) +AC_PATH_PROG(mutter, [mutter]) +AC_SUBST(mutter) AC_OUTPUT([ Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 9fd4d659c..e0aab00a7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,7 +8,7 @@ noinst_LTLIBRARIES = bin_SCRIPTS = gnome-shell gnome-shell: gnome-shell.in - sed -e "s|@META_BIN_DIR[@]|$(META_BIN_DIR)|" \ + sed -e "s|@MUTTER_BIN_DIR[@]|$(MUTTER_BIN_DIR)|" \ -e "s|@GJS_JS_DIR[@]|$(GJS_JS_DIR)|" \ -e "s|@GJS_JS_NATIVE_DIR[@]|$(GJS_JS_NATIVE_DIR)|" \ -e "s|@libexecdir[@]|$(libexecdir)|" \ @@ -33,7 +33,7 @@ gnome_shell_cflags = \ -DGNOME_SHELL_PKGLIBDIR=\"$(pkglibdir)\" \ -DJSDIR=\"$(pkgdatadir)/js\" -plugindir = $(libdir)/metacity/plugins/clutter +plugindir = $(MUTTER_PLUGIN_DIR) plugin_LTLIBRARIES = libgnome-shell.la shell_built_sources = \ @@ -139,16 +139,16 @@ libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags) typelibdir = $(pkglibdir) typelib_DATA = Shell-0.1.typelib Tidy-1.0.typelib Big-1.0.typelib -Shell-0.1.gir: $(metacity) $(G_IR_SCANNER) Big-1.0.gir libgnome-shell.la Makefile +Shell-0.1.gir: $(mutter) $(G_IR_SCANNER) Big-1.0.gir libgnome-shell.la Makefile $(G_IR_SCANNER) \ --namespace=Shell \ --nsversion=0.1 \ - --add-include-path=$(META_LIB_DIR)/metacity/ \ + --add-include-path=$(MUTTER_LIB_DIR)/mutter/ \ --include=Clutter-0.9 \ --include=Meta-2.27 \ --add-include-path=$(builddir) \ --include=Big-1.0 \ - --program=metacity \ + --program=mutter \ --program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \ $(addprefix $(srcdir)/,$(libgnome_shell_la_gir_sources)) \ $(libgnome_shell_la_CPPFLAGS) \ @@ -158,15 +158,15 @@ CLEANFILES += Shell-0.1.gir # The dependency on libgnome-shell.la here is because g-ir-compiler opens it # (not the fake library, since we've already done the rewriting) Shell-0.1.typelib: libgnome-shell.la Shell-0.1.gir Big-1.0.gir - LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. g-ir-compiler --includedir=$(builddir) --includedir=$(META_LIB_DIR)/metacity/ Shell-0.1.gir -o $@ + LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. g-ir-compiler --includedir=$(builddir) --includedir=$(MUTTER_LIB_DIR)/mutter/ Shell-0.1.gir -o $@ CLEANFILES += Shell-0.1.typelib -Tidy-1.0.gir: $(metacity) $(G_IR_SCANNER) libgnome-shell.la libtidy-1.0.la Makefile +Tidy-1.0.gir: $(mutter) $(G_IR_SCANNER) libgnome-shell.la libtidy-1.0.la Makefile $(G_IR_SCANNER) \ --namespace=Tidy \ --nsversion=1.0 \ --include=Clutter-0.9 \ - --program=metacity \ + --program=mutter \ --program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \ $(addprefix $(srcdir)/,$(tidy_source_h)) \ $(addprefix $(srcdir)/,$(tidy_source_c)) \ @@ -179,13 +179,13 @@ Tidy-1.0.typelib: libtidy-1.0.la Tidy-1.0.gir LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. g-ir-compiler Tidy-1.0.gir -o $@ CLEANFILES += Tidy-1.0.typelib -Big-1.0.gir: $(metacity) $(G_IR_SCANNER) libgnome-shell.la libbig-1.0.la Makefile +Big-1.0.gir: $(mutter) $(G_IR_SCANNER) libgnome-shell.la libbig-1.0.la Makefile $(G_IR_SCANNER) \ --namespace=Big \ --nsversion=1.0 \ --include=Clutter-0.9 \ --include=GdkPixbuf-2.0 \ - --program=metacity \ + --program=mutter \ --program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \ $(addprefix $(srcdir)/,$(big_source_h)) \ $(addprefix $(srcdir)/,$(big_source_c)) \ diff --git a/src/gnome-shell.in b/src/gnome-shell.in index 1cb2008ab..96c14ec09 100755 --- a/src/gnome-shell.in +++ b/src/gnome-shell.in @@ -134,7 +134,7 @@ def start_shell(): # Set up environment env = dict(os.environ) env.update({'GNOME_SHELL_JS' : '@GJS_JS_DIR@:@GJS_JS_NATIVE_DIR@:' + js_dir, - 'PATH' : '@META_BIN_DIR@:' + os.environ.get('PATH', '') + ':' + taskpanel_dir, + 'PATH' : '@MUTTER_BIN_DIR@:' + os.environ.get('PATH', '') + ':' + taskpanel_dir, 'GNOME_DISABLE_CRASH_DIALOG' : '1'}) if running_from_source_tree: @@ -187,7 +187,7 @@ def start_shell(): else: args = [] - args.extend(['metacity', '--mutter-plugins=' + plugin, '--replace']) + args.extend(['mutter', '--mutter-plugins=' + plugin, '--replace']) if options.sync: args.append('--sync') return subprocess.Popen(args, env=env)