From 483d636392c7aacab09dc3ecadb058be213e4663 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Tue, 21 Mar 2017 01:02:22 +0100
Subject: [PATCH] Sync git package with default ones

---
 c++utilities/git/PKGBUILD    |  4 ++--
 passwordfile/git/PKGBUILD    |  7 ++++++-
 passwordmanager/git/PKGBUILD |  4 ++--
 qtutilities/git/PKGBUILD     |  4 ++--
 syncthingtray/git/PKGBUILD   | 16 ++++++++++++----
 tageditor/git/PKGBUILD       |  4 ++--
 tagparser/git/PKGBUILD       |  4 ++--
 videodownloader/git/PKGBUILD |  2 +-
 8 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/c++utilities/git/PKGBUILD b/c++utilities/git/PKGBUILD
index a0bb3b91..d29c5a32 100644
--- a/c++utilities/git/PKGBUILD
+++ b/c++utilities/git/PKGBUILD
@@ -21,7 +21,7 @@ source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd "${srcdir}/${pkgname}"
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
@@ -32,7 +32,7 @@ build() {
 }
 
 check() {
-  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   make check
 }
 
diff --git a/passwordfile/git/PKGBUILD b/passwordfile/git/PKGBUILD
index 230b897c..e925debd 100644
--- a/passwordfile/git/PKGBUILD
+++ b/passwordfile/git/PKGBUILD
@@ -21,7 +21,7 @@ source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd "${srcdir}/${pkgname}"
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
@@ -31,6 +31,11 @@ build() {
   make
 }
 
+check() {
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
+  make check
+}
+
 package() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   make DESTDIR="${pkgdir}" install
diff --git a/passwordmanager/git/PKGBUILD b/passwordmanager/git/PKGBUILD
index 99ae9449..6a568b5e 100644
--- a/passwordmanager/git/PKGBUILD
+++ b/passwordmanager/git/PKGBUILD
@@ -11,7 +11,7 @@ pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='A simple password store using AES-256-CBC encryption via OpenSSL'
 license=('GPL')
-depends=('qt5-base' 'qtutilities' 'passwordfile' 'openssl' 'libxkbcommon-x11' 'desktop-file-utils' 'xdg-utils')
+depends=('qt5-base' 'qtutilities-git' 'passwordfile-git' 'openssl' 'libxkbcommon-x11' 'desktop-file-utils' 'xdg-utils')
 makedepends=('cmake' 'qt5-tools' 'git')
 provides=("${_name}")
 conflicts=("${_name}")
@@ -20,7 +20,7 @@ source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd "${srcdir}/${pkgname}"
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
diff --git a/qtutilities/git/PKGBUILD b/qtutilities/git/PKGBUILD
index 85b1019d..710ff317 100644
--- a/qtutilities/git/PKGBUILD
+++ b/qtutilities/git/PKGBUILD
@@ -11,7 +11,7 @@ pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models'
 license=('GPL')
-depends=('c++utilities' 'qt5-base')
+depends=('c++utilities-git' 'qt5-base')
 makedepends=('cmake' 'git' 'qt5-tools')
 provides=("${_name}")
 conflicts=("${_name}")
@@ -20,7 +20,7 @@ source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd "${srcdir}/${pkgname}"
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
diff --git a/syncthingtray/git/PKGBUILD b/syncthingtray/git/PKGBUILD
index 1111cbd6..d55f0d21 100644
--- a/syncthingtray/git/PKGBUILD
+++ b/syncthingtray/git/PKGBUILD
@@ -6,18 +6,23 @@
 # set the web view provider: either webkit, webengine, auto or none
 _webview_provider=webkit
 
+# set to non-empty string to enable KIO plugin to show Syncthing actions in
+# Dolphin file browser
+_enable_kio_plugin=1
+
 _reponame=syncthingtray
 pkgname=syncthingtray-git
 _name=${pkgname%-git}
-pkgver=0.4.1
+pkgver=0.5.1
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='Tray application for Syncthing'
 license=('GPL')
-depends=('qtutilities' 'qt5-svg' 'openssl' 'desktop-file-utils' 'xdg-utils')
+depends=('qtutilities-git' 'qt5-svg' 'openssl' 'desktop-file-utils' 'xdg-utils')
 [[ $_webview_provider == none ]] && depends+=('qt5-base')
 [[ $_webview_provider == webkit ]] && depends+=('qt5-webkit')
 [[ $_webview_provider == webengine ]] && depends+=('qt5-webengine')
+[[ $_enable_kio_plugin ]] && optdepends+=('kio: KIO plugin for Syncthing actions in Dolphin')
 makedepends=('cmake' 'qt5-tools' 'git')
 provides=("${_name}")
 conflicts=("${_name}")
@@ -26,17 +31,20 @@ source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd "${srcdir}/${pkgname}"
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
+  local additional_args=
+  [[ $_enable_kio_plugin ]] || additional_args+=-DNO_FILE_ITEM_ACTION_PLUGIN=ON
   cmake \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX="/usr" \
     -DWEBVIEW_PROVIDER="${_webview_provider}" \
-    -DSYSTEMD_SUPPORT=ON
+    -DSYSTEMD_SUPPORT=ON \
+    $additional_args
   make
 }
 
diff --git a/tageditor/git/PKGBUILD b/tageditor/git/PKGBUILD
index 2e603e6f..5296cfba 100644
--- a/tageditor/git/PKGBUILD
+++ b/tageditor/git/PKGBUILD
@@ -17,7 +17,7 @@ pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus and Matroska'
 license=('GPL')
-depends=('qtutilities' 'tagparser' 'desktop-file-utils' 'xdg-utils')
+depends=('qtutilities-git' 'tagparser-git' 'desktop-file-utils' 'xdg-utils')
 [[ $_webview_provider == none ]] && [[ $_js_provider == none ]] && depends+=('qt5-base')
 [[ $_webview_provider == webkit ]] && depends+=('qt5-webkit')
 [[ $_webview_provider == webengine ]] && depends+=('qt5-webengine')
@@ -31,7 +31,7 @@ source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd "${srcdir}/${pkgname}"
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
diff --git a/tagparser/git/PKGBUILD b/tagparser/git/PKGBUILD
index ffd654f4..2c0b5c90 100644
--- a/tagparser/git/PKGBUILD
+++ b/tagparser/git/PKGBUILD
@@ -11,7 +11,7 @@ pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus and Matroska tags'
 license=('GPL')
-depends=('c++utilities' 'zlib')
+depends=('c++utilities-git' 'zlib')
 makedepends=('cmake' 'git')
 provides=("${_name}")
 conflicts=("${_name}")
@@ -20,7 +20,7 @@ source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd "${srcdir}/${pkgname}"
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
diff --git a/videodownloader/git/PKGBUILD b/videodownloader/git/PKGBUILD
index f10ce8cb..60ca4ce8 100644
--- a/videodownloader/git/PKGBUILD
+++ b/videodownloader/git/PKGBUILD
@@ -11,7 +11,7 @@ pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='A video downloader with Qt GUI (currently only YouTube and Vimeo are maintained)'
 license=('GPL')
-depends=('qtutilities' 'openssl' 'desktop-file-utils' 'xdg-utils')
+depends=('qtutilities-git' 'openssl' 'desktop-file-utils' 'xdg-utils')
 makedepends=('cmake' 'qt5-tools' 'git')
 provides=("${_name}")
 conflicts=("${_name}")