Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv820
Modified Files: libming1-shlibs.info libming1-shlibs.patch Log Message: libming1 0.4.4 Index: libming1-shlibs.patch =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/libming1-shlibs.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- libming1-shlibs.patch 1 Aug 2011 03:12:51 -0000 1.2 +++ libming1-shlibs.patch 16 Mar 2013 18:39:12 -0000 1.3 @@ -1,33 +1,16 @@ -diff -Nurd -x'*~' ming-0.4.2.orig/src/blocks/pngdbl.c ming-0.4.2/src/blocks/pngdbl.c ---- ming-0.4.2.orig/src/blocks/pngdbl.c 2008-04-09 17:43:50.000000000 -0400 -+++ ming-0.4.2/src/blocks/pngdbl.c 2011-07-30 13:08:41.000000000 -0400 -@@ -59,7 +59,7 @@ - } - - static int pngReadFunc(png_structp png, unsigned char *buf, int len) --{ SWFInput input = (SWFInput) png->io_ptr; -+{ SWFInput input = (SWFInput) png_get_io_ptr(png); - return SWFInput_read(input, buf, len); - } - -@@ -125,7 +125,7 @@ - return 0; - } - -- if(setjmp(png_ptr->jmpbuf)) -+ if(setjmp(png_jmpbuf(png_ptr))) - { - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); - return 0; -diff -Nurd -x'*~' ming-0.4.2.orig/util/png2dbl.c ming-0.4.2/util/png2dbl.c ---- ming-0.4.2.orig/util/png2dbl.c 2007-10-30 15:26:56.000000000 -0400 -+++ ming-0.4.2/util/png2dbl.c 2011-07-30 13:19:32.000000000 -0400 -@@ -87,7 +87,7 @@ - error("Couldn't create end_info\n"); - } - -- if(setjmp(png_ptr->jmpbuf)) -+ if(setjmp(png_jmpbuf(png_ptr))) - { - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); - fclose(fp); +--- a/test/Font/Makefile.in 2011-10-26 03:30:22.000000000 -0400 ++++ b/test/Font/Makefile.in 2013-03-16 10:57:20.000000000 -0400 +@@ -53,11 +53,11 @@ + CONFIG_HEADER = $(top_builddir)/src/ming_config.h + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = +-am__EXEEXT_1 = test01$(EXEEXT) test02$(EXEEXT) test03$(EXEEXT) \ ++am__EXEEXT_1 = test01$(EXEEXT) test02$(EXEEXT) \ + test04$(EXEEXT) test05$(EXEEXT) test06$(EXEEXT) \ + test07$(EXEEXT) + @USE_CXX_TRUE@am__EXEEXT_2 = test01-cxx$(EXEEXT) test02-cxx$(EXEEXT) \ +-@USE_CXX_TRUE@ test03-cxx$(EXEEXT) test04-cxx$(EXEEXT) \ ++@USE_CXX_TRUE@ test04-cxx$(EXEEXT) \ + @USE_CXX_TRUE@ test05-cxx$(EXEEXT) test06-cxx$(EXEEXT) \ + @USE_CXX_TRUE@ test07-cxx$(EXEEXT) + am__EXEEXT_3 = $(am__EXEEXT_1) $(am__EXEEXT_2) Index: libming1-shlibs.info =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/libming1-shlibs.info,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- libming1-shlibs.info 6 Nov 2011 20:50:25 -0000 1.5 +++ libming1-shlibs.info 16 Mar 2013 18:39:12 -0000 1.6 @@ -1,20 +1,39 @@ Package: libming1-shlibs -Version: 0.4.2 -Revision: 4 -BuildDepends: autoconf2.6, automake1.11, fink (>= 0.24.12-1), freetype219, giflib, libpng15, libtool2, pkgconfig, x11-dev +Version: 0.4.4 +Revision: 1 +BuildDepends: fink-package-precedence, freetype219, giflib, libpng15, libtool2, pkgconfig, x11-dev Depends: freetype219-shlibs, giflib-shlibs, libpng15-shlibs -Source: mirror:sourceforge:ming/ming-%v.tar.gz -Source-MD5: b44da4985037241eda6da13d724eb935 +Source: mirror:sourceforge:ming/ming-%v.tar.bz2 +Source-MD5: 9e780f93670eaf68b1eefa6cdfc1d1e2 PatchFile: %n.patch -PatchFile-MD5: 8ce6ed88a6a4911f797e0e7749c162f3 -ConfigureParams: --with-freetype-config=%p/lib/freetype219/bin/freetype-config --disable-python --disable-perl --disable-php --disable-tcl --with-pic --enable-shared --enable-static --mandir=%p/share/man --disable-dependency-tracking +PatchFile-MD5: 6097c0a72bae1ac6fdf1466a48ed90a0 +ConfigureParams: --with-freetype-config=%p/lib/freetype219/bin/freetype-config --disable-python --disable-perl --disable-php --disable-tcl --with-pic --enable-shared --enable-static --mandir=%p/share/man --enable-dependency-tracking CompileScript: << #!/bin/bash -ev ./configure %c -make +make V=1 +fink-package-precedence . << -InstallScript: make install DESTDIR=%d -DocFiles: AUTHORS COPYING ChangeLog HISTORY INSTALL LICENSE LICENSE_GPL2 NEWS README +### Compiling a test program fails with clang, so switch to llvm-gcc here +### test/Font/test03 fails (since at least ming 0.4.1, so patch it out) +InfoTest: << + ### This test file is missing from the tarball + TestSource: https://github.com/libming/libming/blob/cc075813f7a8cd23041089c4f66b87496a3354b3/test/Media/font-kerntest.fdb?raw=true + TestSourceRename: font-kerntest.fdb + TestSource-MD5: 2b08af4b0337d2221d7587646e9bdb47 + TestDepends: llvm-gcc + TestScript: << + #!/bin/sh -ev + cp %b/../font-kerntest.fdb test/Media/font-kerntest.fdb + make check CC=llvm-gcc-4.2 CXX=llvm-g++-4.2 || exit 2 + fink-package-precedence . + << +<< +InstallScript: << + make install DESTDIR=%d + cd docs/man ; make install DESTDIR=%d +<< +DocFiles: AUTHORS COPYING HISTORY INSTALL LICENSE LICENSE_GPL2 NEWS README TODO Shlibs: %p/lib/libming.1.dylib 6.0.0 %n (>= 0.4.2-1) SplitOff: << Package: libming1-dev @@ -30,7 +49,7 @@ lib/libming.a share/man/man3 << - DocFiles: AUTHORS COPYING ChangeLog HISTORY INSTALL LICENSE LICENSE_GPL2 NEWS README + DocFiles: AUTHORS COPYING HISTORY INSTALL LICENSE LICENSE_GPL2 NEWS README TODO Description: Library to generate SWF (Flash) Files (development files) DescDetail: << Ming is an SWF (Flash) file format output library. @@ -48,7 +67,7 @@ bin share/man/man1 << - DocFiles: AUTHORS COPYING ChangeLog HISTORY INSTALL LICENSE LICENSE_GPL2 NEWS README + DocFiles: AUTHORS COPYING HISTORY INSTALL LICENSE LICENSE_GPL2 NEWS README TODO Description: Library to generate SWF (Flash) Files - Utilities DescDetail: << Ming is an SWF (Flash) file format output library. ------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_mar _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs