Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/text
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11446
Modified Files:
djvulibre.info djvulibre.patch
Log Message:
doesn't seem to need xmkmf anymore; dep ugprades
Index: djvulibre.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/text/djvulibre.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- djvulibre.patch 9 Mar 2012 19:18:53 -0000 1.2
+++ djvulibre.patch 27 Jul 2013 05:56:17 -0000 1.3
@@ -1,5 +1,6 @@
---- djvulibre-3.5.24/configure.orig 2011-03-06 12:43:17.000000000 -0500
-+++ djvulibre-3.5.24/configure 2012-03-02 19:47:30.000000000 -0500
+diff -Nurd -x'*~' djvulibre-3.5.24.orig/configure djvulibre-3.5.24/configure
+--- djvulibre-3.5.24.orig/configure 2011-03-06 12:43:17.000000000 -0500
++++ djvulibre-3.5.24/configure 2013-07-27 01:45:39.000000000 -0400
@@ -18820,7 +18820,7 @@
NSDEJAVU_CFLAGS=${X_CFLAGS}
@@ -9,33 +10,9 @@
NSDEJAVU_LIBS="`echo ${X_LIBS} | sed -e 's/-lXext/-lXt -lXext/'`"
NSDEJAVU_LIBS="-no-undefined $NSDEJAVU_LIBS"
;;
---- djvulibre-3.5.24/gui/nsdejavu/Makefile.in.orig 2011-03-06
12:43:17.000000000 -0500
-+++ djvulibre-3.5.24/gui/nsdejavu/Makefile.in 2012-03-02 19:49:20.000000000
-0500
-@@ -52,7 +52,7 @@
- -I${top_srcdir}/gui/shared/res \
- -I${top_srcdir}/gui/npsdk
-
--CFLAGS = @CPPFLAGS@ ${DEFS} ${OPTS} ${INCS} ${NSDEJAVU_CFLAGS} ${GLIB_CFLAGS}
-+CFLAGS = ${DEFS} ${OPTS} ${INCS} ${NSDEJAVU_CFLAGS} @CPPFLAGS@ ${GLIB_CFLAGS}
-
- LIBS = @LDFLAGS@ ${NSDEJAVU_LIBS}
-
-diff -Nurd -x'*~' djvulibre-3.5.21.orig/tools/jb2cmp/Makefile.in
djvulibre-3.5.21/tools/jb2cmp/Makefile.in
---- djvulibre-3.5.21.orig/tools/jb2cmp/Makefile.in 2007-11-28
18:55:29.000000000 -0500
-+++ djvulibre-3.5.21/tools/jb2cmp/Makefile.in 2008-11-12 09:05:28.000000000
-0500
-@@ -49,8 +49,8 @@
- INCS = -I${top_builddir} -I${top_srcdir} -I${srcdir}
- FLAGS = ${DEFS} ${INCS} ${OPTS} ${THREAD_CFLAGS}
- LIBS= @LDFLAGS@ ${THREAD_LIBS} @LIBS@
--CFLAGS = @CPPFLAGS@ @CFLAGS@ ${FLAGS}
--CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ ${CXXRPOFLAGS} ${FLAGS}
-+CFLAGS = ${FLAGS} @CPPFLAGS@ @CFLAGS@
-+CXXFLAGS = ${FLAGS} @CPPFLAGS@ @CXXFLAGS@ ${CXXRPOFLAGS}
-
-
- OBJS = classify.o cuts.o frames.o patterns.o
---- djvulibre-3.5.24/gui/indep/utils/execdir.cpp.orig 2012-03-02
20:13:00.000000000 -0500
-+++ djvulibre-3.5.24/gui/indep/utils/execdir.cpp 2012-03-02
20:14:34.000000000 -0500
+diff -Nurd -x'*~' djvulibre-3.5.24.orig/gui/indep/utils/execdir.cpp
djvulibre-3.5.24/gui/indep/utils/execdir.cpp
+--- djvulibre-3.5.24.orig/gui/indep/utils/execdir.cpp 2011-03-06
12:43:17.000000000 -0500
++++ djvulibre-3.5.24/gui/indep/utils/execdir.cpp 2013-07-27
01:18:15.000000000 -0400
@@ -141,22 +141,22 @@
{
GURL url = GURL(file, paths[pos]);
@@ -65,8 +42,24 @@
if(url.is_file())
return url;
}
---- djvulibre-3.5.24/libdjvu/GContainer.h.orig 2012-03-02 20:24:55.000000000
-0500
-+++ djvulibre-3.5.24/libdjvu/GContainer.h 2012-03-02 20:27:59.000000000
-0500
+diff -Nurd -x'*~' djvulibre-3.5.24.orig/gui/nsdejavu/Makefile.in
djvulibre-3.5.24/gui/nsdejavu/Makefile.in
+--- djvulibre-3.5.24.orig/gui/nsdejavu/Makefile.in 2011-03-06
12:43:17.000000000 -0500
++++ djvulibre-3.5.24/gui/nsdejavu/Makefile.in 2013-07-27 01:18:15.000000000
-0400
+@@ -52,9 +52,9 @@
+ -I${top_srcdir}/gui/shared/res \
+ -I${top_srcdir}/gui/npsdk
+
+-CFLAGS = @CPPFLAGS@ ${DEFS} ${OPTS} ${INCS} ${NSDEJAVU_CFLAGS} ${GLIB_CFLAGS}
++CFLAGS = ${DEFS} ${OPTS} ${INCS} ${NSDEJAVU_CFLAGS} @CPPFLAGS@ ${GLIB_CFLAGS}
+
+-LIBS = @LDFLAGS@ ${NSDEJAVU_LIBS}
++LIBS = @LDFLAGS@ ${NSDEJAVU_LIBS} -lglib-2.0
+
+ all: nsdejavu.la nsdejavu.x nsdejavu.1
+
+diff -Nurd -x'*~' djvulibre-3.5.24.orig/libdjvu/GContainer.h
djvulibre-3.5.24/libdjvu/GContainer.h
+--- djvulibre-3.5.24.orig/libdjvu/GContainer.h 2011-03-06 12:43:17.000000000
-0500
++++ djvulibre-3.5.24/libdjvu/GContainer.h 2013-07-27 01:18:15.000000000
-0400
@@ -962,7 +962,7 @@
/** Inserts an element before the first element of the list.
The new element is initialized with a copy of argument #elt#. */
@@ -76,14 +69,191 @@
/** Inserts a new element after the list element at position #pos#. When
position #pos# is null the element is inserted at the beginning of the
list. The new element is initialized with a copy of #elt#. */
---- djvulibre-3.5.24/gui/nsdejavu/Makefile.in.orig 2012-03-02
20:49:11.000000000 -0500
-+++ djvulibre-3.5.24/gui/nsdejavu/Makefile.in 2012-03-02 20:51:34.000000000
-0500
-@@ -54,7 +54,7 @@
-
- CFLAGS = ${DEFS} ${OPTS} ${INCS} ${NSDEJAVU_CFLAGS} @CPPFLAGS@ ${GLIB_CFLAGS}
-
--LIBS = @LDFLAGS@ ${NSDEJAVU_LIBS}
-+LIBS = @LDFLAGS@ ${NSDEJAVU_LIBS} -lglib-2.0
+diff -Nurd -x'*~' djvulibre-3.5.24.orig/tools/jb2cmp/Makefile.in
djvulibre-3.5.24/tools/jb2cmp/Makefile.in
+--- djvulibre-3.5.24.orig/tools/jb2cmp/Makefile.in 2011-03-06
12:43:17.000000000 -0500
++++ djvulibre-3.5.24/tools/jb2cmp/Makefile.in 2013-07-27 01:18:15.000000000
-0400
+@@ -49,8 +49,8 @@
+ INCS = -I${top_builddir} -I${top_srcdir} -I${srcdir}
+ FLAGS = ${DEFS} ${INCS} ${OPTS} ${THREAD_CFLAGS}
+ LIBS= @LDFLAGS@ ${THREAD_LIBS} @LIBS@
+-CFLAGS = @CPPFLAGS@ @CFLAGS@ ${FLAGS}
+-CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ ${CXXRPOFLAGS} ${FLAGS}
++CFLAGS = ${FLAGS} @CPPFLAGS@ @CFLAGS@
++CXXFLAGS = ${FLAGS} @CPPFLAGS@ @CXXFLAGS@ ${CXXRPOFLAGS}
- all: nsdejavu.la nsdejavu.x nsdejavu.1
+ OBJS = classify.o cuts.o frames.o patterns.o
+diff -Nurd -x'*~' djvulibre-3.5.24.orig/tools/tiff2pdf.c
djvulibre-3.5.24/tools/tiff2pdf.c
+--- djvulibre-3.5.24.orig/tools/tiff2pdf.c 2011-03-06 12:43:17.000000000
-0500
++++ djvulibre-3.5.24/tools/tiff2pdf.c 2013-07-27 01:41:20.000000000 -0400
+@@ -2116,7 +2116,7 @@
+ buffer= (unsigned char*)
_TIFFmalloc(t2p->tiff_datasize);
+ if(buffer==NULL){
+ TIFFError(TIFF2PDF_MODULE,
+- "Can't allocate %u bytes of memory for
t2p_readwrite_pdf_image, %s",
++ "Can't allocate %lu bytes of memory for
t2p_readwrite_pdf_image, %s",
+ t2p->tiff_datasize,
+ TIFFFileName(input));
+ t2p->t2p_error = T2P_ERR_ERROR;
+@@ -2138,7 +2138,7 @@
+ memset(buffer, 0, t2p->tiff_datasize);
+ if(buffer==NULL){
+ TIFFError(TIFF2PDF_MODULE,
+- "Can't allocate %u bytes of memory for
t2p_readwrite_pdf_image, %s",
++ "Can't allocate %lu bytes of memory for
t2p_readwrite_pdf_image, %s",
+ t2p->tiff_datasize,
+ TIFFFileName(input));
+ t2p->t2p_error = T2P_ERR_ERROR;
+@@ -2161,7 +2161,7 @@
+ memset(buffer, 0, t2p->tiff_datasize);
+ if(buffer==NULL){
+ TIFFError(TIFF2PDF_MODULE,
+- "Can't allocate %u bytes of
memory for t2p_readwrite_pdf_image, %s",
++ "Can't allocate %lu bytes of
memory for t2p_readwrite_pdf_image, %s",
+ t2p->tiff_datasize,
+ TIFFFileName(input));
+ t2p->t2p_error = T2P_ERR_ERROR;
+@@ -2220,7 +2220,7 @@
+ memset(buffer, 0, t2p->tiff_datasize);
+ if(buffer==NULL){
+ TIFFError(TIFF2PDF_MODULE,
+- "Can't allocate %u bytes of
memory for t2p_readwrite_pdf_image, %s",
++ "Can't allocate %lu bytes of
memory for t2p_readwrite_pdf_image, %s",
+ t2p->tiff_datasize,
+ TIFFFileName(input));
+ t2p->t2p_error = T2P_ERR_ERROR;
+@@ -2261,7 +2261,7 @@
+ memset(buffer, 0, t2p->tiff_datasize);
+ if(buffer==NULL){
+ TIFFError(TIFF2PDF_MODULE,
+- "Can't allocate %u bytes of memory for
t2p_readwrite_pdf_image, %s",
++ "Can't allocate %lu bytes of memory for
t2p_readwrite_pdf_image, %s",
+ t2p->tiff_datasize,
+ TIFFFileName(input));
+ t2p->t2p_error = T2P_ERR_ERROR;
+@@ -2322,7 +2322,7 @@
+ memset(buffer, 0, t2p->tiff_datasize);
+ if(buffer==NULL){
+ TIFFError(TIFF2PDF_MODULE,
+- "Can't allocate %u bytes of memory for
t2p_readwrite_pdf_image, %s",
++ "Can't allocate %lu bytes of memory for
t2p_readwrite_pdf_image, %s",
+ t2p->tiff_datasize,
+ TIFFFileName(input));
+ t2p->t2p_error = T2P_ERR_ERROR;
+@@ -2360,7 +2360,7 @@
+ memset(buffer, 0, t2p->tiff_datasize);
+ if(buffer==NULL){
+ TIFFError(TIFF2PDF_MODULE,
+- "Can't allocate %u bytes of memory for
t2p_readwrite_pdf_image, %s",
++ "Can't allocate %lu bytes of memory for
t2p_readwrite_pdf_image, %s",
+ t2p->tiff_datasize,
+ TIFFFileName(input));
+ t2p->t2p_error = T2P_ERR_ERROR;
+@@ -2369,7 +2369,7 @@
+ samplebuffer = (unsigned char*) _TIFFmalloc(stripsize);
+ if(samplebuffer==NULL){
+ TIFFError(TIFF2PDF_MODULE,
+- "Can't allocate %u bytes of memory for
t2p_readwrite_pdf_image, %s",
++ "Can't allocate %lu bytes of memory for
t2p_readwrite_pdf_image, %s",
+ t2p->tiff_datasize,
+ TIFFFileName(input));
+ t2p->t2p_error = T2P_ERR_ERROR;
+@@ -2409,7 +2409,7 @@
+ memset(buffer, 0, t2p->tiff_datasize);
+ if(buffer==NULL){
+ TIFFError(TIFF2PDF_MODULE,
+- "Can't allocate %u bytes of memory for
t2p_readwrite_pdf_image, %s",
++ "Can't allocate %lu bytes of memory for
t2p_readwrite_pdf_image, %s",
+ t2p->tiff_datasize,
+ TIFFFileName(input));
+ t2p->t2p_error = T2P_ERR_ERROR;
+@@ -2442,7 +2442,7 @@
+ t2p->tiff_datasize * t2p->tiff_samplesperpixel);
+ if(samplebuffer==NULL){
+ TIFFError(TIFF2PDF_MODULE,
+- "Can't allocate %u bytes of memory for
t2p_readwrite_pdf_image, %s",
++ "Can't allocate %lu bytes of memory for
t2p_readwrite_pdf_image, %s",
+ t2p->tiff_datasize,
+ TIFFFileName(input));
+ t2p->t2p_error = T2P_ERR_ERROR;
+@@ -2472,7 +2472,7 @@
+ t2p->tiff_width*t2p->tiff_length*4);
+ if(samplebuffer==NULL){
+ TIFFError(TIFF2PDF_MODULE,
+- "Can't allocate %u bytes of memory for
t2p_readwrite_pdf_image, %s",
++ "Can't allocate %lu bytes of memory for
t2p_readwrite_pdf_image, %s",
+ t2p->tiff_datasize,
+ TIFFFileName(input));
+ t2p->t2p_error = T2P_ERR_ERROR;
+@@ -2658,7 +2658,7 @@
+ buffer= (unsigned char*)
_TIFFmalloc(t2p->tiff_datasize);
+ if(buffer==NULL){
+ TIFFError(TIFF2PDF_MODULE,
+- "Can't allocate %u bytes of memory "
++ "Can't allocate %lu bytes of memory "
+ "for t2p_readwrite_pdf_image_tile,
%s",
+ t2p->tiff_datasize,
+ TIFFFileName(input));
+@@ -2679,7 +2679,7 @@
+ buffer= (unsigned char*)
_TIFFmalloc(t2p->tiff_datasize);
+ if(buffer==NULL){
+ TIFFError(TIFF2PDF_MODULE,
+- "Can't allocate %u bytes of memory "
++ "Can't allocate %lu bytes of memory "
+ "for t2p_readwrite_pdf_image_tile,
%s",
+ t2p->tiff_datasize,
+ TIFFFileName(input));
+@@ -2708,7 +2708,7 @@
+ buffer=(unsigned char*) _TIFFmalloc(t2p->tiff_datasize);
+ if(buffer==NULL){
+ TIFFError(TIFF2PDF_MODULE,
+- "Can't allocate %u bytes of memory "
++ "Can't allocate %lu bytes of memory "
+ "for t2p_readwrite_pdf_image, %s",
+ t2p->tiff_datasize,
+ TIFFFileName(input));
+@@ -2748,7 +2748,7 @@
+ buffer= (unsigned char*)
_TIFFmalloc(t2p->tiff_datasize);
+ if(buffer==NULL){
+ TIFFError(TIFF2PDF_MODULE,
+- "Can't allocate %u bytes of memory "
++ "Can't allocate %lu bytes of memory "
+ "for t2p_readwrite_pdf_image_tile,
%s",
+ t2p->tiff_datasize,
+ TIFFFileName(input));
+@@ -2791,7 +2791,7 @@
+ buffer = (unsigned char*) _TIFFmalloc(t2p->tiff_datasize);
+ if(buffer==NULL){
+ TIFFError(TIFF2PDF_MODULE,
+- "Can't allocate %u bytes of memory for "
++ "Can't allocate %lu bytes of memory for "
+ "t2p_readwrite_pdf_image_tile, %s",
+ t2p->tiff_datasize,
+ TIFFFileName(input));
+@@ -2824,7 +2824,7 @@
+ buffer = (unsigned char*)
_TIFFmalloc(t2p->tiff_datasize);
+ if(buffer==NULL){
+ TIFFError(TIFF2PDF_MODULE,
+- "Can't allocate %u bytes of memory "
++ "Can't allocate %lu bytes of memory "
+ "for t2p_readwrite_pdf_image_tile,
%s",
+ t2p->tiff_datasize,
+ TIFFFileName(input));
+@@ -2834,7 +2834,7 @@
+ samplebuffer = (unsigned char*)
_TIFFmalloc(t2p->tiff_datasize);
+ if(samplebuffer==NULL){
+ TIFFError(TIFF2PDF_MODULE,
+- "Can't allocate %u bytes of memory "
++ "Can't allocate %lu bytes of memory "
+ "for t2p_readwrite_pdf_image_tile,
%s",
+ t2p->tiff_datasize,
+ TIFFFileName(input));
+@@ -2873,7 +2873,7 @@
+ buffer = (unsigned char*)
_TIFFmalloc(t2p->tiff_datasize);
+ if(buffer==NULL){
+ TIFFError(TIFF2PDF_MODULE,
+- "Can't allocate %u bytes of memory "
++ "Can't allocate %lu bytes of memory "
+ "for t2p_readwrite_pdf_image_tile,
%s",
+ t2p->tiff_datasize,
+ TIFFFileName(input));
Index: djvulibre.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/text/djvulibre.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- djvulibre.info 24 Mar 2012 18:07:42 -0000 1.4
+++ djvulibre.info 27 Jul 2013 05:56:17 -0000 1.5
@@ -1,14 +1,34 @@
Package: djvulibre
+
+# qt3 viewer dropped as of 3.5.25 in this upstream pkg (just the
+# library remains)--qt4 viewer is separate upstream pkg
Version: 3.5.24
-Revision: 1001
+
+Revision: 1002
GCC: 4.0
Source: mirror:sourceforge:djvu/%n-%v.tar.gz
Source-MD5: af83d27af5083198432a178d22b259c5
-BuildDepends: libiconv-dev, qt3 (>= 3.3.5-1023), x11-dev, libjpeg8, libtiff,
freetype219 (>= 2.3.7-7), xmkmf (>= 1.0.2-3), glib2-dev
+BuildDepends: <<
+ fink-package-precedence,
+ glib2-dev (>= 2.22.0-1),
+ libiconv-dev,
+ libjpeg9,
+ libtiff5,
+ qt3 (>= 3.3.5-1023),
+ x11-dev
+<<
BuildConflicts: djvulibre-dev
-Depends: libdjvulibre21-shlibs (>= %v-%r), qt3-shlibs (>= 3.3.5-1023), x11,
libtiff-shlibs, freetype219-shlibs (>= 2.3.7-7), glib2-shlibs
+Depends: <<
+ libdjvulibre21-shlibs (>= %v-%r),
+ glib2-shlibs (>= 2.22.0-1),
+ libiconv,
+ libjpeg9-shlibs,
+ libtiff5-shlibs,
+ qt3-shlibs (>= 3.3.5-1023),
+ x11
+<<
PatchFile: %n.patch
-PatchFile-MD5: ed9b0be8a65cd54901155545af88e28d
+PatchFile-MD5: 564e5f588682a1412d5ab8b88050c423
PatchScript: <<
%{default_script}
perl -pi -e 's|/sw|%p|g' configure
@@ -17,20 +37,18 @@
<<
ConfigureParams: --mandir='${prefix}/share/man' -enable-djview
NoSetCPPFLAGS: true
-SetCPPFLAGS: -I%p/include -I/usr/X11R6/include
-NoSetMAKEFLAGS: true
-SetMAKEFLAGS: -j1
+SetCPPFLAGS: -I%p/include -I/usr/X11R6/include -MD
+# autoconf doesn't test this flag but the .dylib can use it if avail
+SetLIBS: -liconv
+UseMaxBuildJobs: false
DocFiles: NEWS README COPYING TODO COPYRIGHT INSTALL
CompileScript: <<
- #!/bin/sh -ev
- export PATH=%p/lib/xmkmf/bin:$PATH
- export IMAKEINCLUDE=-I%p/lib/X11/config
- ./configure %c
- make
+ %{default_script}
+ fink-package-precedence --depfile-ext='\.d'
--prohibit-bdep=libdjvulibre21-dev .
<<
SplitOff: <<
Package: libdjvulibre21-shlibs
- Depends: libjpeg8-shlibs, libiconv
+ Depends: libjpeg9-shlibs, libiconv
Files: lib/libdjvulibre.*.dylib
Shlibs: %p/lib/libdjvulibre.21.dylib 25.0.0 %n (>= 3.5.21-1)
DocFiles: NEWS README COPYING TODO COPYRIGHT INSTALL
@@ -55,5 +73,7 @@
libs so that all symbols are defined (good idea even not on
windows)
-Patched for clang by Jack Howarth.
+ Patched for clang by Jack Howarth.
+
+ dmacks: clear printf type-mismatch warnings in tiff2pdf.c
<<
------------------------------------------------------------------------------
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
