[arch-commits] Commit in poppler/repos (6 files)
Andreas Radke
andyrtr at nymeria.archlinux.org
Fri Jan 3 20:06:57 UTC 2014
Date: Friday, January 3, 2014 @ 21:06:57
Author: andyrtr
Revision: 203081
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
poppler/repos/extra-i686/PKGBUILD
(from rev 203080, poppler/trunk/PKGBUILD)
poppler/repos/extra-i686/poppler-0.24.2-mocversiongrep.patch
(from rev 203080, poppler/trunk/poppler-0.24.2-mocversiongrep.patch)
poppler/repos/extra-x86_64/PKGBUILD
(from rev 203080, poppler/trunk/PKGBUILD)
poppler/repos/extra-x86_64/poppler-0.24.2-mocversiongrep.patch
(from rev 203080, poppler/trunk/poppler-0.24.2-mocversiongrep.patch)
Deleted:
poppler/repos/extra-i686/PKGBUILD
poppler/repos/extra-x86_64/PKGBUILD
--------------------------------------------------+
/PKGBUILD | 204 +++++++++++++++++++++
extra-i686/PKGBUILD | 102 ----------
extra-i686/poppler-0.24.2-mocversiongrep.patch | 28 ++
extra-x86_64/PKGBUILD | 102 ----------
extra-x86_64/poppler-0.24.2-mocversiongrep.patch | 28 ++
5 files changed, 260 insertions(+), 204 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-01-03 20:06:37 UTC (rev 203080)
+++ extra-i686/PKGBUILD 2014-01-03 20:06:57 UTC (rev 203081)
@@ -1,102 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=poppler
-pkgname=('poppler' 'poppler-glib' 'poppler-qt4' 'poppler-qt5')
-pkgver=0.24.4
-pkgrel=1
-arch=(i686 x86_64)
-license=('GPL')
-makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt4' 'pkgconfig' 'lcms2' 'gobject-introspection' 'icu' 'qt5-base')
-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')
-
-prepare() {
- ln -sf test-${_testtag} test
- cd ${pkgbase}-${pkgver}
-
- sed -i -e '/AC_PATH_XTRA/d' configure.ac
- sed -i "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:" configure.ac
-}
-
-build() {
- cd ${pkgbase}-${pkgver}
- autoreconf -fi
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --enable-cairo-output \
- --enable-xpdf-headers \
- --enable-libjpeg --enable-zlib \
- --enable-poppler-qt4 \
- --enable-poppler-qt5 \
- --enable-poppler-glib
- make
-}
-
-check() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
- LANG=en_US.UTF8 make check
-}
-
-package_poppler() {
- pkgdesc="PDF rendering library based on xpdf 3.0"
- depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms2')
- optdepends=('poppler-data: encoding data to display PDF documents containing CJK characters')
- conflicts=("poppler-qt3<${pkgver}")
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- sed -e 's/^glib_subdir =.*/glib_subdir =/' \
- -e 's/^qt4_subdir =.*/qt4_subdir =/' \
- -e 's/^qt5_subdir =.*/qt5_subdir =/' -i Makefile
- make DESTDIR="${pkgdir}" install
-
- rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4,qt5}.pc
-}
-
-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
- install -m755 -d "${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"
-}
-
-package_poppler-qt4() {
- pkgdesc="Poppler Qt4 bindings"
- provides=("poppler-qt=${pkgver}")
- replaces=('poppler-qt')
- 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
- install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
- install -m644 ../poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/"
- rm -f "${pkgdir}"/usr/lib/libpoppler.*
-}
-
-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
- install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
- install -m644 ../poppler-qt5.pc "${pkgdir}/usr/lib/pkgconfig/"
- rm -f "${pkgdir}"/usr/lib/libpoppler.*
-}
Copied: poppler/repos/extra-i686/PKGBUILD (from rev 203080, poppler/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-01-03 20:06:57 UTC (rev 203081)
@@ -0,0 +1,102 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=poppler
+pkgname=('poppler' 'poppler-glib' 'poppler-qt4' 'poppler-qt5')
+pkgver=0.24.5
+pkgrel=1
+arch=(i686 x86_64)
+license=('GPL')
+makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt4' 'pkgconfig' 'lcms2' 'gobject-introspection' 'icu' 'qt5-base')
+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
+ 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}
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static \
+ --enable-cairo-output \
+ --enable-xpdf-headers \
+ --enable-libjpeg --enable-zlib \
+ --enable-poppler-qt4 \
+ --enable-poppler-qt5 \
+ --enable-poppler-glib
+ make
+}
+
+check() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ LANG=en_US.UTF8 make check
+}
+
+package_poppler() {
+ pkgdesc="PDF rendering library based on xpdf 3.0"
+ depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms2')
+ optdepends=('poppler-data: encoding data to display PDF documents containing CJK characters')
+ conflicts=("poppler-qt3<${pkgver}")
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ sed -e 's/^glib_subdir =.*/glib_subdir =/' \
+ -e 's/^qt4_subdir =.*/qt4_subdir =/' \
+ -e 's/^qt5_subdir =.*/qt5_subdir =/' -i Makefile
+ make DESTDIR="${pkgdir}" install
+
+ rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4,qt5}.pc
+}
+
+package_poppler-glib() {
+ pkgdesc="Poppler glib bindings"
+ depends=("poppler=${pkgver}" 'glib2')
+
+ 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/"
+ rm -f "${pkgdir}"/usr/lib/libpoppler.*
+ rm -f "${pkgdir}/usr/bin/poppler-glib-demo"
+}
+
+package_poppler-qt4() {
+ pkgdesc="Poppler Qt4 bindings"
+ provides=("poppler-qt=${pkgver}")
+ replaces=('poppler-qt')
+ conflicts=('poppler-qt')
+ depends=("poppler=${pkgver}" 'qt4')
+
+ 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/"
+ rm -f "${pkgdir}"/usr/lib/libpoppler.*
+}
+
+package_poppler-qt5() {
+ pkgdesc="Poppler Qt5 bindings"
+ depends=("poppler=${pkgver}" 'qt5-base')
+
+ 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/"
+ rm -f "${pkgdir}"/usr/lib/libpoppler.*
+}
Copied: poppler/repos/extra-i686/poppler-0.24.2-mocversiongrep.patch (from rev 203080, poppler/trunk/poppler-0.24.2-mocversiongrep.patch)
===================================================================
--- extra-i686/poppler-0.24.2-mocversiongrep.patch (rev 0)
+++ extra-i686/poppler-0.24.2-mocversiongrep.patch 2014-01-03 20:06:57 UTC (rev 203081)
@@ -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;
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-01-03 20:06:37 UTC (rev 203080)
+++ extra-x86_64/PKGBUILD 2014-01-03 20:06:57 UTC (rev 203081)
@@ -1,102 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=poppler
-pkgname=('poppler' 'poppler-glib' 'poppler-qt4' 'poppler-qt5')
-pkgver=0.24.4
-pkgrel=1
-arch=(i686 x86_64)
-license=('GPL')
-makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt4' 'pkgconfig' 'lcms2' 'gobject-introspection' 'icu' 'qt5-base')
-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')
-
-prepare() {
- ln -sf test-${_testtag} test
- cd ${pkgbase}-${pkgver}
-
- sed -i -e '/AC_PATH_XTRA/d' configure.ac
- sed -i "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:" configure.ac
-}
-
-build() {
- cd ${pkgbase}-${pkgver}
- autoreconf -fi
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --enable-cairo-output \
- --enable-xpdf-headers \
- --enable-libjpeg --enable-zlib \
- --enable-poppler-qt4 \
- --enable-poppler-qt5 \
- --enable-poppler-glib
- make
-}
-
-check() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
- LANG=en_US.UTF8 make check
-}
-
-package_poppler() {
- pkgdesc="PDF rendering library based on xpdf 3.0"
- depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms2')
- optdepends=('poppler-data: encoding data to display PDF documents containing CJK characters')
- conflicts=("poppler-qt3<${pkgver}")
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- sed -e 's/^glib_subdir =.*/glib_subdir =/' \
- -e 's/^qt4_subdir =.*/qt4_subdir =/' \
- -e 's/^qt5_subdir =.*/qt5_subdir =/' -i Makefile
- make DESTDIR="${pkgdir}" install
-
- rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4,qt5}.pc
-}
-
-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
- install -m755 -d "${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"
-}
-
-package_poppler-qt4() {
- pkgdesc="Poppler Qt4 bindings"
- provides=("poppler-qt=${pkgver}")
- replaces=('poppler-qt')
- 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
- install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
- install -m644 ../poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/"
- rm -f "${pkgdir}"/usr/lib/libpoppler.*
-}
-
-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
- install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
- install -m644 ../poppler-qt5.pc "${pkgdir}/usr/lib/pkgconfig/"
- rm -f "${pkgdir}"/usr/lib/libpoppler.*
-}
Copied: poppler/repos/extra-x86_64/PKGBUILD (from rev 203080, poppler/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-01-03 20:06:57 UTC (rev 203081)
@@ -0,0 +1,102 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=poppler
+pkgname=('poppler' 'poppler-glib' 'poppler-qt4' 'poppler-qt5')
+pkgver=0.24.5
+pkgrel=1
+arch=(i686 x86_64)
+license=('GPL')
+makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt4' 'pkgconfig' 'lcms2' 'gobject-introspection' 'icu' 'qt5-base')
+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
+ 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}
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static \
+ --enable-cairo-output \
+ --enable-xpdf-headers \
+ --enable-libjpeg --enable-zlib \
+ --enable-poppler-qt4 \
+ --enable-poppler-qt5 \
+ --enable-poppler-glib
+ make
+}
+
+check() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ LANG=en_US.UTF8 make check
+}
+
+package_poppler() {
+ pkgdesc="PDF rendering library based on xpdf 3.0"
+ depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms2')
+ optdepends=('poppler-data: encoding data to display PDF documents containing CJK characters')
+ conflicts=("poppler-qt3<${pkgver}")
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ sed -e 's/^glib_subdir =.*/glib_subdir =/' \
+ -e 's/^qt4_subdir =.*/qt4_subdir =/' \
+ -e 's/^qt5_subdir =.*/qt5_subdir =/' -i Makefile
+ make DESTDIR="${pkgdir}" install
+
+ rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4,qt5}.pc
+}
+
+package_poppler-glib() {
+ pkgdesc="Poppler glib bindings"
+ depends=("poppler=${pkgver}" 'glib2')
+
+ 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/"
+ rm -f "${pkgdir}"/usr/lib/libpoppler.*
+ rm -f "${pkgdir}/usr/bin/poppler-glib-demo"
+}
+
+package_poppler-qt4() {
+ pkgdesc="Poppler Qt4 bindings"
+ provides=("poppler-qt=${pkgver}")
+ replaces=('poppler-qt')
+ conflicts=('poppler-qt')
+ depends=("poppler=${pkgver}" 'qt4')
+
+ 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/"
+ rm -f "${pkgdir}"/usr/lib/libpoppler.*
+}
+
+package_poppler-qt5() {
+ pkgdesc="Poppler Qt5 bindings"
+ depends=("poppler=${pkgver}" 'qt5-base')
+
+ 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/"
+ rm -f "${pkgdir}"/usr/lib/libpoppler.*
+}
Copied: poppler/repos/extra-x86_64/poppler-0.24.2-mocversiongrep.patch (from rev 203080, poppler/trunk/poppler-0.24.2-mocversiongrep.patch)
===================================================================
--- extra-x86_64/poppler-0.24.2-mocversiongrep.patch (rev 0)
+++ extra-x86_64/poppler-0.24.2-mocversiongrep.patch 2014-01-03 20:06:57 UTC (rev 203081)
@@ -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;
+
More information about the arch-commits
mailing list