Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm
In directory vz-cvs-3.sog:/tmp/cvs-serv18320/stable/main/finkinfo/x11-wm
Modified Files:
icewm-10.6.info icewm.info icewm.patch
Log Message:
sync fc fixes for icewm to stable
Index: icewm-10.6.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm/icewm-10.6.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- icewm-10.6.info 3 Apr 2011 14:00:41 -0000 1.1
+++ icewm-10.6.info 10 Nov 2011 08:16:12 -0000 1.2
@@ -63,7 +63,7 @@
xft2-shlibs (>= 2.1.14-1)
<<
PatchFile: %n.patch
-PatchFile-MD5: dbd1ddc966aea82918850001e66adce6
+PatchFile-MD5: 8551672b01104911a10be7cf1d89b81c
PatchScript: <<
%{default_script}
perl -pi -e 's/icewm-\$\(VERSION\)/%n/g' Makefile.in src/Makefile.in
Index: icewm.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm/icewm.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- icewm.patch 2 Nov 2010 15:46:19 -0000 1.3
+++ icewm.patch 10 Nov 2011 08:16:12 -0000 1.4
@@ -115,6 +115,20 @@
diff -Nurd -x'*~' icewm-1.3.6.orig/src/Makefile.in icewm-1.3.6/src/Makefile.in
--- icewm-1.3.6.orig/src/Makefile.in 2010-01-12 13:17:14.000000000 -0500
+++ icewm-1.3.6/src/Makefile.in 2010-09-16 00:15:29.000000000 -0400
+@@ -35,11 +35,11 @@
+ -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
+
+ CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0
--cflags` \
+- @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config
--cflags`
++ @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ `pkg-config
fontconfig --cflags`
+ LFLAGS = @LDFLAGS@
+ LIBS = @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs`
+
+-CORE_LIBS = @CORE_LIBS@ # `fc-config --libs`
++CORE_LIBS = @CORE_LIBS@ `pkg-config fontconfig --libs`
+ IMAGE_LIBS = @IMAGE_LIBS@
+ AUDIO_LIBS = @AUDIO_LIBS@
+ GNOME1_LIBS = @GNOME1_LIBS@
@@ -206,30 +206,24 @@
################################################################################
Index: icewm.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm/icewm.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- icewm.info 3 Apr 2011 14:00:41 -0000 1.8
+++ icewm.info 10 Nov 2011 08:16:12 -0000 1.9
@@ -63,7 +63,7 @@
xft2-shlibs (>= 2.1.14-1)
<<
PatchFile: %n.patch
-PatchFile-MD5: dbd1ddc966aea82918850001e66adce6
+PatchFile-MD5: 8551672b01104911a10be7cf1d89b81c
PatchScript: <<
%{default_script}
perl -pi -e 's/icewm-\$\(VERSION\)/%n/g' Makefile.in src/Makefile.in
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
