Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6002
Modified Files:
netpbm11-shlibs.info
Added Files:
netpbm10-shlibs.info netpbm10-shlibs.patch
Removed Files:
netpbm10.info netpbm10.patch
Log Message:
kill off netpbm10 (BDO component pkg): old libversion completely unused
kill off netpbm-bin: have it as part of netpbm11 suite (reduces dep tree here)
--- netpbm10.patch DELETED ---
--- NEW FILE: netpbm10-shlibs.patch ---
diff -Naur netpbm-10.47.44-orig/Makefile.config.fink
netpbm-10.47.44/Makefile.config.fink
--- netpbm-10.47.44-orig/Makefile.config.fink 1969-12-31 19:00:00.000000000
-0500
+++ netpbm-10.47.44/Makefile.config.fink 2013-06-03 10:45:10.000000000
-0400
@@ -0,0 +1,22 @@
+#
+# Configuration for fink
+# Copied from a manual run of ./configure (plus some additions)
+
+DEFAULT_TARGET = nonmerge
+NETPBMLIBTYPE = dylib
+NETPBMLIBSUFFIX = dylib
+STATICLIB_TOO = n
+NETPBMLIB_RUNTIME_PATH = @PREFIX@/lib
+CC = cc -no-cpp-precomp
+CFLAGS = -O3 -ffast-math -pedantic -fno-common -Wall -Wno-uninitialized
-Wmissing-declarations -Wimplicit -Wwrite-strings -Wmissing-prototypes -Wundef
-MD
+CFLAGS_SHLIB = -fno-common
+LDSHLIB = -dynamiclib -install_name
$(NETPBMLIB_RUNTIME_PATH)/libnetpbm.$(MAJ).dylib -compatibility_version
$$(($(MAJ)+1)) -current_version $$(($(MAJ)+1)).$(MIN)
+LINKERISCOMPILER = Y
+CFLAGS_SHLIB += -fPIC
+TIFFLIB = libtiff.dylib
+JPEGLIB = libjpeg.dylib
+PNGLIB = libpng.dylib
+ZLIB = libz.dylib
+JBIGLIB = libjbig.dylib
+JASPERLIB = libjasper.dylib
+
diff -Naur netpbm-10.47.44-orig/buildtools/installnetpbm.pl
netpbm-10.47.44/buildtools/installnetpbm.pl
--- netpbm-10.47.44-orig/buildtools/installnetpbm.pl 2013-06-03
10:18:28.000000000 -0400
+++ netpbm-10.47.44/buildtools/installnetpbm.pl 2013-06-03 10:48:01.000000000
-0400
@@ -117,7 +117,7 @@
} elsif ($ENV{OSTYPE} && $ENV{OSTYPE} eq "msdosdjgpp") {
$default = "/dev/env/DJDIR";
} else {
- $default = "/usr/local/netpbm";
+ $default = "@PREFIX@";
}
my $response = prompt("install prefix", $default);
@@ -584,7 +584,7 @@
my $manDir;
while (!$manDir) {
- my $default = "$prefix/man";
+ my $default = "$prefix/share/man";
my $response = prompt("man page directory", $default);
@@ -783,9 +783,9 @@
print("\n");
- removeObsoleteManPage($manDir);
+# removeObsoleteManPage($manDir);
- makeInManwebPath("$manDir/web");
+# makeInManwebPath("$manDir/web");
$$mandirR = $manDir;
}
diff -Naur netpbm-10.47.44-orig/converter/other/pnmtopng.c
netpbm-10.47.44/converter/other/pnmtopng.c
--- netpbm-10.47.44-orig/converter/other/pnmtopng.c 2013-06-03
10:18:31.000000000 -0400
+++ netpbm-10.47.44/converter/other/pnmtopng.c 2013-06-03 10:49:18.000000000
-0400
@@ -529,7 +529,7 @@
unsigned int * const bestMatchP) {
unsigned int paletteIndex;
- unsigned int bestIndex;
+ unsigned int bestIndex = 0;
unsigned int bestMatch;
assert(paletteSize > 0);
@@ -1464,9 +1464,9 @@
colorhist_vector chv;
unsigned int colors;
- gray * alphas_of_color[MAXPALETTEENTRIES];
+ gray * alphas_of_color[MAXPALETTEENTRIES + 1];
unsigned int alphas_first_index[MAXPALETTEENTRIES];
- unsigned int alphas_of_color_cnt[MAXPALETTEENTRIES];
+ unsigned int alphas_of_color_cnt[MAXPALETTEENTRIES + 1];
getChv(ifP, rasterPos, cols, rows, maxval, format, MAXCOLORS,
&chv, &colors);
@@ -2385,7 +2385,7 @@
/* The color part of the color/alpha palette passed to the PNG
compressor
*/
- unsigned int palette_size;
+ unsigned int palette_size = MAXCOLORS;
gray trans_pnm[MAXCOLORS];
png_byte trans[MAXCOLORS];
diff -Naur netpbm-10.47.44-orig/pm_config.in.h netpbm-10.47.44/pm_config.in.h
--- netpbm-10.47.44-orig/pm_config.in.h 2013-06-03 10:18:34.000000000 -0400
+++ netpbm-10.47.44/pm_config.in.h 2013-06-03 10:51:28.000000000 -0400
@@ -61,8 +61,8 @@
#define RGB_DB_PATH \
-"/usr/share/netpbm/rgb.txt:" \
+"@PREFIX@/share/netpbm/rgb.txt:" \
"/usr/lib/X11/rgb.txt:" \
-"/usr/share/X11/rgb.txt:" \
+"/usr/X11/share/X11/rgb.txt:" \
"/usr/X11R6/lib/X11/rgb.txt"
/* CONFIGURE: This is the name of an environment variable that tells
Index: netpbm11-shlibs.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/netpbm11-shlibs.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- netpbm11-shlibs.info 30 Jul 2013 20:09:30 -0000 1.4
+++ netpbm11-shlibs.info 8 Aug 2013 04:44:55 -0000 1.5
@@ -19,7 +19,7 @@
Source: http://www.snaggledworks.com/fink/src/netpbm-%v.tar.bz2
Source-MD5: cb3ba5df38090b5964f1ec6531a0008a
Source-Checksum: SHA1(1d2daa089027c7475237b9b2ef0af54d7d3e7a7e)
-#NoSetMAKEFLAGS: true
+#UseMaxBuildJobs: false
#NoSetLDFLAGS: true
#SetLIBRARY_PATH: %p/lib
PatchFile: %n.patch
--- NEW FILE: netpbm10-shlibs.info ---
Package: netpbm10-shlibs
Version: 10.47.45
Revision: 6
### 10.[78] migrated to netpbm11 before 10.9...no need to keep
### dragging this old libversion, which is now only the -shlibs for
### legacy use anyway, forward beyond that
Distribution: 10.7, 10.8
Description: Graphics manipulation programs and libraries
License: OSI-Approved
Maintainer: Hanspeter Niederstrasser <nie...@users.sourceforge.net>
BuildDepends: <<
fink-package-precedence
<<
Conflicts: netpbm (<< 9.25-1), netpbm10 (<< 10.47.45-4)
Replaces: netpbm10 (<< 10.47.45-4)
Source: http://www.snaggledworks.com/fink/src/netpbm-%v.tar.bz2
Source-MD5: 4be834374a2254edc2203ecbf726af6d
Source-Checksum: SHA1(d7dc010aee17a4a71f86252f2631507dc108dc92)
UseMaxBuildJobs: false
NoSetLDFLAGS: true
SetLIBRARY_PATH: %p/lib
PatchFile: %n.patch
PatchFile-MD5: 9db143091ceddcad05150ec01fdc75ba
PatchScript: <<
sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
cat config.mk.in Makefile.config.fink >config.mk
<<
CompileScript: <<
make PRODUCT_SUBDIRS=lib SUPPORT_SUBDIRS=
fink-package-precedence --depfile-ext='\.d'
--prohibit-bdep=netpbm,netpbm10,netpbm11 .
<<
InstallScript: <<
# upstream has a custom install system and hand-written
# makefiles, but all we want is the .dylib, so heck with
# upstream and do it simply ourselves
mkdir -p %i/lib
cp lib/libnetpbm.10.47.dylib %i/lib
ln -s libnetpbm.10.47.dylib %i/lib/libnetpbm.10.dylib
<<
Shlibs: %p/lib/libnetpbm.10.dylib 11.0.0 %n (>= 10.12-1)
DocFiles: README doc/*
DescPort: <<
Security patches thanks to Tomoaki Okayama:
CVE-2005-2978: netpbm-10.26.12-pnmtopng-CAN-2005-2978.patch (from SUSE)
CVE-2005-3662: netpbm-10.26.12-pnmtopng-overflow.patch (from SUSE)
<<
Homepage: http://netpbm.sourceforge.net
DescPackaging: <<
Originally packaged by Masanori Sekino.
Previously maintained by: Dave Morrison <d...@finkproject.org>
Tarball generated with these commands:
svn checkout -r 1960 http://svn.code.sf.net/p/netpbm/code/stable/
netpbm-10.47.45
tar cfj netpbm-10.47.45.tar.bz2 netpbm-10.47.45
nieder:
Change from 'super stable' to 'stable' trees.
'Stable' tree fails with libpng15, so keep at libpng14 for now.
Reorganize man* to put into proper SplitOff.
Move data files from %p/lib to %p/share/netpbm and transfer to -bin SplitOff.
This matches Debian's layout.
dmacks:
Turn off the BDO and -bin packages of this old libversion
Don't bother self-testing because that uses the CLI component
(netpbm-bin) that we have scrapped here.
<<
--- netpbm10.info DELETED ---
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
