summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman2017-08-26 20:48:42 +0300
committerRoman2017-08-26 20:48:42 +0300
commit341fa5b50159b593c5ee1059bf9e7024f59de85d (patch)
tree91ce16146a375b0a83fb11753b0b125d67d7ba4c
parent960e504fe0e21f99b576024cbe13df6d9ff89597 (diff)
parentc1707060ad1115e52b65e8670772275b61eddf0f (diff)
downloadaur-utopia-documents3.tar.gz
Merge branch 'feature/v3.1' into develop
-rw-r--r--.SRCINFO10
-rw-r--r--.gitignore4
-rw-r--r--PKGBUILD19
3 files changed, 23 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 57dc4d562d3..dedd7e7849d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Fri Feb 10 12:03:30 UTC 2017
pkgbase = utopia-documents3
pkgdesc = PDF reader that displays interactive annotations on scientific articles
- pkgver = 3.0.0
+ pkgver = 3.1.0
pkgrel = 1
url = http://utopiadocs.com
arch = i686
@@ -21,13 +19,15 @@ pkgbase = utopia-documents3
depends = python2-pyqt5
provides = utopia-documents3
conflicts = utopia-documents
- source = http://utopiadocs.com/files/utopia-documents-3.0.0.tgz
+ source = http://utopiadocs.com/files/utopia-documents-3.1.0.tgz
source = configure.patch
+ source = bubble.patch
source = utopia-documents.sh
source = utopia-documents.bash
source = utopia-documents.zsh
- sha256sums = 1c259b68fada7f98080a66a63e36c707b78bfc3a5c80a956568ee73c030c8cac
+ sha256sums = e6db50a16d2ae53ce051217e6941c5796bf5b9d517b0623ab6ff0b617b04f365
sha256sums = 808a26f259768507e864d729191b8dd85a6472f43d9c1f507dd775dd1eaedcc2
+ sha256sums = 407aefc4b150be472a12f4a293bf3ac44918affa18cc78e684aba2f9a1a62f71
sha256sums = 9e4c9f9aee0b3bfa9625989f3de4de5032f7b656b5f6f050d206d1541e30d41a
sha256sums = 64524d3a3be66f403db44ef40772717aff38445e0e4208c15ac166fe2fcfad0a
sha256sums = 64524d3a3be66f403db44ef40772717aff38445e0e4208c15ac166fe2fcfad0a
diff --git a/.gitignore b/.gitignore
index 80ca1dbc91c..19bf0281347 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
*.tgz
+*.log
+*.log.*
+*.xz
+
diff --git a/PKGBUILD b/PKGBUILD
index ed20a357ae3..5914f6b65fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: tdy tdy@archlinux.info
pkgname=utopia-documents3
-pkgver=3.0.0
+pkgver=3.1.0
pkgrel=1
pkgdesc="PDF reader that displays interactive annotations on scientific articles"
arch=(i686 x86_64)
@@ -11,24 +11,27 @@ url=http://utopiadocs.com
license=(GPL)
provides=('utopia-documents3')
conflicts=('utopia-documents')
-depends=(libqglviewer pcre qt5-svg qt5-webkit qt5-script poppler-qt5 python2-pyqt5)
+depends=(python boost-libs glu hicolor-icon-theme pcre qt5-svg qt5-webkit qt5-script poppler-qt5 python2-pyqt5)
makedepends=(cmake boost swig glew)
source=("http://utopiadocs.com/files/utopia-documents-${pkgver}.tgz"
"configure.patch"
+ "bubble.patch"
"utopia-documents.sh"
"utopia-documents.bash"
"utopia-documents.zsh")
-sha256sums=('1c259b68fada7f98080a66a63e36c707b78bfc3a5c80a956568ee73c030c8cac'
+sha256sums=('e6db50a16d2ae53ce051217e6941c5796bf5b9d517b0623ab6ff0b617b04f365'
'808a26f259768507e864d729191b8dd85a6472f43d9c1f507dd775dd1eaedcc2'
'9e4c9f9aee0b3bfa9625989f3de4de5032f7b656b5f6f050d206d1541e30d41a'
'64524d3a3be66f403db44ef40772717aff38445e0e4208c15ac166fe2fcfad0a'
'64524d3a3be66f403db44ef40772717aff38445e0e4208c15ac166fe2fcfad0a')
prepare() {
-PATCH="configure.patch"
+PATCH="${srcdir}/configure.patch"
cd utopia-documents-$pkgver
-patch configure ../$PATCH
+
+patch configure $PATCH
+patch libutopia2_qt/utopia2/qt/bubble.h ${srcdir}/bubble.patch
./configure --release
@@ -54,3 +57,9 @@ package() {
cd utopia-documents-$pkgver/build/Linux-Release
make install
}
+sha256sums=('e6db50a16d2ae53ce051217e6941c5796bf5b9d517b0623ab6ff0b617b04f365'
+ '808a26f259768507e864d729191b8dd85a6472f43d9c1f507dd775dd1eaedcc2'
+ '407aefc4b150be472a12f4a293bf3ac44918affa18cc78e684aba2f9a1a62f71'
+ '9e4c9f9aee0b3bfa9625989f3de4de5032f7b656b5f6f050d206d1541e30d41a'
+ '64524d3a3be66f403db44ef40772717aff38445e0e4208c15ac166fe2fcfad0a'
+ '64524d3a3be66f403db44ef40772717aff38445e0e4208c15ac166fe2fcfad0a')