summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorquininer kel2017-05-10 20:03:57 +0800
committerquininer kel2017-05-10 20:03:57 +0800
commit45a320ee9cd692baac4225b81bb22adbfe1b587b (patch)
tree65cad18976d6985f400133150917e4f5e233140f
parent3326852120505fa8b23d9c81ce9cea174ad57cdd (diff)
downloadaur-45a320ee9cd692baac4225b81bb22adbfe1b587b.tar.gz
update
-rw-r--r--.SRCINFO15
-rw-r--r--PKGBUILD13
2 files changed, 11 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7ccce7cc8e3c..16849ea9300e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
# Generated by mksrcinfo v8
-# Sun Dec 18 12:01:35 UTC 2016
+# Wed May 10 12:03:48 UTC 2017
pkgbase = xournalpp-git
pkgdesc = C++ re-write of tablet notetaking app Xournal
- pkgver = 1.0.0.333.g38d235d
+ pkgver = 1.0.0.338.g3a86f9f
pkgrel = 1
url = https://github.com/xournalpp/xournalpp
install = xournalpp.install
arch = i686
arch = x86_64
- license = GPL3
+ license = GPL-2.0
makedepends = git
makedepends = cmake
makedepends = gettext
@@ -20,13 +20,10 @@ pkgbase = xournalpp-git
depends = poppler-glib
depends = glibmm
depends = desktop-file-utils
- provides = xournal=1.0.0.333.g38d235d
- provides = xournal-dmgerman=1.0.0.333.g38d235d xournalpp=1.0.0.333.g38d235d
- conflicts = xournal
+ depends = poppler-glib
+ provides = xournal=1.0.0.338.g3a86f9f
+ provides = xournal-dmgerman=1.0.0.338.g3a86f9f xournalpp=1.0.0.338.g3a86f9f
conflicts = xournalpp
- conflicts = xournal-dmgerman
- conflicts = xournal-image-patched
- conflicts = xournalpp-svn
source = xournalpp::git+https://github.com/xournalpp/xournalpp.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index e4342af7c18b..959699bf679f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,16 +3,16 @@
_pkgname="xournalpp"
pkgname="${_pkgname}-git"
-pkgver=1.0.0.333.g38d235d
+pkgver=1.0.0.338.g3a86f9f
pkgrel=1
pkgdesc="C++ re-write of tablet notetaking app Xournal"
arch=('i686' 'x86_64')
url="https://github.com/xournalpp/xournalpp"
-license=('GPL3')
+license=('GPL-2.0')
makedepends=('git' 'cmake' 'gettext' 'boost')
-depends=('gtk2' 'boost-libs' 'glib2' 'libglade' 'poppler-glib' 'glibmm' 'desktop-file-utils')
+depends=('gtk2' 'boost-libs' 'glib2' 'libglade' 'poppler-glib' 'glibmm' 'desktop-file-utils' 'poppler-glib')
provides=("xournal=${pkgver}" "xournal-dmgerman=${pkgver} xournalpp=${pkgver}")
-conflicts=('xournal' 'xournalpp' 'xournal-dmgerman' 'xournal-image-patched' 'xournalpp-svn')
+conflicts=('xournalpp')
install="xournalpp.install"
source=("${_pkgname}::git+https://github.com/xournalpp/xournalpp.git")
sha256sums=('SKIP')
@@ -25,8 +25,7 @@ pkgver() {
prepare() {
cd "${srcdir}/${_pkgname}/"
- rm -rf "${srcdir}/${_pkgname}/build" || true
- mkdir -p "${srcdir}/${_pkgname}/build"
+ test -e "${srcdir}/${_pkgname}/build" || mkdir -p "${srcdir}/${_pkgname}/build"
cd "${srcdir}/${_pkgname}/build"
cmake -DENABLE_OS="OFF" -DENABLE_MATHTEX="OFF" -DCMAKE_INSTALL_PREFIX="/usr/" ..
@@ -35,7 +34,6 @@ prepare() {
build() {
cd "${srcdir}/${_pkgname}/build"
make
- echo
}
package() {
@@ -43,7 +41,6 @@ package() {
# sed 's|/usr/local|/usr|g' -i "${srcdir}/${_pkgname}/build/cmake_install.cmake" || true
make DESTDIR="${pkgdir}/" install
- echo
mkdir -p "${pkgdir}/usr/share/icons/hicolor/scalable/apps"
mkdir -p "${pkgdir}/usr/share/icons/hicolor/scalable/mimetypes"