Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm
In directory vz-cvs-3.sog:/tmp/cvs-serv21541/stable/main/finkinfo/x11-wm
Modified Files:
windowmaker.info windowmaker.patch
Log Message:
Backport build cleanups from 10.7
VS: ----------------------------------------------------------------------
Index: windowmaker.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm/windowmaker.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- windowmaker.info 22 Oct 2010 20:36:07 -0000 1.5
+++ windowmaker.info 2 Nov 2011 20:57:16 -0000 1.6
@@ -16,26 +16,37 @@
Package: windowmaker
Version: 0.92.0
-Revision: 14
+Revision: 15
Maintainer: Max Horn <m...@quendi.de>
-Depends: %N-shlibs (= %v-%r)
+Depends: <<
+ %N-shlibs (= %v-%r),
+ fontconfig2-shlibs (>= 2.8.0-4),
+ freetype219-shlibs (>= 2.3.12-1),
+ libjpeg8-shlibs,
+ libpng15-shlibs,
+ libtiff-shlibs,
+ x11-shlibs,
+ xft2-shlibs (>= 2.1.14-1)
+<<
BuildDepends: <<
x11-dev,
- hermes,
+ fontconfig2-dev (>= 2.8.0-4),
+ freetype219 (>= 2.3.12-1),
giflib,
- libpng3,
- libjpeg,
+ libpng15,
+ libjpeg8,
libtiff,
- libgettext3-dev,
+ libgettext8-dev,
gettext-bin,
gettext-tools,
- libiconv-dev,
- fink (>= 0.24.12)
+ fink-package-precedence,
+ xft2-dev (>= 2.1.14-1)
<<
Source: ftp://www.windowmaker.org/pub/source/release/WindowMaker-%v.tar.bz2
Source-MD5: aaac5421b686ed2d3e6ab65229c98097
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
+SetCPPFLAGS: -MD
ConfigureParams: <<
--enable-gnome \
--enable-xinerama \
@@ -43,11 +54,11 @@
--with-gnustepdir=%p/lib/GNUstep \
--x-includes=/usr/X11R6/include \
--x-libraries=/usr/X11R6/lib \
-
PKG_CONFIG_PATH=%p/lib/fontconfig2/lib/pkgconfig:%p/lib/xft2/lib/pkgconfig:$PKG_CONFIG_PATH
\
+ PKG_CONFIG_PATH=%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH \
ac_cv_c_inline_asm=no
<<
PatchFile: %n.patch
-PatchFile-MD5: d74f6135ab7894732ab12fc0a95a04cd
+PatchFile-MD5: a2d5233ce9ab921cf6a46aee39741dff
PatchScript: <<
sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
perl -pi -e 's,hardcode_direct=yes,hardcode_direct=no,g' configure
@@ -57,6 +68,10 @@
perl -pi -e 's|/usr/share/WindowMaker|%p/share/WindowMaker|g' doc/wmaker.1x
doc/sk/wmaker.1x
perl -pi -e 's/(AM_CPPFLAGS.*)/\1 \@XFTFLAGS\@/' WPrefs.app/Makefile.in
<<
+CompileScript: <<
+ %{default_script}
+ fink-package-precedence --depfile-ext='\.d' .
+<<
InstallScript: <<
make install-strip DESTDIR=%d
(cd %i/share/man/man1 ; for i in geticonset getstyle seticons setstyle
wdwrite wmaker wmsetbg wxcopy wxpaste ; do mv $i.1x $i.1 ; done )
@@ -73,7 +88,7 @@
SplitOff: <<
Package: %N-shlibs
Replaces: %N (<= 0.80.0-5)
- Depends: x11, hermes-shlibs, giflib-bin, libpng3-shlibs, libjpeg-shlibs,
libtiff-shlibs, libgettext3-shlibs
+ Depends: x11, giflib-bin, giflib-shlibs, libpng15-shlibs, libjpeg8-shlibs,
libtiff-shlibs
Files: lib/libwraster.*.dylib
Shlibs: %p/lib/libwraster.3.dylib 5.0.0 %n (>= 0.92.0-14)
DocFiles: COPYING* README* AUTHORS BUGS FAQ* NEWS
Index: windowmaker.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm/windowmaker.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- windowmaker.patch 22 Oct 2010 20:36:07 -0000 1.3
+++ windowmaker.patch 2 Nov 2011 20:57:16 -0000 1.4
@@ -177,3 +177,15 @@
exec wmaker
EOF
+diff -ru WindowMaker-0.92.0/wrlib/png.c WindowMaker-0.92.0-patched/wrlib/png.c
+--- WindowMaker-0.92.0/wrlib/png.c 2004-10-12 14:22:04.000000000 -0400
++++ WindowMaker-0.92.0-patched/wrlib/png.c 2011-11-02 15:43:28.000000000
-0400
+@@ -97,7 +97,7 @@
+ }
+
+ RErrorCode = RERR_INTERNAL;
+- if (setjmp(png->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png))) {
+ fclose(f);
+ png_destroy_read_struct(&png, &pinfo, &einfo);
+ if (image)
------------------------------------------------------------------------------
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
