Commit c25d7e49 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

metacity: fix build, bump version 



Metacity no longer built after libgtk2 was updated, so fix it by bumping
the version. We unfortunately cannot move to the latest version, as
these have extra dependencies we don't have in BR yet
(libcanberra-gtk + gnome-doc-utils).

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent a157909e

package/metacity/metacity-gconf.patch

+28 −16
Original line number Diff line number Diff line 
--- metacity-2.17.3/src/prefs.c.orig	2007-01-12 21:42:53.000000000 -0700

+++ metacity-2.17.3/src/prefs.c	2007-01-12 21:45:21.000000000 -0700

@@ -2277,6 +2277,7 @@

       key = g_strconcat (KEY_SCREEN_BINDINGS_PREFIX, "/",

                          binding->name, NULL);

[PATCH] fix build with --disable-gconf



+#ifdef HAVE_GCONF

       gconf_client_set_string (gconf_client_get_default (),

                                key, old_setting, &err);

src/core/prefs.c still contain a call to gconf_client_set_bool() when

built with --disable-gconf, breaking the build.



@@ -2287,6 +2288,7 @@

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

---

 src/core/prefs.c |    2 ++

 1 file changed, 2 insertions(+)



Index: metacity-2.25.1/src/core/prefs.c

===================================================================

--- metacity-2.25.1.orig/src/core/prefs.c

+++ metacity-2.25.1/src/core/prefs.c

@@ -2949,6 +2949,7 @@

 void

 meta_prefs_set_compositing_manager (gboolean whether)

 {

+#if HAVE_GCONF

   GError *err = NULL;

 

   gconf_client_set_bool (default_client,

@@ -2962,6 +2963,7 @@

                     err->message);

       g_error_free (err);

           err = NULL;

     }

+#endif

 }

 

       g_free (old_setting);

       g_free (key);
 
 #ifndef HAVE_GCONF

package/metacity/metacity-nopo.patch

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
metacity: don't descent into po / docs subdirs

---

 Makefile.am |    2 +-

 Makefile.in |    2 +-

 2 files changed, 2 insertions(+), 2 deletions(-)



Index: metacity-2.16.8/Makefile.am

===================================================================

--- metacity-2.16.8.orig/Makefile.am

+++ metacity-2.16.8/Makefile.am

@@ -1,5 +1,5 @@

 

-SUBDIRS=src po doc

+SUBDIRS=src

 

 EXTRA_DIST=HACKING rationales.txt \

 	intltool-extract.in intltool-merge.in intltool-update.in

Index: metacity-2.16.8/Makefile.in

===================================================================

--- metacity-2.16.8.orig/Makefile.in

+++ metacity-2.16.8/Makefile.in

@@ -244,7 +244,7 @@ sysconfdir = @sysconfdir@

 target_alias = @target_alias@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

-SUBDIRS = src po doc

+SUBDIRS = src

 EXTRA_DIST = HACKING rationales.txt \

 	intltool-extract.in intltool-merge.in intltool-update.in

package/metacity/metacity.mk

+5 −4
Original line number Diff line number Diff line
@@ -4,11 +4,12 @@ 
#

#############################################################



METACITY_VERSION = 2.16.8

# newer versions need libcanberra-gtk and gnome-doc-utils

METACITY_VERSION_MAJOR = 2.25

METACITY_VERSION_MINOR = 1

METACITY_VERSION = $(METACITY_VERSION_MAJOR).$(METACITY_VERSION_MINOR)

METACITY_SOURCE = metacity-$(METACITY_VERSION).tar.bz2

METACITY_SITE = http://ftp.gnome.org/pub/gnome/sources/metacity/2.16

METACITY_INSTALL_STAGING =NO

METACITY_INSTALL_TARGET =YES

METACITY_SITE = http://ftp.gnome.org/pub/gnome/sources/metacity/$(METACITY_VERSION_MAJOR)



METACITY_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \

		--x-libraries=$(STAGING_DIR)/usr/lib \