Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5426d721e04fecc4eeed03950bec7751bb4acec3
commit 5426d721e04fecc4eeed03950bec7751bb4acec3
Author: crazy <[EMAIL PROTECTED]>
Date: Thu Dec 6 21:56:18 2007 +0100
djvulibre-3.5.20-1-i686
* Version bump
* merged and rediffed the patch(es)
diff --git a/source/xlib/djvulibre/FrugalBuild
b/source/xlib/djvulibre/FrugalBuild
index 1e9b9d1..58c7970 100644
--- a/source/xlib/djvulibre/FrugalBuild
+++ b/source/xlib/djvulibre/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: crazy <[EMAIL PROTECTED]>
pkgname=djvulibre
-pkgver=3.5.19
-pkgrel=2
+pkgver=3.5.20
+pkgrel=1
pkgdesc="DjVu is a web-centric format for distributing documents and images."
depends=('libtiff' 'libjpeg')
makedepends=('kdelibs' 'gnome-mime-data' 'gnome-icon-theme' 'htop' 'xdg-utils')
@@ -16,7 +16,7 @@ _F_sourceforge_broken_up2date=1
_F_sourceforge_mirror="mesh"
Finclude sourceforge
url="http://djvulibre.djvuzone.org/";
-source=([EMAIL PROTECTED] head_-n1.patch fix-all-FLAGS.patch)
+source=([EMAIL PROTECTED] autotools-fixes.patch)
subpkgs=('djview')
subdescs=('DjVu viewer for qt and mozilla plugins.')
@@ -58,8 +58,7 @@ build()
Fsplit djview usr/share/djvu/djview3
}
-sha1sums=('439977e03c8c35ca74eb5887993edb317923133f'\
- 'df699c98fae73de45fb68bc6a7fe12d30a5c87bf'\
- 'd39c386e650c3c50b45bb5ec7fc3198c7d3a1eb1')
+sha1sums=('88ec94512f3f7845b42c2585f75e07a9cf147380' \
+ 'cc8bd12bc51a616a322819bb033c43dd489fff4e')
# optimization OK
diff --git a/source/xlib/djvulibre/autotools-fixes.patch
b/source/xlib/djvulibre/autotools-fixes.patch
new file mode 100644
index 0000000..c217ee3
--- /dev/null
+++ b/source/xlib/djvulibre/autotools-fixes.patch
@@ -0,0 +1,105 @@
+diff -Naur djvulibre-3.5.20/configure.ac djvulibre-3.5.20-p/configure.ac
+--- djvulibre-3.5.20/configure.ac 2007-11-29 00:46:44.000000000 +0100
++++ djvulibre-3.5.20-p/configure.ac 2007-12-06 21:17:12.000000000 +0100
+@@ -387,7 +387,7 @@
+ else
+ AC_MSG_CHECKING([g++ version])
+ changequote(<<, >>)dnl
+- cxxver="`$CXX --version | head -1 |
++ cxxver="`$CXX --version | head -n 1 |
+ sed -e 's/^.*[^0-9.]\([2-4]\.[0-9.]*\).*$/\1/'`"
+ changequote([, ])dnl
+ AC_MSG_RESULT($cxxver)
+diff -Naur djvulibre-3.5.20/gui/bin2cpp/Makefile.in
djvulibre-3.5.20-p/gui/bin2cpp/Makefile.in
+--- djvulibre-3.5.20/gui/bin2cpp/Makefile.in 2007-04-20 18:44:23.000000000
+0200
++++ djvulibre-3.5.20-p/gui/bin2cpp/Makefile.in 2007-12-06 21:17:05.000000000
+0100
+@@ -47,10 +47,10 @@
+ LIBDJVU = ${top_builddir}/libdjvu/libdjvulibre.la
+
+ INCS = -I${top_builddir} -I${top_srcdir}/libdjvu -I${srcdir}
+-FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
++FLAGS = ${DEFS} ${INCS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
+ LIBS= @LDFLAGS@ ${JPEG_LIBS} ${THREAD_LIBS} @LIBS@
+-CFLAGS = @CPPFLAGS@ @CFLAGS@ ${FLAGS}
+-CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ ${FLAGS}
++CFLAGS += @CPPFLAGS@ @CFLAGS@ ${FLAGS}
++CXXFLAGS += @CPPFLAGS@ @CXXFLAGS@ ${FLAGS}
+
+ PROGRAMS = bin2cpp
+
+diff -Naur djvulibre-3.5.20/gui/nsdejavu/Makefile.in
djvulibre-3.5.20-p/gui/nsdejavu/Makefile.in
+--- djvulibre-3.5.20/gui/nsdejavu/Makefile.in 2007-04-20 18:44:23.000000000
+0200
++++ djvulibre-3.5.20-p/gui/nsdejavu/Makefile.in 2007-12-06
21:17:05.000000000 +0100
+@@ -51,7 +51,7 @@
+ -I${top_srcdir}/gui/shared/res \
+ -I${top_srcdir}/gui/npsdk
+
+-CFLAGS = @CPPFLAGS@ ${DEFS} ${OPTS} ${INCS} ${NSDEJAVU_CFLAGS}
++CFLAGS += @CPPFLAGS@ ${DEFS} ${INCS} ${NSDEJAVU_CFLAGS}
+
+ LIBS = @LDFLAGS@ ${NSDEJAVU_LIBS}
+
+diff -Naur djvulibre-3.5.20/libdjvu/Makefile.in
djvulibre-3.5.20-p/libdjvu/Makefile.in
+--- djvulibre-3.5.20/libdjvu/Makefile.in 2007-05-19 05:07:34.000000000
+0200
++++ djvulibre-3.5.20-p/libdjvu/Makefile.in 2007-12-06 21:16:34.000000000
+0100
+@@ -53,7 +53,7 @@
+ LIBDJVU_VER = @LIBDJVU_VER@
+
+ INCS = -I${top_builddir} -I${srcdir}
+-FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
++FLAGS = ${DEFS} ${INCS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
+ LIBS= @LDFLAGS@ ${JPEG_LIBS} ${THREAD_LIBS} @LIBS@
+ CFLAGS = ${FLAGS} @CPPFLAGS@ @CFLAGS@
+ CXXFLAGS = ${FLAGS} ${CXXPICFLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
+diff -Naur djvulibre-3.5.20/tools/jb2cmp/Makefile.in
djvulibre-3.5.20-p/tools/jb2cmp/Makefile.in
+--- djvulibre-3.5.20/tools/jb2cmp/Makefile.in 2007-11-29 00:55:29.000000000
+0100
++++ djvulibre-3.5.20-p/tools/jb2cmp/Makefile.in 2007-12-06
21:17:05.000000000 +0100
+@@ -47,10 +47,10 @@
+ THREAD_CFLAGS = @THREAD_CFLAGS@
+
+ INCS = -I${top_builddir} -I${top_srcdir} -I${srcdir}
+-FLAGS = ${DEFS} ${INCS} ${OPTS} ${THREAD_CFLAGS}
++FLAGS = ${DEFS} ${INCS} ${THREAD_CFLAGS}
+ LIBS= @LDFLAGS@ ${THREAD_LIBS} @LIBS@
+-CFLAGS = @CPPFLAGS@ @CFLAGS@ ${FLAGS}
+-CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ ${CXXRPOFLAGS} ${FLAGS}
++CFLAGS += @CPPFLAGS@ @CFLAGS@ ${FLAGS}
++CXXFLAGS += @CPPFLAGS@ @CXXFLAGS@ ${CXXRPOFLAGS} ${FLAGS}
+
+
+ OBJS = classify.o cuts.o frames.o patterns.o
+diff -Naur djvulibre-3.5.20/tools/Makefile.in
djvulibre-3.5.20-p/tools/Makefile.in
+--- djvulibre-3.5.20/tools/Makefile.in 2007-04-20 18:44:24.000000000 +0200
++++ djvulibre-3.5.20-p/tools/Makefile.in 2007-12-06 21:17:05.000000000
+0100
+@@ -52,11 +52,11 @@
+ LIBDJVU = ${top_builddir}/libdjvu/libdjvulibre.la
+
+ INCS = -I${top_builddir} -I${top_srcdir} -I${top_srcdir}/libdjvu -I${srcdir}
+-FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${TIFF_CFLAGS} ${THREAD_CFLAGS}
++FLAGS = ${DEFS} ${INCS} ${JPEG_CFLAGS} ${TIFF_CFLAGS} ${THREAD_CFLAGS}
+ LIBS= @LDFLAGS@ ${JPEG_LIBS} ${THREAD_LIBS} @LIBS@
+ MORELIBS= @LDFLAGS@ ${JPEG_LIBS} ${TIFF_LIBS} ${THREAD_LIBS} @LIBS@
+-CFLAGS = ${FLAGS} @CPPFLAGS@ @CFLAGS@
+-CXXFLAGS = ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
++CFLAGS += ${FLAGS} @CPPFLAGS@ @CFLAGS@
++CXXFLAGS += ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
+
+ SUBDIRS = jb2cmp
+
+diff -Naur djvulibre-3.5.20/xmltools/Makefile.in
djvulibre-3.5.20-p/xmltools/Makefile.in
+--- djvulibre-3.5.20/xmltools/Makefile.in 2007-09-17 08:23:41.000000000
+0200
++++ djvulibre-3.5.20-p/xmltools/Makefile.in 2007-12-06 21:17:05.000000000
+0100
+@@ -50,10 +50,10 @@
+ LIBDJVU = ${top_builddir}/libdjvu/libdjvulibre.la
+
+ INCS = -I${top_builddir} -I${top_srcdir}/libdjvu -I${srcdir}
+-FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
++FLAGS = ${DEFS} ${INCS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
+ LIBS= @LDFLAGS@ ${JPEG_LIBS} ${THREAD_LIBS} @LIBS@
+-CFLAGS = ${FLAGS} @CPPFLAGS@ @CFLAGS@
+-CXXFLAGS = ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
++CFLAGS += ${FLAGS} @CPPFLAGS@ @CFLAGS@
++CXXFLAGS += ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
+
+ PROGRAMS = djvutoxml djvuxmlparser
+
diff --git a/source/xlib/djvulibre/fix-all-FLAGS.patch
b/source/xlib/djvulibre/fix-all-FLAGS.patch
deleted file mode 100644
index 548ab20..0000000
--- a/source/xlib/djvulibre/fix-all-FLAGS.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff -Naur djvulibre-3.5.19/gui/bin2cpp/Makefile.in
djvulibre-3.5.19-p/gui/bin2cpp/Makefile.in
---- djvulibre-3.5.19/gui/bin2cpp/Makefile.in 2007-03-25 22:48:22.000000000
+0200
-+++ djvulibre-3.5.19-p/gui/bin2cpp/Makefile.in 2007-04-20 14:57:06.000000000
+0200
-@@ -46,10 +46,10 @@
- LIBDJVU = ${top_builddir}/libdjvu/libdjvulibre.la
-
- INCS = -I${top_builddir} -I${top_srcdir}/libdjvu -I${srcdir}
--FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
-+FLAGS = ${DEFS} ${INCS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
- LIBS= @LDFLAGS@ ${JPEG_LIBS} ${THREAD_LIBS} @LIBS@
--CFLAGS = @CPPFLAGS@ @CFLAGS@ ${FLAGS}
--CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ ${FLAGS}
-+CFLAGS += @CPPFLAGS@ @CFLAGS@ ${FLAGS}
-+CXXFLAGS += @CPPFLAGS@ @CXXFLAGS@ ${FLAGS}
-
- PROGRAMS = bin2cpp
-
-diff -Naur djvulibre-3.5.19/gui/nsdejavu/Makefile.in
djvulibre-3.5.19-p/gui/nsdejavu/Makefile.in
---- djvulibre-3.5.19/gui/nsdejavu/Makefile.in 2007-03-25 22:48:24.000000000
+0200
-+++ djvulibre-3.5.19-p/gui/nsdejavu/Makefile.in 2007-04-20
14:57:36.000000000 +0200
-@@ -50,7 +50,7 @@
- -I${top_srcdir}/gui/shared/res \
- -I${top_srcdir}/gui/npsdk
-
--CFLAGS = @CPPFLAGS@ ${DEFS} ${OPTS} ${INCS} ${NSDEJAVU_CFLAGS}
-+CFLAGS += @CPPFLAGS@ ${DEFS} ${INCS} ${NSDEJAVU_CFLAGS}
-
- LIBS = @LDFLAGS@ ${NSDEJAVU_LIBS}
-
-diff -Naur djvulibre-3.5.19/libdjvu/Makefile.in
djvulibre-3.5.19-p/libdjvu/Makefile.in
---- djvulibre-3.5.19/libdjvu/Makefile.in 2007-03-25 22:48:34.000000000
+0200
-+++ djvulibre-3.5.19-p/libdjvu/Makefile.in 2007-04-20 14:58:07.000000000
+0200
-@@ -52,10 +52,10 @@
- LIBDJVU_VER = @LIBDJVU_VER@
-
- INCS = -I${top_builddir} -I${srcdir}
--FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
-+FLAGS = ${DEFS} ${INCS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
- LIBS= @LDFLAGS@ ${JPEG_LIBS} ${THREAD_LIBS} @LIBS@
--CFLAGS = ${FLAGS} @CPPFLAGS@ @CFLAGS@
--CXXFLAGS = ${FLAGS} ${CXXPICFLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
-+CFLAGS += ${FLAGS} @CPPFLAGS@ @CFLAGS@
-+CXXFLAGS += ${FLAGS} ${CXXPICFLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
-
- all: ${LIBDJVU_LA}
-
-diff -Naur djvulibre-3.5.19/tools/jb2cmp/Makefile.in
djvulibre-3.5.19-p/tools/jb2cmp/Makefile.in
---- djvulibre-3.5.19/tools/jb2cmp/Makefile.in 2007-03-25 22:48:36.000000000
+0200
-+++ djvulibre-3.5.19-p/tools/jb2cmp/Makefile.in 2007-04-20
14:58:30.000000000 +0200
-@@ -45,10 +45,10 @@
- THREAD_CFLAGS = @THREAD_CFLAGS@
-
- INCS = -I${top_builddir} -I${top_srcdir} -I${srcdir}
--FLAGS = ${DEFS} ${INCS} ${OPTS} ${THREAD_CFLAGS}
-+FLAGS = ${DEFS} ${INCS} ${THREAD_CFLAGS}
- LIBS= @LDFLAGS@ ${THREAD_LIBS} @LIBS@
--CFLAGS = @CPPFLAGS@ @CFLAGS@ ${FLAGS}
--CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ ${CXXRPOFLAGS} ${FLAGS}
-+CFLAGS += @CPPFLAGS@ @CFLAGS@ ${FLAGS}
-+CXXFLAGS += @CPPFLAGS@ @CXXFLAGS@ ${CXXRPOFLAGS} ${FLAGS}
-
-
- OBJS = classify.o cuts.o frames.o patterns.o
-diff -Naur djvulibre-3.5.19/tools/Makefile.in
djvulibre-3.5.19-p/tools/Makefile.in
---- djvulibre-3.5.19/tools/Makefile.in 2007-03-25 22:48:35.000000000 +0200
-+++ djvulibre-3.5.19-p/tools/Makefile.in 2007-04-20 14:58:55.000000000
+0200
-@@ -51,11 +51,11 @@
- LIBDJVU = ${top_builddir}/libdjvu/libdjvulibre.la
-
- INCS = -I${top_builddir} -I${top_srcdir} -I${top_srcdir}/libdjvu -I${srcdir}
--FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${TIFF_CFLAGS} ${THREAD_CFLAGS}
-+FLAGS = ${DEFS} ${INCS} ${JPEG_CFLAGS} ${TIFF_CFLAGS} ${THREAD_CFLAGS}
- LIBS= @LDFLAGS@ ${JPEG_LIBS} ${THREAD_LIBS} @LIBS@
- MORELIBS= @LDFLAGS@ ${JPEG_LIBS} ${TIFF_LIBS} ${THREAD_LIBS} @LIBS@
--CFLAGS = ${FLAGS} @CPPFLAGS@ @CFLAGS@
--CXXFLAGS = ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
-+CFLAGS += ${FLAGS} @CPPFLAGS@ @CFLAGS@
-+CXXFLAGS += ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
-
- SUBDIRS = jb2cmp
-
-diff -Naur djvulibre-3.5.19/xmltools/Makefile.in
djvulibre-3.5.19-p/xmltools/Makefile.in
---- djvulibre-3.5.19/xmltools/Makefile.in 2007-03-25 22:48:36.000000000
+0200
-+++ djvulibre-3.5.19-p/xmltools/Makefile.in 2007-04-20 14:59:16.000000000
+0200
-@@ -49,10 +49,10 @@
- LIBDJVU = ${top_builddir}/libdjvu/libdjvulibre.la
-
- INCS = -I${top_builddir} -I${top_srcdir}/libdjvu -I${srcdir}
--FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
-+FLAGS = ${DEFS} ${INCS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
- LIBS= @LDFLAGS@ ${JPEG_LIBS} ${THREAD_LIBS} @LIBS@
--CFLAGS = ${FLAGS} @CPPFLAGS@ @CFLAGS@
--CXXFLAGS = ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
-+CFLAGS += ${FLAGS} @CPPFLAGS@ @CFLAGS@
-+CXXFLAGS += ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
-
- PROGRAMS = djvutoxml djvuxmlparser
-
diff --git a/source/xlib/djvulibre/head_-n1.patch
b/source/xlib/djvulibre/head_-n1.patch
deleted file mode 100644
index 4ac69dd..0000000
--- a/source/xlib/djvulibre/head_-n1.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur djvulibre-3.5.17/configure djvulibre-3.5.17-p/configure
---- djvulibre-3.5.17/configure 2006-03-23 17:37:23.000000000 +0100
-+++ djvulibre-3.5.17-p/configure 2006-10-06 17:50:18.000000000 +0200
-@@ -26970,7 +26970,7 @@
- else
- echo "$as_me:$LINENO: checking g++ version" >&5
- echo $ECHO_N "checking g++ version... $ECHO_C" >&6
-- cxxver="`$CXX --version | head -1 |
-+ cxxver="`$CXX --version | head -n 1 |
- sed -e 's/^.*[^0-9.]\([2-4]\.[0-9.]*\).*$/\1/'`"
- echo "$as_me:$LINENO: result: $cxxver" >&5
- echo "${ECHO_T}$cxxver" >&6
-diff -Naur djvulibre-3.5.17/configure.ac djvulibre-3.5.17-p/configure.ac
---- djvulibre-3.5.17/configure.ac 2006-03-23 17:37:24.000000000 +0100
-+++ djvulibre-3.5.17-p/configure.ac 2006-10-06 17:50:18.000000000 +0200
-@@ -326,7 +326,7 @@
- else
- AC_MSG_CHECKING([g++ version])
- changequote(<<, >>)dnl
-- cxxver="`$CXX --version | head -1 |
-+ cxxver="`$CXX --version | head -n 1 |
- sed -e 's/^.*[^0-9.]\([2-4]\.[0-9.]*\).*$/\1/'`"
- changequote([, ])dnl
- AC_MSG_RESULT($cxxver)
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
