Mon Aug 9 11:05:55 2010 UTC ()
update to 3.5.22, from Ryo ONODERA per PR pkg/43711
changes: Various bug fixes

(tested the lib part with evince)


(drochner)
diff -r1.8 -r1.9 pkgsrc/graphics/djvulibre-lib/Makefile
diff -r1.6 -r1.7 pkgsrc/graphics/djvulibre-lib/distinfo
diff -r1.4 -r1.5 pkgsrc/graphics/djvulibre-lib/patches/patch-ad
diff -r1.8 -r1.9 pkgsrc/graphics/djvulibre-tools/Makefile
cvs diff -r1.8 -r1.9 pkgsrc/graphics/djvulibre-lib/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/djvulibre-lib/Makefile 2010/01/18 09:58:57 1.8
+++ pkgsrc/graphics/djvulibre-lib/Makefile 2010/08/09 11:05:54 1.9
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: Makefile,v 1.8 2010/01/18 09:58:57 wiz Exp $ 1# $NetBSD: Makefile,v 1.9 2010/08/09 11:05:54 drochner Exp $
2 2
3DISTNAME= djvulibre-3.5.21 3DISTNAME= djvulibre-3.5.22
4PKGNAME= djvulibre-lib-3.5.21 4PKGNAME= djvulibre-lib-3.5.22
5PKGREVISION= 3 
6CATEGORIES= graphics 5CATEGORIES= graphics
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=djvu/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=djvu/}
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://djvulibre.djvuzone.org/ 9HOMEPAGE= http://djvulibre.djvuzone.org/
11COMMENT= Compression library for scanned documents 10COMMENT= Compression library for scanned documents
 11LICENSE= gnu-gpl-v2
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= pkg-config 17USE_TOOLS+= pkg-config
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19 19
20PKGCONFIG_OVERRIDE+= libdjvu/ddjvuapi.pc.in 20PKGCONFIG_OVERRIDE+= libdjvu/ddjvuapi.pc.in
21BUILD_DIRS= libdjvu 21BUILD_DIRS= libdjvu
22INSTALL_DIRS= libdjvu 22INSTALL_DIRS= libdjvu
23 23
24.include "../../mk/bsd.prefs.mk" 24.include "../../mk/bsd.prefs.mk"
cvs diff -r1.6 -r1.7 pkgsrc/graphics/djvulibre-lib/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/djvulibre-lib/distinfo 2009/02/20 10:52:56 1.6
+++ pkgsrc/graphics/djvulibre-lib/distinfo 2010/08/09 11:05:54 1.7
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.6 2009/02/20 10:52:56 drochner Exp $ 1$NetBSD: distinfo,v 1.7 2010/08/09 11:05:54 drochner Exp $
2 2
3SHA1 (djvulibre-3.5.21.tar.gz) = a6ef5cb1445baa333883754c703abd75cc5b34f6 3SHA1 (djvulibre-3.5.22.tar.gz) = f869d4114052a7df7b8da2d334d124934f1293a6
4RMD160 (djvulibre-3.5.21.tar.gz) = 2163b784d705cc7b55bb3d9c9eb85edec44f28a7 4RMD160 (djvulibre-3.5.22.tar.gz) = f74cec88c5fbda28976e64669d3e48833b4dfdcd
5Size (djvulibre-3.5.21.tar.gz) = 2993718 bytes 5Size (djvulibre-3.5.22.tar.gz) = 3027985 bytes
6SHA1 (patch-aa) = c819c6b1218b3178983bb48e53c4d3c0f7dd0227 6SHA1 (patch-aa) = c819c6b1218b3178983bb48e53c4d3c0f7dd0227
7SHA1 (patch-ab) = 5e8f6d3b925da3a2a09b87a05d2b9564f9c2e7b4 7SHA1 (patch-ab) = 5e8f6d3b925da3a2a09b87a05d2b9564f9c2e7b4
8SHA1 (patch-ac) = 0c713031903aade12eda1d898595798a1468fd0a 8SHA1 (patch-ac) = 0c713031903aade12eda1d898595798a1468fd0a
9SHA1 (patch-ad) = 66b149594453d70afd47ed03e6067d6356288191 9SHA1 (patch-ad) = 1b95453c92b365a8b2f960c02d65570387dc54a0
cvs diff -r1.4 -r1.5 pkgsrc/graphics/djvulibre-lib/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/graphics/djvulibre-lib/patches/Attic/patch-ad 2009/02/20 10:52:57 1.4
+++ pkgsrc/graphics/djvulibre-lib/patches/Attic/patch-ad 2010/08/09 11:05:55 1.5
@@ -1,51 +1,52 @@ @@ -1,51 +1,52 @@
1$NetBSD: patch-ad,v 1.4 2009/02/20 10:52:57 drochner Exp $ 1$NetBSD: patch-ad,v 1.5 2010/08/09 11:05:55 drochner Exp $
2 2
3--- configure.orig 2008-07-03 00:43:52.000000000 +0200 3--- configure.orig 2009-05-21 15:15:50.000000000 +0000
4+++ configure 4+++ configure
5@@ -21069,13 +21069,12 @@ fi 5@@ -21124,13 +21124,12 @@ fi
6 for opt in $saved_CXXFLAGS ; do 6 for opt in $saved_CXXFLAGS ; do
7 case $opt in 7 case $opt in
8 -g*) test $ac_debug != no && OPTS="$OPTS $opt" ;; 8 -g*) test $ac_debug != no && OPTS="$OPTS $opt" ;;
9- -O*) ;; 9- -O*) ;;
10 *) CXXFLAGS="$CXXFLAGS $opt" ;; 10 *) CXXFLAGS="$CXXFLAGS $opt" ;;
11 esac 11 esac
12 done 12 done
13 for opt in $saved_CFLAGS ; do 13 for opt in $saved_CFLAGS ; do
14 case $opt in 14 case $opt in
15- -O*|-g*) ;; 15- -O*|-g*) ;;
16+ -g*) ;; 16+ -g*) ;;
17 *) CFLAGS="$CFLAGS $opt" ;; 17 *) CFLAGS="$CFLAGS $opt" ;;
18 esac 18 esac
19 done 19 done
20@@ -21107,7 +21106,6 @@ echo $ECHO_N "checking if $CXX accepts $ 20@@ -21162,7 +21161,6 @@ echo $ECHO_N "checking if $CXX accepts $
21 { echo "$as_me:$LINENO: result: yes" >&5 21 { echo "$as_me:$LINENO: result: yes" >&5
22 echo "${ECHO_T}yes" >&6; } 22 echo "${ECHO_T}yes" >&6; }
23 rm conftest.* 23 rm conftest.*
24- OPTS="$OPTS -O3" 24- OPTS="$OPTS -O3"
25 else 25 else
26 { echo "$as_me:$LINENO: result: no" >&5 26 { echo "$as_me:$LINENO: result: no" >&5
27 echo "${ECHO_T}no" >&6; } 27 echo "${ECHO_T}no" >&6; }
28@@ -21121,7 +21119,6 @@ echo $ECHO_N "checking if $CXX accepts $ 28@@ -21176,7 +21174,6 @@ echo $ECHO_N "checking if $CXX accepts $
29 { echo "$as_me:$LINENO: result: yes" >&5 29 { echo "$as_me:$LINENO: result: yes" >&5
30 echo "${ECHO_T}yes" >&6; } 30 echo "${ECHO_T}yes" >&6; }
31 rm conftest.* 31 rm conftest.*
32- OPTS="$OPTS -O2" 32- OPTS="$OPTS -O2"
33 else 33 else
34 { echo "$as_me:$LINENO: result: no" >&5 34 { echo "$as_me:$LINENO: result: no" >&5
35 echo "${ECHO_T}no" >&6; } 35 echo "${ECHO_T}no" >&6; }
36@@ -21162,7 +21159,6 @@ echo $ECHO_N "checking if $CXX accepts $ 36@@ -21217,7 +21214,6 @@ echo $ECHO_N "checking if $CXX accepts $
37 { echo "$as_me:$LINENO: result: yes" >&5 37 { echo "$as_me:$LINENO: result: yes" >&5
38 echo "${ECHO_T}yes" >&6; } 38 echo "${ECHO_T}yes" >&6; }
39 rm conftest.* 39 rm conftest.*
40- OPTS="$OPTS $opt" 40- OPTS="$OPTS $opt"
41 else 41 else
42 { echo "$as_me:$LINENO: result: no" >&5 42 { echo "$as_me:$LINENO: result: no" >&5
43 echo "${ECHO_T}no" >&6; } 43 echo "${ECHO_T}no" >&6; }
44@@ -21691,6 +21687,7 @@ main () 44@@ -27704,7 +27700,7 @@ fi
45 __sync_lock_test_and_set(&l,1); 45
46 __sync_lock_release(&l); 46
47 __sync_add_and_fetch(&l,1); 47 CFLAGS="$savedCFLAGS"
48+ __sync_bool_compare_and_swap(&l,0,1); 48- if test "$no_xt" == "yes" ; then
49 return 0; 49+ if test "$no_xt" = "yes" ; then
50 ; 50 { echo "$as_me:$LINENO: WARNING: Xt include files not found" >&5
51 return 0; 51 echo "$as_me: WARNING: Xt include files not found" >&2;}
 52 else
