Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/text
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv2581

Modified Files:
        djvulibre.info 
Added Files:
        djvulibre.patch libdjvulibre15-shlibs.info 
Log Message:
latest libversion from unstable


--- NEW FILE: djvulibre.patch ---
diff -Nurd -x'*~' djvulibre-3.5.21.orig/configure djvulibre-3.5.21/configure
--- djvulibre-3.5.21.orig/configure     2008-07-02 18:43:52.000000000 -0400
+++ djvulibre-3.5.21/configure  2008-11-12 09:30:17.000000000 -0500
@@ -27343,12 +27343,8 @@
 if test x$ac_enable_djview != xno
 then
  NSDEJAVU_CFLAGS=${X_CFLAGS}
- case "$host" in
- *-cygwin* | *-mingw*)
    NSDEJAVU_LIBS="`echo ${X_LIBS} | sed -e 's/-lXext/-lXt -lXext/'`"
    NSDEJAVU_LIBS="-no-undefined $NSDEJAVU_LIBS"
-   ;;
- esac
 fi
 
 
diff -Nurd -x'*~' djvulibre-3.5.21.orig/gui/nsdejavu/Makefile.in 
djvulibre-3.5.21/gui/nsdejavu/Makefile.in
--- djvulibre-3.5.21.orig/gui/nsdejavu/Makefile.in      2007-04-20 
12:44:23.000000000 -0400
+++ djvulibre-3.5.21/gui/nsdejavu/Makefile.in   2008-11-12 09:09:27.000000000 
-0500
@@ -51,7 +51,7 @@
  -I${top_srcdir}/gui/shared/res \
  -I${top_srcdir}/gui/npsdk 
 
-CFLAGS = @CPPFLAGS@ ${DEFS} ${OPTS} ${INCS} ${NSDEJAVU_CFLAGS} 
+CFLAGS = ${DEFS} ${OPTS} ${INCS} ${NSDEJAVU_CFLAGS} @CPPFLAGS@
 
 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

Index: djvulibre.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/text/djvulibre.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- djvulibre.info      11 Nov 2008 21:55:47 -0000      1.4
+++ djvulibre.info      22 Oct 2010 20:30:51 -0000      1.5
@@ -1,45 +1,57 @@
 Package: djvulibre
-Version: 3.5.18
-Revision: 1001
+Version: 3.5.21
+Revision: 1002
 GCC: 4.0
 Source: mirror:sourceforge:djvu/%n-%v.tar.gz
-Source-MD5: 73fd6d4f92832b85a91529b7bb3b7710
-BuildDepends: libiconv-dev, qt3 (>= 3.3.5-1023), x11-dev, libjpeg, libtiff, 
freetype219, xmkmf (>= 1.0.2-3)
+Source-MD5: 4c6f3eb03ffbd067b6d2fe2344b0d9ad
+BuildDepends: libiconv-dev, qt3 (>= 3.3.5-1023), x11-dev, libjpeg, libtiff, 
freetype219 (>= 2.3.7-7), xmkmf (>= 1.0.2-3), fink(>= 0.24.12-1)
 BuildConflicts: djvulibre-dev
-Depends: libdjvulibre15-shlibs (>= %v-%r), qt3-shlibs (>= 3.3.5-1023), x11, 
libtiff-shlibs
-CompileScript: <<
- #!/bin/sh -ev
- export PATH=%p/lib/xmkmf/bin:$PATH
- export IMAKEINCLUDE=-I%p/lib/X11/config
- ./configure %c
- make
-<<
+Depends: libdjvulibre21-shlibs (>= %v-%r), qt3-shlibs (>= 3.3.5-1023), x11, 
libtiff-shlibs, freetype219-shlibs (>= 2.3.7-7)
+PatchFile: %n.patch
+PatchFile-MD5: b7f6e31edef4983415956883cba505c7
 PatchScript: <<
+ %{default_script}
  perl -pi -e 's|/sw|%p|g' configure
+ perl -pi -e 's/__powerpc__./__powerpc__) || defined(__POWERPC__)/' 
gui/npsdk/prcpucfg.h
 <<
 ConfigureParams: --mandir='${prefix}/share/man'
