From 2b0a17e0348fb6d687516cacc57ce50b7f31c160 Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Sun, 4 Mar 2012 14:10:44 +0100 Subject: [PATCH] switch to git djvulibre since 3.5.24 fails #26 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I'm using gcc version 4.6.3 (Debian 4.6.3-1) and git does compile while version 3.5.24 fails with: In file included from ../../libdjvu/GContainer.h:67:0, from ../../libdjvu/GContainer.cpp:63: ../../libdjvu/GSmartPointer.h:492:30: error: ‘size_t’ does not name a type ../../libdjvu/GSmartPointer.h:492:37: error: ISO C++ forbids declaration of ‘n’ with no type [-fpermissive] --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 074d59c62..8faea98d0 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ LUADIR=lua MUPDFDIR=mupdf -DJVUDIR=djvulibre-3.5.24 +DJVUDIR=djvulibre MUPDFTARGET=build/debug MUPDFLIBDIR=$(MUPDFDIR)/$(MUPDFTARGET) @@ -105,7 +105,6 @@ fetchthirdparty: -rm -Rf lsqlite3_svn08* -rm -Rf sqlite-amalgamation-3070900* -rm -Rf luafilesystem* - -rm -Rf djvulibre.tar.gz -rm -Rf $(DJVUDIR) git clone git://git.ghostscript.com/mupdf.git ( cd mupdf ; wget http://www.mupdf.com/download/mupdf-thirdparty.zip && unzip mupdf-thirdparty.zip ) @@ -113,7 +112,7 @@ fetchthirdparty: wget "http://lua.sqlite.org/index.cgi/zip/lsqlite3_svn08.zip?uuid=svn_8" && unzip "lsqlite3_svn08.zip?uuid=svn_8" wget "http://sqlite.org/sqlite-amalgamation-3070900.zip" && unzip sqlite-amalgamation-3070900.zip git clone https://github.com/keplerproject/luafilesystem.git - wget http://sourceforge.net/projects/djvu/files/latest/download\?source\=files -O djvulibre.tar.gz && tar xvzf djvulibre.tar.gz + git clone git://djvu.git.sourceforge.net/gitroot/djvu/djvulibre.git clean: -rm -f *.o kpdfview