summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Coolen2018-07-31 18:44:30 -0400
committerMark Coolen2018-07-31 18:44:30 -0400
commit1183d9401de0b1eef0fe0b591fb1403069d010de (patch)
treefb2ba70f8c63f1a7ccc00731881a5665b49de30a
parent88b9835f7b5450ffc695c379b9222b5ad1b5e236 (diff)
downloadaur-1183d9401de0b1eef0fe0b591fb1403069d010de.tar.gz
added swiftgeeks patches
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD17
2 files changed, 17 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7801ca3c1f1e..dabb34fed477 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = xournalpp-git
pkgdesc = C++ re-write of tablet notetaking app Xournal
- pkgver = 1.0.0.338.g3a86f9f
- pkgrel = 2
+ pkgver = 1.0.0.375.g7d9a7bd
+ pkgrel = 1
url = https://github.com/xournalpp/xournalpp
install = xournalpp.install
arch = i686
@@ -19,11 +19,13 @@ pkgbase = xournalpp-git
depends = poppler-glib
depends = glibmm
depends = desktop-file-utils
- provides = xournal=1.0.0.338.g3a86f9f
- provides = xournal-dmgerman=1.0.0.338.g3a86f9f xournalpp=1.0.0.338.g3a86f9f
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
sha256sums = SKIP
+ sha256sums = 9d84d91c9d38eefc82a99fcd726b9b6e1225949fb5fdf4a07c7335da0f448d14
+ sha256sums = 3739e3a5538e53becf8864cdaeaa320ecc520a8a530d498491afc8ddff5accc1
pkgname = xournalpp-git
diff --git a/PKGBUILD b/PKGBUILD
index 5e354106e504..f2c1cca24ecd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,19 +4,22 @@
_pkgname="xournalpp"
pkgname="${_pkgname}-git"
-pkgver=1.0.0.338.g3a86f9f
-pkgrel=2
+pkgver=1.0.0.375.g7d9a7bd
+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')
-provides=("xournal=${pkgver}" "xournal-dmgerman=${pkgver} xournalpp=${pkgver}")
conflicts=('xournalpp')
install="xournalpp.install"
-source=("${_pkgname}::git+https://github.com/xournalpp/xournalpp.git")
-sha256sums=('SKIP')
+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")
+sha256sums=('SKIP'
+ '9d84d91c9d38eefc82a99fcd726b9b6e1225949fb5fdf4a07c7335da0f448d14'
+ '3739e3a5538e53becf8864cdaeaa320ecc520a8a530d498491afc8ddff5accc1')
pkgver() {
cd "${srcdir}/${_pkgname}/"
@@ -25,6 +28,8 @@ pkgver() {
prepare() {
cd "${srcdir}/${_pkgname}/"
+ patch -p1 < ${srcdir}/4be5b5a1eab4c1ac873db237bc13c1be783081a7.patch
+ patch -p1 < ${srcdir}/12a409c8afc3c3ea8c8afebb67377c29e3d90035.patch
test -e "${srcdir}/${_pkgname}/build" || mkdir -p "${srcdir}/${_pkgname}/build"
cd "${srcdir}/${_pkgname}/build"
@@ -57,4 +62,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