summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Freund2018-12-10 00:26:17 +0100
committerFlorian Freund2018-12-10 00:26:17 +0100
commitd0f4893d8a44ff42ce45ec956fcab1d28b3009a1 (patch)
tree9afa76101e62d1e24ebae361e8377526c32165b8
parent1c97c03488fe6e5c060af705bab98c3a99956799 (diff)
downloadaur-d0f4893d8a44ff42ce45ec956fcab1d28b3009a1.tar.gz
Remove manual poppler build
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD6
2 files changed, 5 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c45ddb80676e..99f971e25782 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = xournalpp-git
pkgdesc = C++ re-write of tablet notetaking app Xournal
- pkgver = 1.0.0.882.gcdfa37ec
+ pkgver = 1.0.0.1028.gf7f18684
pkgrel = 1
url = https://github.com/xournalpp/xournalpp
install = xournalpp.install
@@ -19,6 +19,7 @@ pkgbase = xournalpp-git
depends = libglade
depends = glibmm
depends = desktop-file-utils
+ depends = poppler-glib
conflicts = xournalpp
source = xournalpp::git+https://github.com/xournalpp/xournalpp.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 597f9183d0e3..de0d70b3c17b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,14 +5,14 @@
_pkgname="xournalpp"
pkgname="${_pkgname}-git"
-pkgver=1.0.0.882.gcdfa37ec
+pkgver=1.0.0.1028.gf7f18684
pkgrel=1
pkgdesc="C++ re-write of tablet notetaking app Xournal"
arch=('i686' 'x86_64')
url="https://github.com/xournalpp/xournalpp"
license=('GPL-2.0')
makedepends=('git' 'cmake' 'gettext' 'boost' 'python')
-depends=('texlive-core' 'gtk3' 'boost-libs' 'glib2' 'libglade' 'glibmm' 'desktop-file-utils')
+depends=('texlive-core' 'gtk3' 'boost-libs' 'glib2' 'libglade' 'glibmm' 'desktop-file-utils' 'poppler-glib')
conflicts=('xournalpp')
install="xournalpp.install"
source=("${_pkgname}::git+https://github.com/xournalpp/xournalpp.git")
@@ -29,7 +29,7 @@ prepare() {
test -e "${srcdir}/${_pkgname}/build" || mkdir -p "${srcdir}/${_pkgname}/build"
cd "${srcdir}/${_pkgname}/build"
- cmake -DENABLE_OS="OFF" -DENABLE_MATHTEX="ON" -DCMAKE_INSTALL_PREFIX="/usr/" -DBUILD_POPPLER="ON" -DPOPPLER_GIT_VER="0.69.0" ..
+ cmake -DENABLE_OS="OFF" -DENABLE_MATHTEX="ON" -DCMAKE_INSTALL_PREFIX="/usr/" ..
}
build() {