* Upstream upgrade to 0.21.1

* Switch to qt5.
* It compiles qscintilla statically so exclude it from dependencies.

3 files changed, 15 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a6279313ebb1..52faec21743f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,21 @@
 # Generated by mksrcinfo v8
-# Wed Jul 12 21:26:14 UTC 2017
+# Wed Nov 14 20:02:11 UTC 2018
 pkgbase = codequery
 	pkgdesc = A code-understanding, code-browsing or code-search tool.
-	pkgver = 0.21.0
+	pkgver = 0.21.1
 	pkgrel = 1
 	url = http://ruben2020.github.io/codequery/
-	install = codequery.install
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	makedepends = cmake
-	depends = qscintilla
+	depends = qt5-base
 	optdepends = cscope: creation of CodeQuery databases
 	optdepends = ctags: creation of CodeQuery databases
 	optdepends = ruby-starscope: creation of CodeQuery databases for Ruby and Go source code
-	source = https://github.com/ruben2020/codequery/archive/v0.21.0.tar.gz
+	source = https://github.com/ruben2020/codequery/archive/v0.21.1.tar.gz
 	source = codequery.desktop
-	md5sums = 8e7ca5826939be860b161a7310dd6429
+	md5sums = 4ecb79636f76d89599384cc49d04e04b
 	md5sums = ad7e15affffa643a29a6afdd47200006
 
 pkgname = codequery
diff --git a/PKGBUILD b/PKGBUILD
index afb49988bf08..507c66a2a037 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,37 @@
 # Maintainer: Dobroslaw Kijowski [dobo] <dobo90_at_gmail.com>
 
 pkgname=codequery
-pkgver=0.21.0
+pkgver=0.21.1
 pkgrel=1
 pkgdesc='A code-understanding, code-browsing or code-search tool.'
 arch=(i686  x86_64)
 url=http://ruben2020.github.io/codequery/
 license=(GPL3)
-depends=(qscintilla)
+depends=(qt5-base)
 makedepends=(cmake)
 optdepends=('cscope: creation of CodeQuery databases'
             'ctags: creation of CodeQuery databases'
 #            'python2-pycscope: creation of CodeQuery databases for Python source code'
             'ruby-starscope: creation of CodeQuery databases for Ruby and Go source code')
-install=codequery.install
-source=(https://github.com/ruben2020/codequery/archive/v${pkgver}.tar.gz codequery.desktop)
-md5sums=('8e7ca5826939be860b161a7310dd6429'
+source=("https://github.com/ruben2020/codequery/archive/v${pkgver}.tar.gz" codequery.desktop)
+md5sums=('4ecb79636f76d89599384cc49d04e04b'
          'ad7e15affffa643a29a6afdd47200006')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   mkdir build
   cd build
 
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -G 'Unix Makefiles' ..
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -G 'Unix Makefiles' -DBUILD_QT5=ON ..
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}/build
+  cd "${srcdir}/${pkgname}-${pkgver}/build"
 
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install
 
-  install -D -m 644 ${srcdir}/codequery.desktop ${pkgdir}/usr/share/applications/codequery.desktop
-  install -D -m 644 ${srcdir}/${pkgname}-${pkgver}/gui/images/logo.png ${pkgdir}/usr/share/pixmaps/codequery.png
+  install -D -m 644 "${srcdir}/codequery.desktop" "${pkgdir}/usr/share/applications/codequery.desktop"
+  install -D -m 644 "${srcdir}/${pkgname}-${pkgver}/gui/images/logo.png" "${pkgdir}/usr/share/pixmaps/codequery.png"
 }
diff --git a/codequery.install b/codequery.install
deleted file mode 100644
index 9db382754ee1..000000000000
--- a/codequery.install
+++ /dev/null
@@ -1,17 +0,0 @@
-update_icons() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_install() {
-  update_icons
-  echo 'See tutorial at https://github.com/ruben2020/codequery/blob/master/doc/HOWTO-LINUX.md to learn how to create CodeQuery databases'
-}
-
-post_upgrade() {
-  update_icons
-}
-
-post_remove() {
-  update_icons
-}
-