summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Coolen2018-11-21 15:56:28 -0500
committerMark Coolen2018-11-21 15:56:28 -0500
commit9d2021956e57f1e0e6840ed01736d82dd196fa3f (patch)
treea74ddf8ad57eccf90630f71dabb452bed1293621
parent1183d9401de0b1eef0fe0b591fb1403069d010de (diff)
downloadaur-9d2021956e57f1e0e6840ed01736d82dd196fa3f.tar.gz
Compiles Poppler 0.69 and changes to GTK3
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD19
-rw-r--r--fixpoppler.patch25
3 files changed, 38 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dabb34fed477..8c220ee7b2db 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.375.g7d9a7bd
+ pkgver = 1.0.0.647.g5dfbf6c8
pkgrel = 1
url = https://github.com/xournalpp/xournalpp
install = xournalpp.install
@@ -11,8 +11,9 @@ pkgbase = xournalpp-git
makedepends = cmake
makedepends = gettext
makedepends = boost
+ makedepends = python
depends = texlive-core
- depends = gtk2
+ depends = gtk3
depends = boost-libs
depends = glib2
depends = libglade
@@ -21,11 +22,9 @@ pkgbase = xournalpp-git
depends = desktop-file-utils
conflicts = xournalpp
source = xournalpp::git+https://github.com/xournalpp/xournalpp.git
- source = https://github.com/xournalpp/xournalpp/commit/4be5b5a1eab4c1ac873db237bc13c1be783081a7.patch
- source = https://github.com/swiftgeek/xournalpp/commit/12a409c8afc3c3ea8c8afebb67377c29e3d90035.patch
+ source = fixpoppler.patch
sha256sums = SKIP
- sha256sums = 9d84d91c9d38eefc82a99fcd726b9b6e1225949fb5fdf4a07c7335da0f448d14
- sha256sums = 3739e3a5538e53becf8864cdaeaa320ecc520a8a530d498491afc8ddff5accc1
+ sha256sums = 097a69c2bd861a2aa3d8838b371c31d68fe3c4173e069f447f86aeaae94f94fc
pkgname = xournalpp-git
diff --git a/PKGBUILD b/PKGBUILD
index f2c1cca24ecd..750929642aa1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,22 +4,20 @@
_pkgname="xournalpp"
pkgname="${_pkgname}-git"
-pkgver=1.0.0.375.g7d9a7bd
+pkgver=1.0.0.647.g5dfbf6c8
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')
-depends=('texlive-core' 'gtk2' 'boost-libs' 'glib2' 'libglade' 'poppler-glib' 'glibmm' 'desktop-file-utils')
+makedepends=('git' 'cmake' 'gettext' 'boost' 'python')
+depends=('texlive-core' 'gtk3' 'boost-libs' 'glib2' 'libglade' 'poppler-glib' 'glibmm' 'desktop-file-utils')
conflicts=('xournalpp')
install="xournalpp.install"
source=("${_pkgname}::git+https://github.com/xournalpp/xournalpp.git"
- "https://github.com/xournalpp/xournalpp/commit/4be5b5a1eab4c1ac873db237bc13c1be783081a7.patch"
- "https://github.com/swiftgeek/xournalpp/commit/12a409c8afc3c3ea8c8afebb67377c29e3d90035.patch")
+ "fixpoppler.patch")
sha256sums=('SKIP'
- '9d84d91c9d38eefc82a99fcd726b9b6e1225949fb5fdf4a07c7335da0f448d14'
- '3739e3a5538e53becf8864cdaeaa320ecc520a8a530d498491afc8ddff5accc1')
+ '097a69c2bd861a2aa3d8838b371c31d68fe3c4173e069f447f86aeaae94f94fc')
pkgver() {
cd "${srcdir}/${_pkgname}/"
@@ -28,13 +26,12 @@ pkgver() {
prepare() {
cd "${srcdir}/${_pkgname}/"
- patch -p1 < ${srcdir}/4be5b5a1eab4c1ac873db237bc13c1be783081a7.patch
- patch -p1 < ${srcdir}/12a409c8afc3c3ea8c8afebb67377c29e3d90035.patch
+ patch -p1 < ${srcdir}/fixpoppler.patch
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/" ..
+ cmake -DENABLE_OS="OFF" -DENABLE_MATHTEX="ON" -DCMAKE_INSTALL_PREFIX="/usr/" -DBUILD_POPPLER="ON" -DPOPPLER_GIT_VER="0.69.0" ..
}
build() {
@@ -62,4 +59,4 @@ package() {
install -D -m0644 "${srcdir}/${_pkgname}/desktop/xournal.xml" "${pkgdir}/usr/share/mime/packages"
install -D -m0644 "${srcdir}/${_pkgname}/desktop/xournalpp.desktop" "${pkgdir}/usr/share/applications"
install -D -m0644 "${srcdir}/${_pkgname}/desktop/x-xoj.desktop" "${pkgdir}/usr/share/mimelnk/application"
-} \ No newline at end of file
+}
diff --git a/fixpoppler.patch b/fixpoppler.patch
new file mode 100644
index 000000000000..cb55dc5fb91e
--- /dev/null
+++ b/fixpoppler.patch
@@ -0,0 +1,25 @@
+From 6dd346daefbe6133ebd3a81489880d94b1a87a65 Mon Sep 17 00:00:00 2001
+From: Florian Freund <florian88freund@gmail.com>
+Date: Wed, 21 Nov 2018 01:08:04 +0100
+Subject: Change lib installation to poppler 0.69.0 and fix ignoring DESTDIR
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2715e91b..93a9c8eb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -322,11 +322,11 @@ install (DIRECTORY ui
+
+ if (BUILD_POPPLER)
+ # The Path /usr/lib is hardcoded, fix if there is a better solution
+- set(POPPLER_LIB ${CMAKE_INSTALL_PREFIX}/lib/libpoppler.so.72)
++ set(POPPLER_LIB ${CMAKE_INSTALL_PREFIX}/lib/libpoppler.so.80)
+
+ install(CODE "MESSAGE(\"Install Poppler workaround to ${POPPLER_LIB}\")")
+- install(CODE "configure_file(${CMAKE_CURRENT_BINARY_DIR}/poppler-prefix/src/poppler-build/libpoppler.so.72.0.0 ${POPPLER_LIB} COPYONLY)")
+- install(CODE "file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_manifest_workaround.txt \"${POPPLER_LIB}\")")
++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/poppler-prefix/src/poppler-build/libpoppler.so.80.0.0 DESTINATION lib)
++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/poppler-prefix/src/poppler-build/libpoppler.so.80 DESTINATION lib)
+ endif()
+
+ # Uninstall target