diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-21 14:29:11 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-21 14:29:11 -0300 |
| commit | fe0996f2e8716b772785a0bf93c6a3f2d5dc22ff (patch) | |
| tree | 2ee658b20ace2ab8fff6035e6a0e223b8d70f1eb /extra/poppler | |
| parent | 9d9dd0f9452c6a9d533ce805b903aea596aff108 (diff) | |
Rebuilds
Diffstat (limited to 'extra/poppler')
| -rw-r--r-- | extra/poppler/PKGBUILD | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 234825d30..7c57b8c27 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -20,14 +20,10 @@ md5sums=('d30e883a27423c936ef338ce1d967e2d' build() { cd "${srcdir}/${pkgbase}-${pkgver}" -<<<<<<< HEAD - patch -Np1 -i "${srcdir}/fix_cairo.patch" -======= sed -i -e '/AC_PATH_XTRA/d' configure.ac patch -Np1 -i "${srcdir}/git-fixes.patch" autoreconf -fi ->>>>>>> 3d151dfc8e08b65c2c1d4b5e8081562d56ee7d41 ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ |