summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Newgard2015-03-06 08:25:40 -0600
committerDoug Newgard2015-03-06 08:25:40 -0600
commit5d0ae1080108a07437d8509d18d1a4e3040fd6bb (patch)
treedf80aca8154919a9e17026016453ad8da534dde4
parentdf5dcf9fbac5670d0b4c6d9cadfe7da8f89f68c0 (diff)
downloadaur-5d0ae1080108a07437d8509d18d1a4e3040fd6bb.tar.gz
Remove patch, fixed upstream
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD16
-rw-r--r--poppler-0.31.patch15
3 files changed, 7 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 609eb3baeef9..91b7e19b9621 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = evas_generic_loaders-git
pkgdesc = Evas external binary executable loaders - Development version
- pkgver = 1.13.99.166.5cf9aa4
- pkgrel = 2
+ pkgver = 1.13.99.167.1e1a1e6
+ pkgrel = 1
url = http://www.enlightenment.org
arch = i686
arch = x86_64
@@ -18,13 +18,11 @@ pkgbase = evas_generic_loaders-git
optdepends = gst-plugins-ugly: Video thumbnails
optdepends = gst-libav: Video thumbnails
optdepends = libreoffice-common: Office document thumbnails
- provides = evas_generic_loaders=1.13.99.166.5cf9aa4
+ provides = evas_generic_loaders=1.13.99.167.1e1a1e6
conflicts = evas_generic_loaders
options = debug
source = git://git.enlightenment.org/core/evas_generic_loaders.git
- source = poppler-0.31.patch
sha256sums = SKIP
- sha256sums = ad42a31e4a08cd612149bdd2b3f4acc971812e44cee903f359978ea3d8366bd2
pkgname = evas_generic_loaders-git
diff --git a/PKGBUILD b/PKGBUILD
index 94107ce17e0e..13607110caff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
_pkgname=evas_generic_loaders
pkgname=$_pkgname-git
-pkgver=1.13.99.166.5cf9aa4
-pkgrel=2
+pkgver=1.13.99.167.1e1a1e6
+pkgrel=1
pkgdesc="Evas external binary executable loaders - Development version"
arch=('i686' 'x86_64')
url="http://www.enlightenment.org"
@@ -21,10 +21,8 @@ optdepends=('gst-plugins-base: Video thumbnails'
provides=("$_pkgname=$pkgver")
conflicts=("$_pkgname")
options=('debug')
-source=("git://git.enlightenment.org/core/$_pkgname.git"
- 'poppler-0.31.patch')
-sha256sums=('SKIP'
- 'ad42a31e4a08cd612149bdd2b3f4acc971812e44cee903f359978ea3d8366bd2')
+source=("git://git.enlightenment.org/core/$_pkgname.git")
+sha256sums=('SKIP')
pkgver() {
cd "$srcdir/$_pkgname"
@@ -38,12 +36,6 @@ pkgver() {
printf "$v_ver.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
}
-prepare() {
- cd "$srcdir/$_pkgname"
-
- patch -Np1 < "$srcdir/poppler-0.31.patch"
-}
-
build() {
cd "$srcdir/$_pkgname"
diff --git a/poppler-0.31.patch b/poppler-0.31.patch
deleted file mode 100644
index b94fa533ffde..000000000000
--- a/poppler-0.31.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nur evas_generic_loaders-1.13.0/src/bin/pdf/main.cpp evas_generic_loaders-1.13.0a/src/bin/pdf/main.cpp
---- evas_generic_loaders-1.13.0/src/bin/pdf/main.cpp 2013-12-11 14:56:58.000000000 +0100
-+++ evas_generic_loaders-1.13.0a/src/bin/pdf/main.cpp 2015-03-02 19:09:49.201401971 +0100
-@@ -62,11 +62,6 @@
- if (!eina_init())
- goto del_global_param;
-
-- if (globalParams->getAntialias())
-- globalParams->setAntialias((char *)"yes");
-- if (globalParams->getVectorAntialias())
-- globalParams->setVectorAntialias((char *)"yes");
--
- pdfdoc = new PDFDoc(new GooString(file), NULL);
- if (!pdfdoc)
- goto del_global_param;