diff options
| -rw-r--r-- | .SRCINFO | 45 | ||||
| -rw-r--r-- | GlobalParams.cc.patch | 3 | ||||
| -rw-r--r-- | PKGBUILD | 84 | ||||
| -rw-r--r-- | configure.patch | 54 | ||||
| -rw-r--r-- | utils.cpp.patch | 4 | ||||
| -rw-r--r-- | utopia-documents.bash | 2 | ||||
| -rw-r--r-- | utopia-documents.sh | 13 | ||||
| -rw-r--r-- | utopia-documents.zsh | 2 |
8 files changed, 43 insertions, 164 deletions
@@ -1,43 +1,24 @@ pkgbase = utopia-documents - pkgdesc = PDF reader that displays interactive annotations on scientific articles. - pkgver = 2.4.4 + pkgdesc = PDF reader that displays interactive annotations on scientific articles + pkgver = 3.0.0 pkgrel = 1 - url = http://utopiadocs.cs.man.ac.uk + url = http://utopiadocs.com arch = i686 arch = x86_64 license = GPL - makedepends = raptor1 - makedepends = swig makedepends = cmake + makedepends = boost + makedepends = swig makedepends = glew - depends = libqglviewer-qt4 - depends = python2 - depends = boost - depends = boost-libs + depends = libqglviewer depends = pcre - depends = ttf-ms-fonts - depends = qt4 - depends = qjson - depends = liblxqt-git - depends = python2-pillow - depends = python2-lxml - depends = python2-cssselect - depends = python2-suds - provides = utopia-documents - source = http://utopiadocs.cs.man.ac.uk/files/utopia-documents-2.4.4.zip - source = configure.patch - source = GlobalParams.cc.patch - source = utopia-documents.sh - source = utopia-documents.bash - source = utopia-documents.zsh - source = utils.cpp.patch - sha256sums = 80bcf57a6e1b53586e1a62137a0c4a74c411fc49fef2f9b9bfa9f8e9e8ecbc64 - sha256sums = 4c2b62839d22e26ee8e069416b30d8c2dde35ec72fc8b3e8851df2a763495b43 - sha256sums = b0cfa242c63e192e1099e83ea8e23430469bb8d9bb2a07f3ca3d336c78b8dcca - sha256sums = 9e4c9f9aee0b3bfa9625989f3de4de5032f7b656b5f6f050d206d1541e30d41a - sha256sums = 64524d3a3be66f403db44ef40772717aff38445e0e4208c15ac166fe2fcfad0a - sha256sums = 64524d3a3be66f403db44ef40772717aff38445e0e4208c15ac166fe2fcfad0a - sha256sums = 79e60cae2d746a2c323e328a4a2d6e6ef02ca5a2d2f244b6ccbd3229580d95d9 + depends = qt5-svg + depends = qt5-webkit + depends = qt5-script + depends = poppler-qt5 + depends = python2-pyqt5 + source = http://utopiadocs.com/files/utopia-documents-3.0.0.tgz + sha256sums = 1c259b68fada7f98080a66a63e36c707b78bfc3a5c80a956568ee73c030c8cac pkgname = utopia-documents diff --git a/GlobalParams.cc.patch b/GlobalParams.cc.patch deleted file mode 100644 index 67f9d8dfd9b2..000000000000 --- a/GlobalParams.cc.patch +++ /dev/null @@ -1,3 +0,0 @@ -179a180,181 -> "/usr/share/fonts/Type1", -> "/usr/share/fonts/TTF/", @@ -1,63 +1,39 @@ +# Maintainer: archlinux.info:tdy # Contributor: Zhu Jinxuan <zhujinxuan@gmail.com> -# Maintainer: Zhu Jinxuan <zhujinxuan@gmail.com> -# This PKGBUILD is also available in https://github.com/zhujinxuan/PKGBUILDs pkgname=utopia-documents -pkgver=2.4.4 +pkgver=3.0.0 pkgrel=1 -pkgdesc="PDF reader that displays interactive annotations on scientific articles. " -arch=('i686' 'x86_64') -url='http://utopiadocs.cs.man.ac.uk' -license=('GPL') -depends=('libqglviewer-qt4' 'python2' 'boost' 'boost-libs' 'pcre' 'ttf-ms-fonts' 'qt4' 'qjson' 'liblxqt-git' - 'python2-pillow' - 'python2-lxml' - 'python2-cssselect' - 'python2-suds') -makedepends=( 'raptor1' 'swig' 'cmake' 'glew') -optdepends=() -provides=('utopia-documents') -conflicts=() -replaces=() -backup=() -options=() -install= -changelog= -source=("http://utopiadocs.cs.man.ac.uk/files/${pkgname}-${pkgver}.zip" "configure.patch" "GlobalParams.cc.patch" - "utopia-documents.sh" "utopia-documents.bash" "utopia-documents.zsh" - "utils.cpp.patch" ) -sha256sums=('80bcf57a6e1b53586e1a62137a0c4a74c411fc49fef2f9b9bfa9f8e9e8ecbc64' '4c2b62839d22e26ee8e069416b30d8c2dde35ec72fc8b3e8851df2a763495b43' 'b0cfa242c63e192e1099e83ea8e23430469bb8d9bb2a07f3ca3d336c78b8dcca' - '9e4c9f9aee0b3bfa9625989f3de4de5032f7b656b5f6f050d206d1541e30d41a' - '64524d3a3be66f403db44ef40772717aff38445e0e4208c15ac166fe2fcfad0a' - '64524d3a3be66f403db44ef40772717aff38445e0e4208c15ac166fe2fcfad0a' - '79e60cae2d746a2c323e328a4a2d6e6ef02ca5a2d2f244b6ccbd3229580d95d9' -) +pkgdesc="PDF reader that displays interactive annotations on scientific articles" +arch=(i686 x86_64) +url=http://utopiadocs.com +license=(GPL) +depends=(libqglviewer pcre qt5-svg qt5-webkit qt5-script poppler-qt5 python2-pyqt5) +makedepends=(cmake boost swig glew) +source=(http://utopiadocs.com/files/$pkgname-$pkgver.tgz) +sha256sums=(1c259b68fada7f98080a66a63e36c707b78bfc3a5c80a956568ee73c030c8cac) + +prepare() { + install -m755 -d $pkgname-$pkgver/utopia-build/dependencies + cd $pkgname-$pkgver/utopia-build/dependencies + cmake ../../dependencies \ + -C../../dependencies/CMakeConfig/configurations/Linux.txt \ + -C../../dependencies/CMakeConfig/configurations/common.txt +} build() { - export Automoc4_DIR=/usr/lib/automoc4 - # unzip "${pkgname}-${pkgver}".zip - cd "${pkgname}-${pkgver}" - cp ../configure.patch ./ - # cp ../GlobalParams.cc.patch libcrackle/crackle/libxpdf/ - patch libcrackle/crackle/libxpdf/GlobalParams.cc ../GlobalParams.cc.patch - patch libambrosia/ambrosia/utils.cpp ../utils.cpp.patch - patch configure configure.patch - ./configure --release - cd build/Linux-Release - cp CMakeCache.txt CMakeCache.txt.1 - sed -i 's|CMAKE_INSTALL_PREFIX:PATH=\/usr|CMAKE_INSTALL_PREFIX:PATH=XXXX|g' CMakeCache.txt.1 - sed -i "s|XXXX|$pkgdir/usr|g" CMakeCache.txt.1 - cp CMakeCache.txt.1 CMakeCache.txt - make + cd $pkgname-$pkgver/utopia-build + cmake .. \ + -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ + -DUTOPIA_PACKAGE_MANAGED:BOOL=ON \ + -C../CMakeConfig/configurations/Linux.txt \ + -C../CMakeConfig/configurations/common.txt \ + -DCMAKE_BUILD_TYPE:STRING=Release \ + -DUTOPIA_DEPENDENCIES_DIR:STRING=./utopia-build/dependencies + make } package() { - mkdir ${pkgdir}/etc/profile.d/ -p - install utopia-documents.bash --target-directory=${pkgdir}/etc/profile.d/ - install utopia-documents.sh --target-directory=${pkgdir}/etc/profile.d/ - install utopia-documents.zsh --target-directory=${pkgdir}/etc/profile.d/ - cd "${pkgname}-${pkgver}" - cd build/Linux-Release - make install - -} + cd $pkgname-$pkgver/utopia-build + make DESTDIR="$pkgdir" install +} diff --git a/configure.patch b/configure.patch deleted file mode 100644 index 238667879949..000000000000 --- a/configure.patch +++ /dev/null @@ -1,54 +0,0 @@ -82,92c82,83 -< select yn in "Yes" "No"; do -< case $yn in -< Yes) -< mkdir -p "$SUGGEST" -< DEST="$SUGGEST" -< break -< ;; -< No) break -< ;; -< esac -< done ---- -> mkdir -p "$SUGGEST" -> DEST="$SUGGEST" -97,108c88 -< select yn in "Yes" "No"; do -< case $yn in -< Yes) -< rm -f CMakeCache.txt -< break -< ;; -< No) -< echo "Aborted configuration." -< exit 1 -< ;; -< esac -< done ---- -> rm -f CMakeCache.txt -113,128c93,98 -< select yn in "Yes" "No"; do -< case $yn in -< Yes) -< cd "$DEP" -< cmake -D "CMAKE_BUILD_TYPE:STRING=$TYPE" \ -< -C "CMakeConfig/configurations/$PLAT.txt" \ -< -C "CMakeConfig/configurations/common.txt" \ -< -G "$GEN" . || exit 1 -< make || exit 1 -< break -< ;; -< No) -< exit 1 -< ;; -< esac -< done ---- -> cd "$DEP" -> cmake -D "CMAKE_BUILD_TYPE:STRING=$TYPE" \ -> -C "CMakeConfig/configurations/$PLAT.txt" \ -> -C "CMakeConfig/configurations/common.txt" \ -> -G "$GEN" . || exit 1 -> make || exit 1 diff --git a/utils.cpp.patch b/utils.cpp.patch deleted file mode 100644 index 07cd0b6a1ddf..000000000000 --- a/utils.cpp.patch +++ /dev/null @@ -1,4 +0,0 @@ -85c85 -< glShaderSource = (void (*)(GLuint, GLsizei, const GLchar**, const GLint*))glShaderSourceARB; ---- -> glShaderSource = (void (*)(GLuint, GLsizei, const GLchar* const*, const GLint*))glShaderSourceARB; diff --git a/utopia-documents.bash b/utopia-documents.bash deleted file mode 100644 index 5f4ae52a2adc..000000000000 --- a/utopia-documents.bash +++ /dev/null @@ -1,2 +0,0 @@ - -export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/utopia-documents/lib/:/usr/lib/utopia-documents/python/:/usr/lib/utopia-documents/plugins/" diff --git a/utopia-documents.sh b/utopia-documents.sh deleted file mode 100644 index 4ca9352ec91e..000000000000 --- a/utopia-documents.sh +++ /dev/null @@ -1,13 +0,0 @@ -# By Jinxuan Zhu, <zhujinxuan@gmail.com>, Snow @ AUR -# Based on autojump.sh - -shell=`echo ${SHELL} | awk -F/ '{ print $NF }'` - -# prevent circular loop for sh shells -if [ "${shell}" = "sh" ] ; then - return 0 -elif [ -s ~/.utopia-documents/etc/profile.d/utopia-documents.${shell} ]; then - source ~/.utopia-documents/etc/profile.d/utopia-documents.${shell} -elif [ -s /etc/profile.d/utopia-documents.${shell} ]; then - source /etc/profile.d/utopia-documents.${shell} -fi diff --git a/utopia-documents.zsh b/utopia-documents.zsh deleted file mode 100644 index 5f4ae52a2adc..000000000000 --- a/utopia-documents.zsh +++ /dev/null @@ -1,2 +0,0 @@ - -export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/utopia-documents/lib/:/usr/lib/utopia-documents/python/:/usr/lib/utopia-documents/plugins/" |