diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-02 18:00:18 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-02 18:02:35 +0100 |
commit | bae1d2619114abb36d636273329ed6d3ae157055 (patch) | |
tree | 9a9c785204458547c0fc6b6b10357abd379a0fdd /extra/poppler | |
parent | f3a6a3f3b315c15fe04bb44a40020c3842c8ef21 (diff) | |
parent | 98aa0004e23472ee63753fded33cd55d8b942f36 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bitcoin/PKGBUILD
community/canorus/PKGBUILD
community/celt-0.7/PKGBUILD
community/djview4/PKGBUILD
community/erlang-sdl/PKGBUILD
community/erlang/PKGBUILD
community/fcitx-mozc/PKGBUILD
community/glitz/PKGBUILD
community/gmerlin/PKGBUILD
community/gmic/PKGBUILD
community/goldendict/PKGBUILD
community/google-gadgets/PKGBUILD
community/highlight/PKGBUILD
community/jack2/PKGBUILD
community/kvirc/PKGBUILD
community/launchy/PKGBUILD
community/mplayer2/PKGBUILD
community/mumble/PKGBUILD
community/mupdf/PKGBUILD
community/projectm/PKGBUILD
community/psimedia/PKGBUILD
community/pyqt3/PKGBUILD
community/qps/PKGBUILD
community/qstardict/PKGBUILD
community/qsynergy/PKGBUILD
community/synergy/PKGBUILD
community/units/PKGBUILD
community/yagf/PKGBUILD
extra/automoc4/PKGBUILD
extra/avahi/PKGBUILD
extra/avidemux/PKGBUILD
extra/bzflag/PKGBUILD
extra/cagibi/PKGBUILD
extra/cairo/PKGBUILD
extra/calligra/PKGBUILD
extra/cmake/PKGBUILD
extra/dssi/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/glu/PKGBUILD
extra/graphviz/PKGBUILD
extra/hylafax/PKGBUILD
extra/kdesdk/PKGBUILD
extra/libbluedevil/PKGBUILD
extra/liblastfm/PKGBUILD
extra/liborigin2/PKGBUILD
extra/libpng/PKGBUILD
extra/libqzeitgeist/PKGBUILD
extra/libx11/PKGBUILD
extra/mesa/PKGBUILD
extra/mpg123/PKGBUILD
extra/mtr/PKGBUILD
extra/mysql/PKGBUILD
extra/netpbm/PKGBUILD
extra/nspr/PKGBUILD
extra/polkit-qt/PKGBUILD
extra/poppler/PKGBUILD
extra/prison/PKGBUILD
extra/pyqt/PKGBUILD
extra/qimageblitz/PKGBUILD
extra/qscintilla/PKGBUILD
extra/qsynth/PKGBUILD
extra/qt-assistant-compat/PKGBUILD
extra/qt-gstreamer/PKGBUILD
extra/qt/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/qwt/PKGBUILD
extra/samba/PKGBUILD
extra/sane/PKGBUILD
extra/smplayer/PKGBUILD
extra/soprano/PKGBUILD
extra/texmacs/PKGBUILD
extra/tomcat-native/PKGBUILD
extra/transmission/PKGBUILD
extra/wpa_supplicant_gui/PKGBUILD
libre/lame-libre/PKGBUILD
libre/linux-libre/PKGBUILD
libre/mesa-demos-libre/PKGBUILD
Diffstat (limited to 'extra/poppler')
-rw-r--r-- | extra/poppler/PKGBUILD | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 102a86acd..71f807945 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 178227 2013-02-18 14:46:39Z jgc $ +# $Id: PKGBUILD 178974 2013-03-01 10:22:47Z andrea $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') pkgver=0.22.1 -pkgrel=2 +pkgrel=3 arch=(i686 x86_64 mips64el) license=('GPL') -makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection' 'icu') +makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt4' 'pkgconfig' 'lcms' 'gobject-introspection' 'icu') options=('!libtool' '!emptydirs') url="http://poppler.freedesktop.org/" _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a @@ -17,6 +17,8 @@ md5sums=('50c259fdda538c1ba94b62aa25f7ec87' '9dc64c254a31e570507bdd4ad4ba629a') build() { + . /etc/profile.d/qt4.sh + cd "${srcdir}/${pkgbase}-${pkgver}" sed -i -e '/AC_PATH_XTRA/d' configure.ac sed -i "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:" configure.ac @@ -70,7 +72,7 @@ package_poppler-glib() { package_poppler-qt() { pkgdesc="Poppler Qt bindings" - depends=("poppler=${pkgver}" 'qt') + depends=("poppler=${pkgver}" 'qt4') cd "${srcdir}/${pkgbase}-${pkgver}/poppler" make DESTDIR="${pkgdir}" install-libLTLIBRARIES |