From f3908f8ad87a54f875ac726ba12806c1c7498084 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sat, 9 Apr 2016 12:55:06 +0200 Subject: djvulibre: consolidate patches --- src/djvulibre-1-fixes.patch | 281 +++++++++++++++++++++++++++++++ src/djvulibre-1-skip-desktopfiles.patch | 16 -- src/djvulibre-2-exe-file-extension.patch | 144 ---------------- src/djvulibre-3-precision.patch | 93 ---------- 4 files changed, 281 insertions(+), 253 deletions(-) create mode 100644 src/djvulibre-1-fixes.patch delete mode 100644 src/djvulibre-1-skip-desktopfiles.patch delete mode 100644 src/djvulibre-2-exe-file-extension.patch delete mode 100644 src/djvulibre-3-precision.patch diff --git a/src/djvulibre-1-fixes.patch b/src/djvulibre-1-fixes.patch new file mode 100644 index 0000000..eba6e5e --- /dev/null +++ b/src/djvulibre-1-fixes.patch @@ -0,0 +1,281 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: darealshinji +Date: Sat, 9 Apr 2016 12:50:15 +0200 +Subject: [PATCH] skip desktopfiles + +Desktop files not needed for MXE. + +diff --git a/Makefile.in b/Makefile.in +index 1111111..2222222 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -32,7 +32,7 @@ SUBDIRS_FIRST = libdjvu tools + @XML_YES@SUBDIRS_XML = xmltools + @XML_NO@SUBDIRS_XML = + +-SUBDIRS_LAST = desktopfiles ++@DESKTOP_YES@SUBDIRS_LAST = desktopfiles + + SUBDIRS = ${SUBDIRS_FIRST} ${SUBDIRS_XML} ${SUBDIRS_I18N} ${SUBDIRS_LAST} + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: darealshinji +Date: Sat, 9 Apr 2016 12:50:50 +0200 +Subject: [PATCH] Add .exe to binary filenames + + +diff --git a/tools/Makefile.in b/tools/Makefile.in +index 1111111..2222222 100644 +--- a/tools/Makefile.in ++++ b/tools/Makefile.in +@@ -28,6 +28,8 @@ datadir = @datadir@ + libdir = @libdir@ + mandir = @mandir@ + ++EXEEXT = @EXEEXT@ ++ + CC = @CC@ + CXX = @CXX@ + RM = @RM@ +@@ -60,10 +62,10 @@ CXXFLAGS = ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@ + + SUBDIRS = jb2cmp + +-PROGRAMS = bzz c44 cjb2 cpaldjvu csepdjvu \ +- ddjvu djvm djvmcvt djvudump \ +- djvups djvuextract djvumake \ +- djvused djvutxt djvuserve ++PROGRAMS = bzz$(EXEEXT) c44$(EXEEXT) cjb2$(EXEEXT) cpaldjvu$(EXEEXT) csepdjvu$(EXEEXT) \ ++ ddjvu$(EXEEXT) djvm$(EXEEXT) djvmcvt$(EXEEXT) djvudump$(EXEEXT) \ ++ djvups$(EXEEXT) djvuextract$(EXEEXT) djvumake$(EXEEXT) \ ++ djvused$(EXEEXT) djvutxt$(EXEEXT) djvuserve$(EXEEXT) + + SCRIPTS = djvudigital any2djvu + +@@ -117,63 +119,63 @@ annotate: annotate.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} annotate.o ${LIBDJVU} ${LIBS} + +-bzz: bzz.o ++bzz$(EXEEXT): bzz.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} bzz.o ${LIBDJVU} ${LIBS} + +-c44: c44.o ++c44$(EXEEXT): c44.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} c44.o ${LIBDJVU} ${LIBS} + +-cjb2: cjb2.o ${JB2OBJS} ++cjb2$(EXEEXT): cjb2.o ${JB2OBJS} + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} cjb2.o ${JB2OBJS} ${LIBDJVU} ${MORELIBS} + +-cpaldjvu: cpaldjvu.o ${JB2OBJS} ++cpaldjvu$(EXEEXT): cpaldjvu.o ${JB2OBJS} + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} cpaldjvu.o ${JB2OBJS} ${LIBDJVU} ${LIBS} + +-csepdjvu: csepdjvu.o ${JB2OBJS} ++csepdjvu$(EXEEXT): csepdjvu.o ${JB2OBJS} + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} csepdjvu.o ${JB2OBJS} ${LIBDJVU} ${LIBS} + +-ddjvu: ddjvu.o tiff2pdf.o ++ddjvu$(EXEEXT): ddjvu.o tiff2pdf.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} ddjvu.o tiff2pdf.o ${LIBDJVU} ${MORELIBS} + +-djvm: djvm.o ++djvm$(EXEEXT): djvm.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvm.o ${LIBDJVU} ${LIBS} + +-djvmcvt: djvmcvt.o ++djvmcvt$(EXEEXT): djvmcvt.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvmcvt.o ${LIBDJVU} ${LIBS} + +-djvudump: djvudump.o ++djvudump$(EXEEXT): djvudump.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvudump.o ${LIBDJVU} ${LIBS} + +-djvups: djvups.o ++djvups$(EXEEXT): djvups.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvups.o ${LIBDJVU} ${LIBS} + +-djvuextract: djvuextract.o ++djvuextract$(EXEEXT): djvuextract.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvuextract.o ${LIBDJVU} ${LIBS} + +-djvumake: djvumake.o ++djvumake$(EXEEXT): djvumake.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvumake.o ${LIBDJVU} ${LIBS} + +-djvused: djvused.o ++djvused$(EXEEXT): djvused.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvused.o ${LIBDJVU} ${LIBS} + +-djvutxt: djvutxt.o ++djvutxt$(EXEEXT): djvutxt.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvutxt.o ${LIBDJVU} ${LIBS} + +-djvuserve: djvuserve.o ++djvuserve$(EXEEXT): djvuserve.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvuserve.o ${LIBDJVU} ${LIBS} + +diff --git a/xmltools/Makefile.in b/xmltools/Makefile.in +index 1111111..2222222 100644 +--- a/xmltools/Makefile.in ++++ b/xmltools/Makefile.in +@@ -28,6 +28,8 @@ datadir = @datadir@ + libdir = @libdir@ + mandir = @mandir@ + ++EXEEXT = @EXEEXT@ ++ + CC = @CC@ + CXX = @CXX@ + RM = @RM@ +@@ -55,7 +57,7 @@ LIBS= @LDFLAGS@ @LIBS@ + CFLAGS = ${FLAGS} @CPPFLAGS@ @CFLAGS@ + CXXFLAGS = ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@ + +-PROGRAMS = djvutoxml djvuxmlparser ++PROGRAMS = djvutoxml$(EXEEXT) djvuxmlparser$(EXEEXT) + + all: ${PROGRAMS} djvuxml.1 + +@@ -97,11 +99,11 @@ djvuxml.1: ${srcdir}/djvuxml.1.in + sed < ${srcdir}/djvuxml.1.in > djvuxml.1 \ + -e 's,DATADIR,${datadir},' + +-djvutoxml: djvutoxml.o ++djvutoxml$(EXEEXT): djvutoxml.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvutoxml.o ${LIBDJVU} ${LIBS} + +-djvuxmlparser: djvuxmlparser.o ++djvuxmlparser$(EXEEXT): djvuxmlparser.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvuxmlparser.o ${LIBDJVU} ${LIBS} + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: darealshinji +Date: Sat, 9 Apr 2016 12:52:55 +0200 +Subject: [PATCH] precision + +Source: https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-djvulibre + +diff --git a/libdjvu/DjVuPort.cpp b/libdjvu/DjVuPort.cpp +index 1111111..2222222 100644 +--- a/libdjvu/DjVuPort.cpp ++++ b/libdjvu/DjVuPort.cpp +@@ -466,11 +466,11 @@ DjVuPortcaster::compute_closure(const DjVuPort * src, GPList &list, bo + // Sort in depth order + int max_dist=0; + for(pos=set;pos;++pos) +- if (max_dist < (int)(long)set[pos]) +- max_dist = (int)(long)set[pos]; ++ if (max_dist < (int)(size_t)set[pos]) ++ max_dist = (int)(size_t)set[pos]; + GArray > lists(0,max_dist); + for(pos=set;pos;++pos) +- lists[(int)(long)set[pos]].append(set.key(pos)); ++ lists[(int)(size_t)set[pos]].append(set.key(pos)); + for(int dist=0;dist<=max_dist;dist++) + for(pos=lists[dist];pos;++pos) + { +diff --git a/libdjvu/GBitmap.cpp b/libdjvu/GBitmap.cpp +index 1111111..2222222 100644 +--- a/libdjvu/GBitmap.cpp ++++ b/libdjvu/GBitmap.cpp +@@ -469,7 +469,7 @@ GBitmap::share() + { + if (!monitorptr) + { +- unsigned long x = (unsigned long)this; ++ size_t x = (size_t)this; + monitorptr = &monitors[(x^(x>>5)) % NMONITORS]; + } + } +diff --git a/libdjvu/GContainer.h b/libdjvu/GContainer.h +index 1111111..2222222 100644 +--- a/libdjvu/GContainer.h ++++ b/libdjvu/GContainer.h +@@ -178,7 +178,7 @@ hash(const unsigned long & x) + static inline unsigned int + hash(const void * const & x) + { +- return (unsigned long) x; ++ return (unsigned long)((size_t) x); + } + + /** Hashing function (float). */ +diff --git a/libdjvu/IW44EncodeCodec.cpp b/libdjvu/IW44EncodeCodec.cpp +index 1111111..2222222 100644 +--- a/libdjvu/IW44EncodeCodec.cpp ++++ b/libdjvu/IW44EncodeCodec.cpp +@@ -310,7 +310,7 @@ static const int d16[] = {16,16}; + static inline void + mmx_fv_1 ( short* &q, short* e, int s, int s3 ) + { +- while (q djvuxml.1 \ - -e 's,DATADIR,${datadir},' - --djvutoxml: djvutoxml.o -+djvutoxml$(EXEEXT): djvutoxml.o - ${LIBTOOL} --mode=link \ - ${CXX} -o $@ ${CXXFLAGS} djvutoxml.o ${LIBDJVU} ${LIBS} - --djvuxmlparser: djvuxmlparser.o -+djvuxmlparser$(EXEEXT): djvuxmlparser.o - ${LIBTOOL} --mode=link \ - ${CXX} -o $@ ${CXXFLAGS} djvuxmlparser.o ${LIBDJVU} ${LIBS} - diff --git a/src/djvulibre-3-precision.patch b/src/djvulibre-3-precision.patch deleted file mode 100644 index 0d63f2b..0000000 --- a/src/djvulibre-3-precision.patch +++ /dev/null @@ -1,93 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Source: https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-djvulibre - ---- a/libdjvu/DjVuPort.cpp -+++ b/libdjvu/DjVuPort.cpp -@@ -466,11 +466,11 @@ - // Sort in depth order - int max_dist=0; - for(pos=set;pos;++pos) -- if (max_dist < (int)(long)set[pos]) -- max_dist = (int)(long)set[pos]; -+ if (max_dist < (int)(size_t)set[pos]) -+ max_dist = (int)(size_t)set[pos]; - GArray > lists(0,max_dist); - for(pos=set;pos;++pos) -- lists[(int)(long)set[pos]].append(set.key(pos)); -+ lists[(int)(size_t)set[pos]].append(set.key(pos)); - for(int dist=0;dist<=max_dist;dist++) - for(pos=lists[dist];pos;++pos) - { ---- a/libdjvu/GBitmap.cpp -+++ b/libdjvu/GBitmap.cpp -@@ -469,7 +469,7 @@ - { - if (!monitorptr) - { -- unsigned long x = (unsigned long)this; -+ size_t x = (size_t)this; - monitorptr = &monitors[(x^(x>>5)) % NMONITORS]; - } - } ---- a/libdjvu/GContainer.h -+++ b/libdjvu/GContainer.h -@@ -178,7 +178,7 @@ - static inline unsigned int - hash(const void * const & x) - { -- return (unsigned long) x; -+ return (unsigned long)((size_t) x); - } - - /** Hashing function (float). */ ---- a/libdjvu/IW44EncodeCodec.cpp -+++ b/libdjvu/IW44EncodeCodec.cpp -@@ -310,7 +310,7 @@ - static inline void - mmx_fv_1 ( short* &q, short* e, int s, int s3 ) - { -- while (q