Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19661
Modified Files:
netpbm.info netpbm.patch netpbm10.info netpbm10.patch
Log Message:
gcc4 patches clean for 10.3 also.
Index: netpbm.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics/netpbm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- netpbm.patch 23 Oct 2003 14:35:36 -0000 1.1
+++ netpbm.patch 7 Oct 2005 17:57:20 -0000 1.2
@@ -5,7 +5,7 @@
# Nothing to do.
} elsif ($platform eq "DARWIN") {
push(@Makefile_config, "CC = cc -no-cpp-precomp\n");
-+ push(@Makefile_config, 'CFLAGS = -O3 -fstrict-aliasing -funroll-loops',
"\n");
++ push(@Makefile_config, 'CFLAGS = -Os -fstrict-aliasing -funroll-loops',
"\n");
push(@Makefile_config, 'CFLAGS_SHLIB = -fno-common', "\n");
- push(@Makefile_config, 'LDSHLIB = -dynamiclib -install_name
$(INSTALLLIBS)/lib$(LIBROOT).$(MAJ).dylib', "\n");
+ push(@Makefile_config, 'LDSHLIB = -dynamiclib -install_name
$(INSTALLLIBS)/lib$(LIBROOT).$(MAJ).dylib -compatibility_version `expr $(MAJ) +
1` -current_version `expr $(MAJ) + 1`.$(MIN)', "\n");
Index: netpbm10.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics/netpbm10.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- netpbm10.patch 15 Aug 2004 16:35:19 -0000 1.4
+++ netpbm10.patch 7 Oct 2005 17:57:20 -0000 1.5
@@ -12,7 +12,7 @@
+STATICLIB_TOO = n
+NETPBM_RUNTIME_PATH = @PREFIX@/lib
+CC = cc -no-cpp-precomp
-+CFLAGS = -O3 -fstrict-aliasing -funroll-all-loops -isystem
@PREFIX@/include
++CFLAGS = -Os -fstrict-aliasing -funroll-all-loops -isystem
@PREFIX@/include
+CFLAGS_SHLIB = -fno-common
+LADD = [EMAIL PROTECTED]@/lib
+LDSHLIB = -dynamiclib -install_name
$(NETPBM_RUNTIME_PATH)/libnetpbm.$(MAJ).dylib -compatibility_version
$$(($(MAJ)+1)) -current_version $$(($(MAJ)+1)).$(MIN)
Index: netpbm10.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics/netpbm10.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- netpbm10.info 12 Dec 2004 13:49:49 -0000 1.12
+++ netpbm10.info 7 Oct 2005 17:57:20 -0000 1.13
@@ -1,7 +1,7 @@
Package: netpbm10
Version: 10.24
-Revision: 2
-BuildDepends: libjpeg, libpng3, libtiff, gcc3.3
+Revision: 3
+BuildDepends: libjpeg, libpng3, libtiff
Depends: %N-shlibs (= %v-%r)
Replaces: netpbm
Conflicts: netpbm
@@ -17,7 +17,7 @@
sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
cat Makefile.config.in Makefile.config.fink >Makefile.config
<<
-CompileScript: make -j1 CC=gcc-3.3 CXX=g++-3.3
+CompileScript: make -j1
InstallScript: <<
make package pkgdir=`pwd`/package SYMLINK='ln -s'
install -d -m 755 %i/share
@@ -41,7 +41,9 @@
Description: Graphics manipulation programs and libraries
DescPort: <<
Change by J-F Mertens: pnmtopng.c extracted from old version of netpbm
- since the one in the current version does not work with, e.g., latex2html
+ since the one in the current version does not work with, e.g., latex2html.
+
+ Patches for gcc 4.0 compatibility thanks to Matt Sachs.
<<
License: OSI-Approved
Homepage: http://netpbm.sourceforge.net
Index: netpbm.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics/netpbm.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- netpbm.info 12 Dec 2004 13:49:49 -0000 1.4
+++ netpbm.info 7 Oct 2005 17:57:20 -0000 1.5
@@ -1,7 +1,7 @@
Package: netpbm
Version: 9.25
-Revision: 13
-BuildDepends: libjpeg, libpng3, libtiff, gcc3.3
+Revision: 14
+BuildDepends: libjpeg, libpng3, libtiff
Depends: %N-shlibs (= %v-%r), %N-bin
Replaces: netpbm (<< 9.25-1), netpbm10
Conflicts: netpbm10
@@ -13,7 +13,7 @@
SetMAKEFLAGS: -j1
CompileScript: <<
printf 'osx\n\n\n%p\n\n\n\n\n' | ./configure
-make CC="gcc-3.3" CXX="g++-3.3" LOCALBASE=%p JPEGLD="-L%p/lib -ljpeg"
PNGLD="-L%p/lib -lpng" TIFFLD="-L%p/lib -ltiff" -j1
+make LOCALBASE=%p JPEGLD="-L%p/lib -ljpeg" PNGLD="-L%p/lib -lpng"
TIFFLD="-L%p/lib -ltiff" -j1
<<
InstallScript: <<
printf '\n' | make install install.lib install.man install.hdr PREFIX=%i
INSTALLMANUALS1=%i/share/man/man1 INSTALLMANUALS3=%i/share/man/man3
INSTALLMANUALS5=%i/share/man/man5
@@ -40,6 +40,9 @@
<<
DocFiles: COPYRIGHT.PATENT HISTORY Netpbm.programming README
Description: Graphics manipulation programs and libraries
+DescPort: <<
+ Patches for gcc 4.0 compatibility thanks to Matt Sachs.
+<<
License: OSI-Approved
Homepage: http://netpbm.sourceforge.net
Maintainer: Dave Morrison <[EMAIL PROTECTED]>
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
