Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory
sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv19710/unstable/main/finkinfo/gnome
Modified Files:
control-center.info control-center.patch
Log Message:
more-direct linking
Index: control-center.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/control-center.info,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- control-center.info 19 Dec 2009 19:43:01 -0000 1.20
+++ control-center.info 4 Feb 2010 06:54:56 -0000 1.21
@@ -126,7 +126,7 @@
Source:
mirror:gnome:sources/gnome-control-center/2.26/gnome-control-center-%v.tar.bz2
Source-MD5: eed8feccc37712e34d88bd3b20e46962
PatchFile: %n.patch
-PatchFile-MD5: abe7b93d20de3257882953ae8ec5cd2f
+PatchFile-MD5: e173fae1e883fda3176f93b597d42721
PatchScript: <<
#!/bin/sh -ev
%{default_script}
@@ -143,6 +143,8 @@
for cl in `find . -name ChangeLog` ; do
cp $cl ChangeLogs/`echo $cl | sed
's/^\.\(.*\)\/\(ChangeLog\)/\2\1/;s/\//./g'`
done
+
+ perl -pi -e 's/(\$COMMON_MODULES)(?! )/\1 gthread-2.0/' configure
<<
SetCPPFLAGS: -D__DARWIN_UNIX03=1 -I%p/lib/fontconfig2/include
SetLDFLAGS: -L%p/lib/fontconfig2/lib
@@ -269,4 +271,9 @@
appearances capplet has thumbnails disabled on darwin. See:
http://bugzilla.gnome.org/show_bug.cgi?id=525058
+
+ Uses libgthread directly, so must link against it directly
+ (bug had been hidden by .la dependency_libs data)
+
+ Recent glib doesn't publish -lintl, so pass it directly.
<<
Index: control-center.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/control-center.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- control-center.patch 23 Jun 2009 01:53:56 -0000 1.7
+++ control-center.patch 4 Feb 2010 06:54:56 -0000 1.8
@@ -34,3 +34,39 @@
uninstall-local:
rm -f $(DESTDIR)$(desktopdir)/mimeinfo.cache
+diff -Nurd -x'*~'
gnome-control-center-2.26.0.orig/libwindow-settings/Makefile.in
gnome-control-center-2.26.0/libwindow-settings/Makefile.in
+--- gnome-control-center-2.26.0.orig/libwindow-settings/Makefile.in
2009-03-16 19:18:25.000000000 -0400
++++ gnome-control-center-2.26.0/libwindow-settings/Makefile.in 2010-02-04
01:13:05.000000000 -0500
+@@ -337,7 +337,7 @@
+ -no-undefined \
+ -version-info 1:0:0
+
+-libgnome_window_settings_la_LIBADD = $(GNOMECC_LIBS)
++libgnome_window_settings_la_LIBADD = $(GNOMECC_LIBS) $(INTLLIBS)
+ libgnome_window_settings_la_SOURCES = \
+ gnome-window-manager.c \
+ gnome-window-manager.h \
+diff -Nurd -x'*~' gnome-control-center-2.26.0.orig/shell/Makefile.in
gnome-control-center-2.26.0/shell/Makefile.in
+--- gnome-control-center-2.26.0.orig/shell/Makefile.in 2009-03-16
19:18:25.000000000 -0400
++++ gnome-control-center-2.26.0/shell/Makefile.in 2010-02-04
01:32:37.000000000 -0500
+@@ -314,7 +314,7 @@
+
+ gnome_control_center_LDADD = \
+ $(GNOMECC_SHELL_LIBS) \
+- $(top_builddir)/libslab/libslab.la
++ $(top_builddir)/libslab/libslab.la $(INTLLIBS)
+
+ AM_CPPFLAGS = \
+ -DGNOMELOCALEDIR="\"$(datadir)/locale\""
+diff -Nurd -x'*~' gnome-control-center-2.26.0.orig/typing-break/Makefile.in
gnome-control-center-2.26.0/typing-break/Makefile.in
+--- gnome-control-center-2.26.0.orig/typing-break/Makefile.in 2009-03-16
19:18:26.000000000 -0400
++++ gnome-control-center-2.26.0/typing-break/Makefile.in 2010-02-04
01:44:22.000000000 -0500
+@@ -334,7 +334,7 @@
+
+ gnome_typing_monitor_CFLAGS = @TYPING_CFLAGS@ $(AM_CFLAGS) \
+ $(am__append_1)
+-gnome_typing_monitor_LDADD = @TYPING_LIBS@ @SCREENSAVER_LIBS@ \
++gnome_typing_monitor_LDADD = @TYPING_LIBS@ @SCREENSAVER_LIBS@ $(INTLLIBS) \
+ $(am__append_2)
+ imagedir = $(pkgdatadir)/pixmaps
+ dist_image_DATA = bar.png bar-red.png bar-green.png bar-disabled.png
ocean-stripes.png
------------------------------------------------------------------------------
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
