diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-01-04 03:38:30 +0000 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-01-04 03:38:30 +0000 |
commit | 94ed6c971085d22c2a544227879b672266b4af90 (patch) | |
tree | f9f6c023aeaccc8d869a160ee9a2e5f4890566e4 /extra/poppler | |
parent | f72cb0ced39aca827b5269eba5455dbf846410e2 (diff) |
Sat Jan 4 03:36:23 UTC 2014
Diffstat (limited to 'extra/poppler')
-rw-r--r-- | extra/poppler/PKGBUILD | 44 | ||||
-rw-r--r-- | extra/poppler/poppler-0.24.2-mocversiongrep.patch | 28 |
2 files changed, 50 insertions, 22 deletions
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index c61cd1028..1c711adc0 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 200652 2013-12-01 09:50:16Z andyrtr $ +# $Id: PKGBUILD 203081 2014-01-03 20:06:57Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt4' 'poppler-qt5') -pkgver=0.24.4 +pkgver=0.24.5 pkgrel=1 arch=(i686 x86_64) license=('GPL') @@ -12,21 +12,24 @@ options=('!emptydirs') url="http://poppler.freedesktop.org/" _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.xz - http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('2da22b966cf7a2f8da5bf021e68188ce' - '9dc64c254a31e570507bdd4ad4ba629a') + http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2 + poppler-0.24.2-mocversiongrep.patch) +md5sums=('334f2ac95cc8039f2a57fe63e4a81c69' + '9dc64c254a31e570507bdd4ad4ba629a' + 'd5280e4eb6d02660971bdaa45065933f') prepare() { ln -sf test-${_testtag} test cd ${pkgbase}-${pkgver} - + # fix build with recent qt versions, patch taken from FC + patch -Np1 -i ${srcdir}/poppler-0.24.2-mocversiongrep.patch sed -i -e '/AC_PATH_XTRA/d' configure.ac sed -i "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:" configure.ac + autoreconf -fi } build() { cd ${pkgbase}-${pkgver} - autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --enable-cairo-output \ @@ -62,12 +65,11 @@ package_poppler-glib() { pkgdesc="Poppler glib bindings" depends=("poppler=${pkgver}" 'glib2') - cd "${srcdir}/${pkgbase}-${pkgver}/poppler" - make DESTDIR="${pkgdir}" install-libLTLIBRARIES - cd "${srcdir}/${pkgbase}-${pkgver}/glib" - make DESTDIR="${pkgdir}" install + cd "${pkgbase}-${pkgver}" + make -C poppler DESTDIR="${pkgdir}" install-libLTLIBRARIES + make -C glib DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m644 ../poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/" + install -m644 poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/" rm -f "${pkgdir}"/usr/lib/libpoppler.* rm -f "${pkgdir}/usr/bin/poppler-glib-demo" } @@ -79,12 +81,11 @@ package_poppler-qt4() { conflicts=('poppler-qt') depends=("poppler=${pkgver}" 'qt4') - cd "${srcdir}/${pkgbase}-${pkgver}/poppler" - make DESTDIR="${pkgdir}" install-libLTLIBRARIES - cd "${srcdir}/${pkgbase}-${pkgver}/qt4" - make DESTDIR="${pkgdir}" install + cd "${pkgbase}-${pkgver}" + make -C poppler DESTDIR="${pkgdir}" install-libLTLIBRARIES + make -C qt4 DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m644 ../poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/" + install -m644 poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/" rm -f "${pkgdir}"/usr/lib/libpoppler.* } @@ -92,11 +93,10 @@ package_poppler-qt5() { pkgdesc="Poppler Qt5 bindings" depends=("poppler=${pkgver}" 'qt5-base') - cd "${srcdir}/${pkgbase}-${pkgver}/poppler" - make DESTDIR="${pkgdir}" install-libLTLIBRARIES - cd "${srcdir}/${pkgbase}-${pkgver}/qt5" - make DESTDIR="${pkgdir}" install + cd "${pkgbase}-${pkgver}" + make -C poppler DESTDIR="${pkgdir}" install-libLTLIBRARIES + make -C qt5 DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m644 ../poppler-qt5.pc "${pkgdir}/usr/lib/pkgconfig/" + install -m644 poppler-qt5.pc "${pkgdir}/usr/lib/pkgconfig/" rm -f "${pkgdir}"/usr/lib/libpoppler.* } diff --git a/extra/poppler/poppler-0.24.2-mocversiongrep.patch b/extra/poppler/poppler-0.24.2-mocversiongrep.patch new file mode 100644 index 000000000..1343f8f9c --- /dev/null +++ b/extra/poppler/poppler-0.24.2-mocversiongrep.patch @@ -0,0 +1,28 @@ +diff -up poppler-0.24.2/configure.ac.mocversiongrep poppler-0.24.2/configure.ac +--- poppler-0.24.2/configure.ac.mocversiongrep 2013-10-18 09:51:24.223114884 -0500 ++++ poppler-0.24.2/configure.ac 2013-10-18 09:54:33.408681067 -0500 +@@ -661,20 +661,20 @@ if test x$enable_poppler_qt5 = xyes; the + AC_CHECK_TOOL(MOCQT5, moc) + AC_MSG_CHECKING([for Qt5 moc]) + mocversion=`$MOCQT5 -v 2>&1` +- mocversiongrep=`echo $mocversion | grep "Qt 5"` ++ mocversiongrep=`echo $mocversion | grep " 5\."` + if test x"$mocversiongrep" != x"$mocversion"; then + AC_MSG_RESULT([no]) + # moc was not the qt5 one, try with moc-qt5 + AC_CHECK_TOOL(MOCQT52, moc-qt5) + AC_MSG_CHECKING([for Qt5 moc-qt5]) + mocversion=`$MOCQT52 -v 2>&1` +- mocversiongrep=`echo $mocversion | grep "Qt 5"` ++ mocversiongrep=`echo $mocversion | grep " 5\."` + if test x"$mocversiongrep" != x"$mocversion"; then + AC_CHECK_TOOL(QTCHOOSER, qtchooser) + AC_MSG_CHECKING([for qtchooser]) + qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2` + mocversion=`$qt5tooldir/moc -v 2>&1` +- mocversiongrep=`echo $mocversion | grep "Qt 5"` ++ mocversiongrep=`echo $mocversion | grep " 5\."` + if test x"$mocversiongrep" != x"$mocversion"; then + # no valid moc found + enable_poppler_qt5=no; + |