cvs diff -r1.8 -r1.9 pkgsrc/graphics/djvulibre-tools/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/djvulibre-tools/Makefile 2010/01/18 09:58:57 1.8
+++ pkgsrc/graphics/djvulibre-tools/Makefile 2010/08/09 11:05:55 1.9
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.8 2010/01/18 09:58:57 wiz Exp $ 1# $NetBSD: Makefile,v 1.9 2010/08/09 11:05:55 drochner Exp $
2 2
3DISTNAME= djvulibre-3.5.21 3DISTNAME= djvulibre-3.5.22
4PKGNAME= djvulibre-tools-3.5.21 4PKGNAME= djvulibre-tools-3.5.22
5PKGREVISION= 2 
6CATEGORIES= graphics 5CATEGORIES= graphics
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=djvu/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=djvu/}
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://djvulibre.djvuzone.org/ 9HOMEPAGE= http://djvulibre.djvuzone.org/
11COMMENT= Compression library for scanned documents 10COMMENT= Compression library for scanned documents
12 11
13PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
14 13
15PATCHDIR= ${.CURDIR}/../djvulibre-lib/patches 14PATCHDIR= ${.CURDIR}/../djvulibre-lib/patches
16DISTINFO_FILE= ${.CURDIR}/../djvulibre-lib/distinfo 15DISTINFO_FILE= ${.CURDIR}/../djvulibre-lib/distinfo
17 16
18USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++