-SetLDFLAGS: -framework OpenGL -dylib_file 
/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
-SetCPPFLAGS: -I/usr/X11R6/include
+SetLDFLAGS: -Wl,-framework,OpenGL 
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+NoSetCPPFLAGS: true
+SetCPPFLAGS: -I%p/include -I/usr/X11R6/include
 NoSetMAKEFLAGS: true
 SetMAKEFLAGS: -j1
 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
+<<
 SplitOff: <<
- Package: libdjvulibre15-shlibs
+ Package: libdjvulibre21-shlibs
  Depends: libjpeg-shlibs, libiconv
  Files: lib/libdjvulibre.*.dylib
- Shlibs: %p/lib/libdjvulibre.15.dylib 19.0.0 %n (>= 3.5.18-1)
+ Shlibs: %p/lib/libdjvulibre.21.dylib 22.0.0 %n (>= 3.5.21-1)
  DocFiles: NEWS README COPYING TODO COPYRIGHT INSTALL
  <<
 SplitOff2: <<
- Package: libdjvulibre15-dev
- Depends: libdjvulibre15-shlibs (= %v-%r)
- Conflicts: djvulibre-dev
- Replaces: djvulibre-dev
+ Package: libdjvulibre21-dev
+ Depends: libdjvulibre21-shlibs (= %v-%r)
+ Conflicts: djvulibre, djvulibre-dev, libdjvulibre15-dev, libdjvulibre21-dev
+ Replaces: djvulibre, djvulibre-dev, libdjvulibre15-dev, libdjvulibre21-dev
  BuildDependsOnly: True
- Files: include lib/libdjvulibre.dylib lib/libdjvulibre.la
+ Files: include lib/libdjvulibre.dylib lib/libdjvulibre.la lib/pkgconfig
  DocFiles: NEWS README COPYING TODO COPYRIGHT INSTALL 
 <<
 Description: Free viewer for DjVu files
 Maintainer:  Dave Morrison <[email protected]>
 License: GPL
 Homepage: http://www.djvuzone.org
+DescPort: <<
+       dmacks: made sure local -I come before global
+
+       dmacks: make sure loadable module links against all its dep
+       libs so that all symbols are defined (good idea even not on
+       windows)
+<<

--- NEW FILE: libdjvulibre15-shlibs.info ---
Package: libdjvulibre15-shlibs
Version: 3.5.20
Revision: 1003
GCC: 4.0
Source: mirror:sourceforge:djvu/djvulibre-%v.tar.gz
Source-MD5: c94091de014b3aaf037d3d0f398d36c2
BuildDepends: libiconv-dev, qt3 (>= 3.3.5-1023), x11-dev, libjpeg, libtiff, 
freetype219 (>= 2.3.7-7), xmkmf (>= 1.0.2-3)
BuildConflicts: djvulibre-dev
Depends: libjpeg-shlibs, libiconv
PatchScript: <<
 perl -pi -e 's|/sw|%p|g' configure
 perl -pi -e 's/__powerpc__./__powerpc__) || defined(__POWERPC__)/' 
gui/npsdk/prcpucfg.h
<<
ConfigureParams: --mandir='${prefix}/share/man'
SetLDFLAGS: -framework OpenGL -dylib_file 
/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
NoSetCPPFLAGS: true
SetCPPFLAGS: -I%p/include -I/usr/X11R6/include
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
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
<<
InstallScript: <<
 make install prefix=%i
 rm -R %i/bin %i/lib/netscape %i/share/djvu %i/share/man
<<
Shlibs: %p/lib/libdjvulibre.15.dylib 21.0.0 %n (>= 3.5.20-1)
SplitOff2: <<
 Package: libdjvulibre15-dev
 Depends: libdjvulibre15-shlibs (= %v-%r)
 Conflicts: djvulibre, djvulibre-dev, libdjvulibre21-dev
 Replaces: djvulibre, djvulibre-dev, libdjvulibre21-dev
 BuildDependsOnly: True
 Files: include lib/libdjvulibre.dylib lib/libdjvulibre.la lib/pkgconfig
 DocFiles: NEWS README COPYING TODO COPYRIGHT INSTALL 
<<
Description: Free viewer for DjVu files
Maintainer:  Dave Morrison <[email protected]>
License: GPL
Homepage: http://www.djvuzone.org


------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in  U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store 
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to