[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [emerge] portage/qt-libs/poppler: add patch for poppler tarball
From:       Patrick R. Spendrin <patrick () kdab ! com>
Date:       2015-12-10 11:57:51
Message-ID: E1a6zr5-0005jS-St () scm ! kde ! org
[Download RAW message or body]

Git commit 9404e74e7468f1a4a9522e3d16e3ee09add9ee3e by Patrick R. Spendrin.
Committed on 10/12/2015 at 11:57.
Pushed by sengels into branch 'master'.

add patch for poppler tarball

I will upstream patch soon hopefully.

M  +31   -3    portage/qt-libs/poppler/poppler-0.38.0-20151130.diff
M  +1    -1    portage/qt-libs/poppler/poppler.py

http://commits.kde.org/emerge/9404e74e7468f1a4a9522e3d16e3ee09add9ee3e

diff --git a/portage/qt-libs/poppler/poppler-0.38.0-20151130.diff \
b/portage/qt-libs/poppler/poppler-0.38.0-20151130.diff index b7833de..cf1df5e 100644
--- a/portage/qt-libs/poppler/poppler-0.38.0-20151130.diff
+++ b/portage/qt-libs/poppler/poppler-0.38.0-20151130.diff
@@ -1,11 +1,39 @@
 diff -Nrub -x '*~' -x '*\.orig' -x'*\.o' poppler-0.38.0.orig/config.h.cmake \
                poppler-0.38.0/config.h.cmake
 --- poppler-0.38.0.orig/config.h.cmake	2015-10-28 23:11:49.000000000 +0100
-+++ poppler-0.38.0/config.h.cmake	2015-11-30 11:36:47.305064800 +0100
-@@ -232,3 +232,6 @@
++++ poppler-0.38.0/config.h.cmake	2015-12-08 23:42:24.499813200 +0100
+@@ -222,6 +222,7 @@
+ /* MS has defined snprintf as deprecated */
+ #ifdef _MSC_VER
+ #define snprintf _snprintf
++#include <algorithm>
+ #endif
+ 
+ /* Number of bits in a file offset, on hosts where this is settable. */
+@@ -232,3 +233,6 @@
  
  /* Define for large files, on AIX-style hosts. */
  /* TODO This is wrong, port if needed #undef _LARGE_FILES */
 +
 +#cmakedefine HAVE_STRCAT_S 1
 +#cmakedefine HAVE_STRCPY_S 1
-\ Kein Zeilenumbruch am Dateiende.
+\ No newline at end of file
+diff -Nrub -x '*~' -x '*\.orig' -x'*\.o' \
poppler-0.38.0.orig/poppler/poppler-config.h.cmake \
poppler-0.38.0/poppler/poppler-config.h.cmake +--- \
poppler-0.38.0.orig/poppler/poppler-config.h.cmake	2015-10-05 16:04:39.000000000 \
+0200 ++++ poppler-0.38.0/poppler/poppler-config.h.cmake	2015-12-08 \
23:40:24.572953800 +0100 +@@ -160,6 +160,7 @@
+ #include <windef.h>
+ #else
+ #define CDECL
++#define WIN32_LEAN_AND_MEAN 1
+ #endif
+ 
+ #if defined(_WIN32)
+@@ -186,7 +187,7 @@
+ #define GCC_PRINTF_FORMAT(fmt_index, va_index)
+ #endif
+ 
+-#if defined(_MSC_VER)
++#if defined(_MSC_VER) && _MSC_VER <= 1600
+ #define fmax(a, b) std::max(a, b)
+ #define fmin(a, b) std::min(a, b)
+ #endif
diff --git a/portage/qt-libs/poppler/poppler.py b/portage/qt-libs/poppler/poppler.py
index b9ee074..6f02647 100644
--- a/portage/qt-libs/poppler/poppler.py
+++ b/portage/qt-libs/poppler/poppler.py
@@ -31,5 +31,5 @@ class Package(CMakePackageBase):
         CMakePackageBase.__init__( self )
 
         self.subinfo.options.package.packageName = 'poppler'
-        self.subinfo.options.configure.defines = "-DBUILD_QT4_TESTS=ON \
-DENABLE_XPDF_HEADERS=ON -DENABLE_ZLIB=ON -DENABLE_LIBCURL=ON" +        \
self.subinfo.options.configure.defines = "-DENABLE_XPDF_HEADERS=ON -DENABLE_ZLIB=ON \
-DENABLE_LIBCURL=ON -DENABLE_UTILS=OFF"  


[prev in list] [next in list] [prev in thread] [next in thread]