diff --git a/mingw-w64-poppler/003-disable-introspection.patch b/mingw-w64-poppler/003-disable-introspection.patch new file mode 100644 index 0000000000..382a169ec4 --- /dev/null +++ b/mingw-w64-poppler/003-disable-introspection.patch @@ -0,0 +1,15 @@ +--- poppler-0.62.0/CMakeLists.txt.orig 2018-01-11 09:46:06.867061800 +0300 ++++ poppler-0.62.0/CMakeLists.txt 2018-01-11 09:46:50.977120500 +0300 +@@ -168,8 +168,12 @@ + endif() + if(ENABLE_GLIB) + # Check for introspection ++ if(MINGW) ++ set(HAVE_INTROSPECTION 0) ++ else() + macro_optional_find_package(GObjectIntrospection 0.9.12) + set(HAVE_INTROSPECTION ${INTROSPECTION_FOUND}) ++ endif() + set(POPPLER_GLIB_DISABLE_DEPRECATED "${POPPLER_GLIB_DISABLE_DEPRECATED} -DG_DISABLE_DEPRECATED") + set(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES "${POPPLER_GLIB_DISABLE_SINGLE_INCLUDES} -DG_DISABLE_SINGLE_INCLUDES") + macro_optional_find_package(GTK) diff --git a/mingw-w64-poppler/PKGBUILD b/mingw-w64-poppler/PKGBUILD index 49993117ae..b28593c840 100644 --- a/mingw-w64-poppler/PKGBUILD +++ b/mingw-w64-poppler/PKGBUILD @@ -3,7 +3,7 @@ _realname=poppler pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=0.61.1 +pkgver=0.62.0 pkgrel=1 pkgdesc="PDF rendering library based on xpdf 3.0 (mingw-w64)" arch=('any') @@ -31,20 +31,24 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-glib2: libpoppler-glib" "${MINGW_PACKAGE_PREFIX}-qt5: libpoppler-qt5") options=('strip' 'staticlibs') source=("https://poppler.freedesktop.org/${_realname}-${pkgver}.tar.xz" - 001-enable-nss-mingw.patch) -sha256sums=('1266096343f5163c1a585124e9a6d44474e1345de5cdfe55dc7b47357bcfcda9' - '1f63b502cd0f5eae61a25fc24c0ff900146da54d785ba13602638c08c9f4a890') + 001-enable-nss-mingw.patch + 003-disable-introspection.patch) +sha256sums=('5b9a73dfd4d6f61d165ada1e4f0abd2d420494bf9d0b1c15d0db3f7b83a729c6' + '1f63b502cd0f5eae61a25fc24c0ff900146da54d785ba13602638c08c9f4a890' + 'a023c1c7cd2b381f4bb71ea63fb9845bf34a7f50c11c39fecd792fd7141c49fd') prepare() { cd ${_realname}-${pkgver} patch -p1 -i ${srcdir}/001-enable-nss-mingw.patch + patch -p1 -i ${srcdir}/003-disable-introspection.patch } build() { [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST} mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST} - export CC="${MINGW_PREFIX}/bin/gcc.exe" + #export CC="${MINGW_PREFIX}/bin/gcc.exe" + #export PKG_CONFIG_PATH=${MINGW_PREFIX}/lib/pkgconfig MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ "${MINGW_PREFIX}/bin/cmake.exe" -Wno-dev \ @@ -53,10 +57,11 @@ build() { -DENABLE_XPDF_HEADERS=ON \ -DENABLE_QT4=OFF \ -DENABLE_GTK_DOC=OFF \ - --debug-output \ ../${_realname}-${pkgver} - make -j1 + CC="${MINGW_PREFIX}/bin/gcc.exe" \ + PKG_CONFIG_PATH=${MINGW_PREFIX}/lib/pkgconfig \ + make } package() {