Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11-wm
In directory
sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv23259/unstable/main/finkinfo/x11-wm
Modified Files:
metacity.info metacity.patch
Log Message:
explicitly pass flags that used to come inherited from .la deps
Index: metacity.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11-wm/metacity.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- metacity.patch 14 Sep 2009 04:34:25 -0000 1.3
+++ metacity.patch 4 Feb 2010 03:58:32 -0000 1.4
@@ -1,6 +1,15 @@
diff -Nurd -x'*~' metacity-2.26.0.orig/configure.in
metacity-2.26.0/configure.in
--- metacity-2.26.0.orig/configure.in 2009-03-16 13:58:12.000000000 -0400
+++ metacity-2.26.0/configure.in 2009-06-01 23:11:23.000000000 -0400
+@@ -107,7 +107,7 @@
+ fi
+ changequote([,])dnl
+
+-METACITY_PC_MODULES='gtk+-2.0 >= 2.10.0 pango >= 1.2.0'
++METACITY_PC_MODULES='gtk+-2.0 >= 2.10.0 pango >= 1.2.0 gthread-2.0'
+
+ AC_ARG_ENABLE(gconf,
+ AC_HELP_STRING([--disable-gconf],
@@ -239,6 +239,7 @@
else
echo "Building without compositing manager"
@@ -9,6 +18,17 @@
## if no compositor, still possibly enable render
if test x$have_xcomposite = xno; then
+@@ -413,8 +414,8 @@
+ AC_DEFINE(HAVE_XSYNC, , [Have the Xsync extension library])
+ fi
+
+-METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS
$X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
+-METACITY_MESSAGE_LIBS="$METACITY_MESSAGE_LIBS $X_LIBS $X_PRE_LIBS -lX11
$X_EXTRA_LIBS"
++METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS
$X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm $INTLLIBS"
++METACITY_MESSAGE_LIBS="$METACITY_MESSAGE_LIBS $X_LIBS $X_PRE_LIBS -lX11
$X_EXTRA_LIBS $INTLLIBS"
+ METACITY_WINDOW_DEMO_LIBS="$METACITY_WINDOW_DEMO_LIBS $X_LIBS $X_PRE_LIBS
-lX11 $X_EXTRA_LIBS"
+ METACITY_PROPS_LIBS="$METACITY_PROPS_LIBS $X_LIBS $X_PRE_LIBS -lX11
$X_EXTRA_LIBS"
+
diff -Nurd -x'*~' metacity-2.26.0.orig/src/Makefile.am
metacity-2.26.0/src/Makefile.am
--- metacity-2.26.0.orig/src/Makefile.am 2009-02-04 20:10:06.000000000
-0500
+++ metacity-2.26.0/src/Makefile.am 2009-06-01 23:02:57.000000000 -0400
Index: metacity.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11-wm/metacity.info,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- metacity.info 24 Sep 2009 04:22:08 -0000 1.18
+++ metacity.info 4 Feb 2010 03:58:32 -0000 1.19
@@ -58,7 +58,7 @@
Source: mirror:gnome:sources/%n/2.26/%n-%v.tar.bz2
Source-MD5: eafb624e79fbcdab6da59acc222430b1
PatchFile: %n.patch
-PatchFile-MD5: 92e928ae8c74c2e9d502d0eb60dd0450
+PatchFile-MD5: 54a892b94e63c390e4d6ced5efd67849
SetCPPFLAGS: -I%p/lib/fontconfig2/include
SetLDFLAGS: -L%p/lib/fontconfig2/lib
SetCFLAGS: -Os
@@ -136,6 +136,14 @@
Do we need to disable xrender and/or xrandr any more
stringently for portability among various x11 flavors?
<<
+DescPort: <<
+ Recent glib doesn't publish -lintl, so pass it directly.
+ Needed in lots of places, so just pass it in main _LIBS to
+ everything
+
+ Uses libgthread directly, so must link against it directly
+ (bug had been hidden by .la dependency_libs data)
+<<
License: GPL
Maintainer: The Gnome Core Team <fink-gnome-c...@lists.sourceforge.net>
Homepage: http://people.redhat.com/~hp/metacity/
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
