diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-25 12:01:49 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-25 12:01:49 +0100 |
commit | 8e40bdbb2496be15fdba2e683af427bc2333be42 (patch) | |
tree | 03ace0b9a2ffc12133cb0357fee75079c964f67a /extra/poppler | |
parent | 33fcf0e7b95e530b849e59e90fdea4001e01283d (diff) | |
parent | 2aa2acfff38de7de825868995e49792ecfc03126 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/libvisual-projectm/PKGBUILD
community/python-memcached/PKGBUILD
community/python-mpi4py/PKGBUILD
core/sqlite3/PKGBUILD
core/udev/PKGBUILD
extra/kdeplasma-applets-networkmanagement/PKGBUILD
extra/pixman/PKGBUILD
extra/sg3_utils/PKGBUILD
libre/kdeutils-libre/PKGBUILD
libre/linux-libre/PKGBUILD
libre/linux-libre/linux-libre.install
multilib/lib32-libxcb/PKGBUILD
multilib/lib32-openssl/PKGBUILD
multilib/lib32-sdl_image/PKGBUILD
multilib/lib32-sqlite3/PKGBUILD
multilib/lib32-udev/PKGBUILD
Diffstat (limited to 'extra/poppler')
-rw-r--r-- | extra/poppler/PKGBUILD | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index fc76c3f2f..3536a1d31 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 145182 2011-12-19 11:45:17Z jgc $ +# $Id: PKGBUILD 147127 2012-01-22 11:06:04Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.18.2 +pkgver=0.18.3 pkgrel=1 arch=(i686 x86_64 mips64el) license=('GPL') @@ -14,14 +14,14 @@ _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2 git-fixes.patch) -md5sums=('38616927823ef01937aab26872e957e4' +md5sums=('d70d2d63d8acd29c97185f7e5f09c9b4' '9dc64c254a31e570507bdd4ad4ba629a' 'af56b7b1b24a08f7498a0c7f5e862b93') build() { cd "${srcdir}/${pkgbase}-${pkgver}" sed -i -e '/AC_PATH_XTRA/d' configure.ac - patch -Np1 -i "${srcdir}/git-fixes.patch" + #patch -Np1 -i "${srcdir}/git-fixes.patch" autoreconf -fi |