mingw64-i686-djvulibre 3.5.27 master
authorYaakov Selkowitz <yselkowi@redhat.com>
Tue, 3 May 2016 22:59:33 +0000 (17:59 -0500)
committerYaakov Selkowitz <yselkowi@redhat.com>
Tue, 3 May 2016 22:59:33 +0000 (17:59 -0500)
3.5.25.3-dllexport.patch [deleted file]
3.5.27-dllexport.patch [new file with mode: 0644]
mingw64-i686-djvulibre.cygport

diff --git a/3.5.25.3-dllexport.patch b/3.5.25.3-dllexport.patch
deleted file mode 100644 (file)
index c41b3fa..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
---- origsrc/djvulibre-3.5.25/configure.ac      2012-05-07 21:56:53.000000000 -0500
-+++ src/djvulibre-3.5.25/configure.ac  2014-02-11 01:10:20.982015300 -0600
-@@ -71,7 +71,7 @@ AC_SUBST(DLLFLAGS)
- case "$host" in
-   *-mingw32)
-      DLLFLAGS="$DLLFLAGS -Wl,--export-all-symbols"
--     LIBS=-lmsvcp60
-+     LIBS="$LIBS -lmsvcp60"
-   ;;
-   *-darwin* | *-macos10*)
-      if test -d /opt/local ; then
---- origsrc/djvulibre-3.5.25/libdjvu/DjVuGlobal.h      2012-05-07 21:56:53.000000000 -0500
-+++ src/djvulibre-3.5.25/libdjvu/DjVuGlobal.h  2014-02-11 00:55:41.727982900 -0600
-@@ -73,9 +73,9 @@ inline void * operator new(size_t, void
- #endif
- #ifdef WIN32
--# ifdef DLL_EXPORT
-+# if defined(INSIDE_DJVU) && defined(DLL_EXPORT)
- #  define DJVUAPI __declspec(dllexport)
--# else
-+# elif !defined(INSIDE_DJVU)
- #  define DJVUAPI __declspec(dllimport)
- # endif
- #endif
---- origsrc/djvulibre-3.5.25/libdjvu/Makefile.in       2012-05-07 21:56:53.000000000 -0500
-+++ src/djvulibre-3.5.25/libdjvu/Makefile.in   2014-02-11 01:21:04.279415800 -0600
-@@ -40,7 +40,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
- LIBTOOL = @LIBTOOL@
--DEFS = @DEFS@
-+DEFS = @DEFS@ -DINSIDE_DJVU
- OPTS = @OPTS@
- CXXRPOFLAGS = @CXXRPOFLAGS@
- JPEG_LIBS=@JPEG_LIBS@
---- origsrc/djvulibre-3.5.25/libdjvu/ddjvuapi.h        2012-05-07 21:56:53.000000000 -0500
-+++ src/djvulibre-3.5.25/libdjvu/ddjvuapi.h    2014-02-11 00:58:25.558580500 -0600
-@@ -70,9 +70,9 @@ extern "C" {
- #ifndef DDJVUAPI
- # ifdef WIN32
--#  ifdef DLL_EXPORT
-+#  if defined(INSIDE_DJVU) && defined(DLL_EXPORT)
- #   define DDJVUAPI __declspec(dllexport)
--#  else
-+#  elif !defined(INSIDE_DJVU)
- #   define DDJVUAPI __declspec(dllimport)
- #  endif
- # endif
---- origsrc/djvulibre-3.5.25/libdjvu/miniexp.h 2012-05-07 21:56:53.000000000 -0500
-+++ src/djvulibre-3.5.25/libdjvu/miniexp.h     2014-02-11 01:01:42.983859300 -0600
-@@ -28,9 +28,9 @@ extern "C" {
- #ifndef MINILISPAPI
- # ifdef WIN32
--#  ifdef DLL_EXPORT
-+#  if defined(INSIDE_DJVU) && defined(DLL_EXPORT)
- #   define MINILISPAPI __declspec(dllexport)
--#  else
-+#  elif !defined(INSIDE_DJVU)
- #   define MINILISPAPI __declspec(dllimport)
- #  endif
- # endif
diff --git a/3.5.27-dllexport.patch b/3.5.27-dllexport.patch
new file mode 100644 (file)
index 0000000..03cc0d1
--- /dev/null
@@ -0,0 +1,10 @@
+--- origsrc/djvulibre-3.5.27/libdjvu/Makefile.am       2015-02-10 21:02:19.000000000 -0600
++++ src/djvulibre-3.5.27/libdjvu/Makefile.am   2016-05-03 17:19:25.955284500 -0500
+@@ -33,6 +33,7 @@ libdjvulibre_la_LIBADD = $(JPEG_LIBS) $(
+ libdjvulibre_la_LDFLAGS = -no-undefined -version-info $(version_info)
+ if HAVE_OS_WIN32
++libdjvulibre_la_CPPFLAGS += -DDJVUAPI_EXPORT -DDDJVUAPI_EXPORT -DMINILISPAPI_EXPORT
+ libdjvulibre_la_LDFLAGS += -Wl,--export-all-symbols
+ endif
index f43012621ed30f5dc1249c4c4c11f055ccf3bb5e..44e06c82c2a218b07faab5c3b5c658748f87e1c6 100644 (file)
@@ -2,8 +2,8 @@ CROSS_HOST="i686-w64-mingw32"
 inherit cross
 
 NAME="mingw64-i686-djvulibre"
-VERSION=3.5.25.3
-RELEASE=2
+VERSION=3.5.27
+RELEASE=1
 CATEGORY="Devel"
 SUMMARY="DjVu document library for Win32 toolchain"
 DESCRIPTION="DjVu is a set of compression technologies, a file format, and a
@@ -11,8 +11,8 @@ software platform for the delivery over the Web of digital documents, scanned
 documents, and high resolution images."
 HOMEPAGE="http://djvu.sourceforge.net/"
 SRC_URI="mirror://sourceforge/djvu/djvulibre-${VERSION}.tar.gz"
-SRC_DIR="djvulibre-${VERSION%.*}"
-PATCH_URI="3.5.25.3-dllexport.patch"
+SRC_DIR="djvulibre-${VERSION}"
+PATCH_URI="3.5.27-dllexport.patch"
 
 DISTCLEANFILES="aclocal.m4 config/l*.m4"
 ACLOCAL_FLAGS="-I config"
@@ -23,18 +23,18 @@ src_compile() {
 
        cd ${B}
        cygconf \
+               --disable-static \
+               --disable-desktopfiles \
                --disable-xmltools \
                --with-jpeg \
                --with-tiff \
-               --disable-djview --without-qt \
-               --enable-threads=pthread \
                LIBS=-liconv
        cygmake
 }
 
 src_install() {
        cd ${B}
-       cygmake install-libdjvu DESTDIR=${D}
+       cyginstall bin_PROGRAMS= dist_bin_SCRIPTS= dist_man1_MANS=
 }
 
 KEEP_LA_FILES="none"
This page took 0.045765 seconds and 5 git commands to generate.