poppler: Update to 0.26.3

This commit is contained in:
Alexpux
2014-07-21 21:00:31 +04:00
parent 53ad3d3546
commit aaafa88bb0
2 changed files with 3 additions and 17 deletions

View File

@@ -3,8 +3,8 @@
_realname=poppler
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=0.26.2
pkgrel=2
pkgver=0.26.3
pkgrel=1
pkgdesc="PDF rendering library based on xpdf 3.0 (mingw-w64)"
arch=('any')
url="http://poppler.freedesktop.org"
@@ -28,17 +28,14 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-glib2: libpoppler-glib"
"${MINGW_PACKAGE_PREFIX}-qt5: libpoppler-qt5")
options=('strip' 'staticlibs')
source=("http://poppler.freedesktop.org/poppler-${pkgver}.tar.xz"
"poppler-0.26-mingw-wstring.patch"
"give-cc-to-gir-scanner.mingw.patch"
"mingw-no-fpic.patch")
md5sums=('10dcb979a57c0cbaa72d2d04c6adc32c'
'3c7272e976739188a3471b76c8a36fb5'
md5sums=('e101f6653f9f68ab63dac63ec34801d1'
'727c1b414987f6ee2ba841d9db57a967'
'6dd0bfa95a429d9af7c76d326c9a3760')
prepare() {
cd "$srcdir/poppler-$pkgver"
patch -p1 -i "$srcdir/poppler-0.26-mingw-wstring.patch"
patch -p1 -i "$srcdir/give-cc-to-gir-scanner.mingw.patch"
patch -p1 -i "$srcdir/mingw-no-fpic.patch"
#sed -i -e '/AC_PATH_XTRA/d' configure.ac

View File

@@ -1,11 +0,0 @@
--- poppler-0.26.0/qt5/src/poppler-private.h.orig 2014-05-03 23:55:07.399000000 +0400
+++ poppler-0.26.0/qt5/src/poppler-private.h 2014-05-03 23:55:35.588200000 +0400
@@ -85,7 +85,7 @@
init();
m_filePath = filePath;
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
wchar_t *fileName = new WCHAR[filePath.length()];
std::wstring wstr = (const wchar_t *)filePath.utf16();
int length = wstr._Copy_s(fileName, filePath.length(), filePath.length());