Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv483
Modified Files:
libwmf.info libwmf.patch
Log Message:
library upgrades, and turn off static libs, and stop propagating -l only
necessary for static libs
Index: libwmf.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/libwmf.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libwmf.info 26 Jul 2011 00:42:30 -0000 1.1
+++ libwmf.info 24 Jul 2013 18:53:21 -0000 1.2
@@ -1,6 +1,6 @@
Package: libwmf
Version: 0.2.8.4
-Revision: 2
+Revision: 4
Source: mirror:sourceforge:wvware/%n-%v.tar.gz
Source-MD5: d1177739bf1ceb07f57421f0cee191e0
@@ -9,41 +9,68 @@
Depends: %N-shlibs (= %v-%r)
BuildDepends: <<
- glitz, cairo (>= 1.6-1), fontconfig2-dev (>= 2.4.1-1), freetype219 (>=
2.3.5-1),
- xft2-dev, gd2, x11-dev, expat1, libjpeg8, libpng14, gtk+2-dev (>=
2.12.0-1),
- pango1-xft2-ft219-dev (>= 1.18.4-4), pixman (>= 0.10.0-1), pkgconfig
(>= 0.21-1),
- glib2-dev (>= 2.14.0-1), libgettext8-dev, libiconv-dev, fink (>=
0.24.12)
+ expat1,
+ fink-package-precedence,
+ freetype219 (>= 2.4.11-1),
+ gtk+2-dev (>= 2.12.0-1),
+ glib2-dev (>= 2.22.0-1),
+ libjpeg9(>= 9-3),
+ libpng16,
+ pkgconfig (>= 0.23),
+ x11-dev
+<<
+ConfigureParams: <<
+ --with-docdir=%p/share/doc/%n \
+ --with-fontdir=%p/lib/X11/fonts/libwmf \
+ --with-gsfontdir=%p/share/ghostscript/fonts \
+ --with-gsfontmap=%p/share/ghostscript/9.07/lib/Fontmap \
+ --without-sys-gd \
+ --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib \
+ --enable-dependency-tracking \
+ PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:$PKG_CONFIG_PATH" \
+ --disable-static
<<
-ConfigureParams: --mandir=%p/share/man --with-docdir=%i/share/doc/%n
--with-fontdir=%p/lib/X11/fonts/libwmf --with-sys-gd=%p
--with-gsfontdir=%p/share/ghostscript/fonts
--with-gsfontmap=%p/share/ghostscript/8.13/lib/Fontmap
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
--disable-dependency-tracking
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
-
PatchFile: %n.patch
-PatchFile-MD5: 58a5febcc85bda2e5c8f9bd476c45485
+PatchFile-MD5: 24313abee85742e94b4a3476bb680976
PatchScript: <<
%{default_script}
-perl -pi.bak -e 's;io_wmf_la_LIBADD =;io_wmf_la_LIBADD = libwmflite.la;'
src/Makefile.in
-perl -pi.bak -e 's;DESTDIR =;;' fonts/Makefile.in
-perl -pi.bak -e 's;fontdir = \@WMF_FONTDIR\@;fontdir =
%i/lib/X11/fonts/libwmf;' fonts/Makefile.in
- perl -pi -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure
+ perl -pi.bak -e 's;io_wmf_la_LIBADD =;io_wmf_la_LIBADD =
libwmflite.la;' src/Makefile.in
+ perl -pi -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure
<<
CompileScript: <<
-./configure %c
-make
-find . -name "*.la" | xargs perl -pi.bak -e
's/^relink_command=.*/relink_command=/g'
+ ./configure %c
+ make
+ fink-package-precedence --prohibit-bdep=%n .
+<<
+InstallScript: <<
+ make install DESTDIR=%d
<<
SplitOff: <<
Package: %N-shlibs
Depends: <<
- gd2-shlibs, x11-shlibs, expat1-shlibs, libgettext8-shlibs,
libjpeg8-shlibs, libpng14-shlibs,
- ghostscript, gtk+2-shlibs (>= 2.12.0-1), gtk+2 (>= 2.12.0-1)
+ expat1-shlibs,
+ freetype219-shlibs (>= 2.4.11-1),
+ glib2-shlibs (>= 2.22.0-1),
+ gtk+2-shlibs (>= 2.18.0-1),
+ gtk+2 (>= 2.18.0-1),
+ libjpeg9-shlibs (>= 9-3),
+ libpng16-shlibs,
+ ghostscript (>= 9.07-1),
+ ghostscript-fonts,
+ x11-shlibs
<<
+ # lib/X11/fonts was in %N but it's used at runtime by libwmf-0.2.7.dylib
+ Replaces: %N (<< 0.2.8.4-3)
Files: <<
- lib/libwmflite-0.2.7.0.1.dylib lib/libwmflite-0.2.7.dylib
lib/libwmf-0.2.7.1.0.dylib
- lib/libwmf-0.2.7.dylib lib/gtk-2.0
+ lib/libwmflite-0.2.7.*
+ lib/libwmf-0.2.7.*
+ lib/gtk-2.0
+ lib/X11/fonts
<<
- DocFiles: AUTHORS BUILDING COPYING CREDITS INSTALL NEWS TODO
+ DocFiles: AUTHORS BUILDING COPYING CREDITS NEWS TODO
Shlibs: <<
%p/lib/libwmflite-0.2.7.dylib 8.0.0 %n (>= 0.2.8.2-1)
%p/lib/libwmf-0.2.7.dylib 9.0.0 %n (>= 0.2.8.2-1)
@@ -60,13 +87,33 @@
SplitOff2: <<
Package: %N-bin
- Depends: %N-shlibs (= %v-%r)
+ Depends: <<
+ %N-shlibs (= %v-%r),
+ expat1-shlibs,
+ freetype219-shlibs (>= 2.4.11-1),
+ libjpeg9-shlibs (>= 9-3),
+ libpng16-shlibs,
+ ghostscript-fonts,
+ x11-shlibs
+ <<
Files: bin/libwmf-fontmap bin/wmf2svg bin/wmf2eps bin/wmf2fig bin/wmf2gd
bin/wmf2x
- DocFiles: AUTHORS BUILDING COPYING CREDITS INSTALL NEWS TODO
+ DocFiles: AUTHORS BUILDING COPYING CREDITS NEWS TODO
<<
-DocFiles: AUTHORS BUILDING COPYING CREDITS INSTALL NEWS TODO
+DocFiles: AUTHORS BUILDING COPYING CREDITS NEWS TODO
+DescPackaging: <<
+ dmacks (0.2.8.4-4) overhauled deps and turned off static libs,
+ which allowed removal of lots of flags from -config that are
+ not in the public API.
+
+ NB: hard-codes path to ghostscript file whose path varies with
+ gs version. That's a problem if gs is upgraded:(
+
+ Fink's gd2 lib isn't sufficient (as of 2.0.35)--missing
+ gdClipSetAdd(), maybe a libwmf local addition?--so don't
+ bother trying (consistency if fink ever gets sufficient gd2).
+<<
Description: Windows Metafile library
License: GPL
Maintainer: Alexander Strange <astra...@ithinksw.com>
Index: libwmf.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/libwmf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libwmf.patch 26 Jul 2011 00:42:30 -0000 1.1
+++ libwmf.patch 24 Jul 2013 18:53:21 -0000 1.2
@@ -1,5 +1,64 @@
---- libwmf-0.2.8.3.orig/src/font.c
-+++ libwmf-0.2.8.3/src/font.c
+diff -Nurd -x'*~' libwmf-0.2.8.4.orig/configure libwmf-0.2.8.4/configure
+--- libwmf-0.2.8.4.orig/configure 2005-07-27 17:47:12.000000000 -0400
++++ libwmf-0.2.8.4/configure 2013-07-24 10:31:14.000000000 -0400
+@@ -2022,10 +2022,13 @@
+ # CFLAGS to be listed by libwmf-config should be added to this:
+ WMF_CONFIG_CFLAGS=
+
+-# Other CFLAGS, not to be listed by libwmf-config, should be added to this:
++# CFLAGS, not to be listed by libwmf-config, should be added to this:
+ WMF_CFLAGS=
+
+ # LDFLAGS to be listed by libwmf-config should be added to this:
++WMF_CONFIG_LIBFLAGS=
++
++# LDFLAGS, not to be listed by libwmf-config, should be added to this:
+ WMF_LIBFLAGS=
+
+ # WMF_DEFS is for flags such as -DDEBUG which are to applied only to
+@@ -26153,6 +26156,7 @@
+
+
+ WMF_CONFIG_CFLAGS="$WMF_FT_CONFIG_CFLAGS $WMF_Z_CONFIG_CFLAGS
$WMF_X_CONFIG_CFLAGS"
++WMF_CONFIG_LIBFLAGS="$WMF_PLOT_LDFLAGS $WMF_GD_LDFLAGS $WMF_FT_LDFLAGS
$WMF_X_LDFLAGS"
+
+
+
+@@ -27013,6 +27017,7 @@
+ s,@GDK_PIXBUF_DIR@,$GDK_PIXBUF_DIR,;t t
+ s,@WMF_CFLAGS@,$WMF_CFLAGS,;t t
+ s,@WMF_CONFIG_CFLAGS@,$WMF_CONFIG_CFLAGS,;t t
++s,@WMF_CONFIG_LIBFLAGS@,$WMF_CONFIG_LIBFLAGS,;t t
+ s,@WMF_LIBFLAGS@,$WMF_LIBFLAGS,;t t
+ s,@WMF_DOCDIR@,$WMF_DOCDIR,;t t
+ s,@WMF_FONTDIR@,$WMF_FONTDIR,;t t
+diff -Nurd -x'*~' libwmf-0.2.8.4.orig/libwmf-config.in
libwmf-0.2.8.4/libwmf-config.in
+--- libwmf-0.2.8.4.orig/libwmf-config.in 2004-02-10 07:41:26.000000000
-0500
++++ libwmf-0.2.8.4/libwmf-config.in 2013-07-24 10:29:12.000000000 -0400
+@@ -94,7 +94,7 @@
+ fi
+
+ wmf_cflags="@WMF_CONFIG_CFLAGS@"
+-wmf_liblflags="@WMF_LIBFLAGS@"
++wmf_liblflags="@WMF_CONFIG_LIBFLAGS@"
+
+ case `uname` in
+ CYGWIN*)
+diff -Nurd -x'*~' libwmf-0.2.8.4.orig/src/convert/Makefile.in
libwmf-0.2.8.4/src/convert/Makefile.in
+--- libwmf-0.2.8.4.orig/src/convert/Makefile.in 2005-07-27
17:47:05.000000000 -0400
++++ libwmf-0.2.8.4/src/convert/Makefile.in 2013-07-24 02:46:42.000000000
-0400
+@@ -136,7 +136,7 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+-LDFLAGS = -L$(top_builddir)/src/.libs @WMF_LIBFLAGS@ @LDFLAGS@
++LDFLAGS = @WMF_LIBFLAGS@ @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+diff -Nurd -x'*~' libwmf-0.2.8.4.orig/src/font.c libwmf-0.2.8.4/src/font.c
+--- libwmf-0.2.8.4.orig/src/font.c 2005-07-27 16:35:06.000000000 -0400
++++ libwmf-0.2.8.4/src/font.c 2013-07-24 02:46:53.000000000 -0400
@@ -199,7 +199,7 @@
unsigned int i = 0;
@@ -17,8 +76,9 @@
{ if (API->flags & WMF_OPT_SYS_FONTMAP)
{ wmf_ipa_font_map_xml
(API,&(fontmap_data->FD),options->sys_fontmap_file);
}
---- libwmf-0.2.8.3.orig/src/player.c
-+++ libwmf-0.2.8.3/src/player.c
+diff -Nurd -x'*~' libwmf-0.2.8.4.orig/src/player.c libwmf-0.2.8.4/src/player.c
+--- libwmf-0.2.8.4.orig/src/player.c 2002-12-10 14:30:26.000000000 -0500
++++ libwmf-0.2.8.4/src/player.c 2013-07-24 02:46:53.000000000 -0400
@@ -23,6 +23,7 @@
#include <stdio.h>
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
