Make Git versions of my libs co-installable with release version

2020-01-31 18:44:31 +01:00 · 2020-01-31 18:44:31 +01:00 · 7913e56a52
parent 7b0972f346
commit 7913e56a52
10 changed files with 56 additions and 23 deletions
--- a/c++utilities/git/PKGBUILD
+++ b/c++utilities/git/PKGBUILD
@ -6,8 +6,8 @@
 _reponame=cpp-utilities
 pkgname=c++utilities-git
 _name=${pkgname%-git}
-pkgver=259.663b31c
-pkgrel=1
+pkgver=791.eadb261
+pkgrel=2
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc='Common C++ classes and routines such as argument parser, IO and conversion utilities'
 license=('GPL')
@ -16,7 +16,7 @@ optdepends=("$_name-doc: API documentation")
 makedepends=('cmake' 'git')
 checkdepends=('cppunit')
 #provides=("${_name}")
-conflicts=("${_name}")
+#conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
 source=("${_reponame}::${MARTCHUS_GIT_URL_PREFIX:-git://github.com/Martchus}/${_reponame}.git")
 sha256sums=('SKIP')
@ -31,6 +31,9 @@ build() {
  cmake \
    -DCMAKE_BUILD_TYPE:STRING='Release' \
    -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
+    -DCONFIGURATION_NAME:STRING='git' \
+    -DCONFIGURATION_PACKAGE_SUFFIX:STRING='-git' \
+    -DCONFIGURATION_TARGET_SUFFIX:STRING='git' \
    -DBUILD_SHARED_LIBS:BOOL=ON \
    .
  make
--- a/passwordfile/git/PKGBUILD
+++ b/passwordfile/git/PKGBUILD
@ -6,7 +6,7 @@
 _reponame=passwordfile
 pkgname=passwordfile-git
 _name=${pkgname%-git}
-pkgver=100.a3d104c
+pkgver=105.b1a55de
 pkgrel=2
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc='C++ library to read/write passwords from/to encrypted files using AES-256-CBC via OpenSSL'
@ -16,7 +16,7 @@ optdepends=("$_name-doc: API documentation")
 makedepends=('cmake' 'git')
 checkdepends=('cppunit')
 #provides=("${_name}")
-conflicts=("${_name}")
+#conflicts=("${_name}")
 install=
 url="https://github.com/Martchus/${_reponame}"
 source=("${_reponame}::${MARTCHUS_GIT_URL_PREFIX:-git://github.com/Martchus}/${_reponame}.git")
@ -32,6 +32,9 @@ build() {
  cmake \
    -DCMAKE_BUILD_TYPE:STRING='Release' \
    -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
+    -DCONFIGURATION_NAME:STRING='git' \
+    -DCONFIGURATION_PACKAGE_SUFFIX:STRING='-git' \
+    -DCONFIGURATION_TARGET_SUFFIX:STRING='git' \
    -DBUILD_SHARED_LIBS:BOOL=ON \
    .
  make
--- a/passwordmanager/git/PKGBUILD
+++ b/passwordmanager/git/PKGBUILD
@ -9,8 +9,8 @@ _quick_gui=${PASSWORD_MANAGER_QUICK_GUI:-ON}
 _reponame=passwordmanager
 pkgname=passwordmanager-git
 _name=${pkgname%-git}
-pkgver=271.7374869
-pkgrel=3
+pkgver=275.7ac57bb
+pkgrel=2
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc='A simple password store using AES-256-CBC encryption via OpenSSL'
 license=('GPL')
@ -36,7 +36,11 @@ pkgver() {

 build() {
  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
-  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr" -DQUICK_GUI="$_quick_gui" .
+  cmake \
+    -DCMAKE_BUILD_TYPE:STRING='Release' \
+    -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
+    -DCONFIGURATION_PACKAGE_SUFFIX:STRING='-git' \
+    -DQUICK_GUI="$_quick_gui" .
  make
 }

--- a/qtutilities/git/PKGBUILD
+++ b/qtutilities/git/PKGBUILD
@ -6,7 +6,7 @@
 _reponame=qtutilities
 pkgname=qtutilities-git
 _name=${pkgname%-git}
-pkgver=308.5cb0d80
+pkgver=325.6874917
 pkgrel=2
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models'
@ -15,7 +15,7 @@ depends=('c++utilities-git' 'qt5-base' 'mesa')
 optdepends=("$_name-doc: API documentation")
 makedepends=('cmake' 'git' 'qt5-tools')
 #provides=("${_name}")
-conflicts=("${_name}")
+#conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
 source=("${_reponame}::${MARTCHUS_GIT_URL_PREFIX:-git://github.com/Martchus}/${_reponame}.git")
 sha256sums=('SKIP')
@ -30,6 +30,9 @@ build() {
  cmake \
    -DCMAKE_BUILD_TYPE:STRING='Release' \
    -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
+    -DCONFIGURATION_NAME:STRING='git' \
+    -DCONFIGURATION_PACKAGE_SUFFIX:STRING='-git' \
+    -DCONFIGURATION_TARGET_SUFFIX:STRING='git' \
    -DBUILD_SHARED_LIBS:BOOL=ON \
    .
  make
--- a/reflective-rapidjson/git/PKGBUILD
+++ b/reflective-rapidjson/git/PKGBUILD
@ -7,7 +7,7 @@ _reponame=reflective-rapidjson
 _llvmver=9
 pkgname=reflective-rapidjson-git
 _name=${pkgname%-git}
-pkgver=172.d7e7bdb
+pkgver=197.c68d9ea
 pkgrel=2
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc='Code generator for serializing/deserializing C++ objects to/from JSON using Clang and RapidJSON'
@ -18,7 +18,7 @@ optdepends=("boost: use Boost.Hana instead of code generator"
 makedepends=('cmake' 'clang-tools-extra' 'llvm' 'git')
 checkdepends=('cppunit' 'boost')
 #provides=("${_name}")
-conflicts=("${_name}")
+#conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
 source=("${_reponame}::${MARTCHUS_GIT_URL_PREFIX:-git://github.com/Martchus}/${_reponame}.git")
 sha256sums=('SKIP')
@ -33,6 +33,9 @@ build() {
  cmake \
    -DCMAKE_BUILD_TYPE:STRING='Release' \
    -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
+    -DCONFIGURATION_NAME:STRING='git' \
+    -DCONFIGURATION_PACKAGE_SUFFIX:STRING='-git' \
+    -DCONFIGURATION_TARGET_SUFFIX:STRING='git' \
    -DBUILD_SHARED_LIBS:BOOL=ON \
    .
  make
--- a/repoindex/git/PKGBUILD
+++ b/repoindex/git/PKGBUILD
@ -14,8 +14,8 @@ license=('GPL')
 depends=('qt5-base' 'qt5-websockets' 'karchive' 'pacman' 'c++utilities-git')
 makedepends=('cmake' 'git' 'yuicompressor' 'qtutilities-git')
 backup=("etc/${_reponame}.conf")
-provides=("${_name}")
-conflicts=("${_name}")
+#provides=("${_name}")
+#conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
 options=(emptydirs)
 source=("${_reponame}::${MARTCHUS_GIT_URL_PREFIX:-git://github.com/Martchus}/${_reponame}.git")
@ -31,6 +31,9 @@ build() {
  cmake \
    -DCMAKE_BUILD_TYPE:STRING='Release' \
    -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
+    -DCONFIGURATION_NAME:STRING='git' \
+    -DCONFIGURATION_PACKAGE_SUFFIX:STRING='-git' \
+    -DCONFIGURATION_TARGET_SUFFIX:STRING='git' \
    -DBUILD_SHARED_LIBS:BOOL=ON \
    .
  make
--- a/syncthingtray/git/PKGBUILD
+++ b/syncthingtray/git/PKGBUILD
@ -25,8 +25,8 @@ _enable_plasmoid=${SYNCTHING_TRAY_ENABLE_PLASMOID:-1}
 _reponame=syncthingtray
 pkgname=syncthingtray-git
 _name=${pkgname%-git}
-pkgver=0.7.2
-pkgrel=1
+pkgver=864.133dbac
+pkgrel=2
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc='Tray application for Syncthing'
 license=('GPL')
@ -42,7 +42,7 @@ makedepends=('cmake' 'qt5-tools' 'git' 'mesa')
 checkdepends=('cppunit' 'syncthing' 'iproute2')
 [[ $_enable_kio_plugin ]] && makedepends+=('kio')
 [[ $_enable_plasmoid ]] && makedepends+=('plasma-framework' 'extra-cmake-modules')
-provides=("${_name}")
+#provides=("${_name}")
 conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
 source=("${_reponame}::${MARTCHUS_GIT_URL_PREFIX:-git://github.com/Martchus}/${_reponame}.git")
@ -67,6 +67,13 @@ build() {
  cmake \
    -DCMAKE_BUILD_TYPE:STRING='Release' \
    -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
+    -DCONFIGURATION_NAME:STRING='git' \
+    -DCONFIGURATION_PACKAGE_SUFFIX:STRING='-git' \
+    -DLIB_SYNCTHING_CONNECTOR_CONFIGURATION_TARGET_SUFFIX:STRING='-git' \
+    -DSYNCTHINGFILEITEMACTION_CONFIGURATION_TARGET_SUFFIX:STRING='-git' \
+    -DLIB_SYNCTHING_MODEL_CONFIGURATION_TARGET_SUFFIX:STRING='-git' \
+    -DSYNCTHINGPLASMOID_TARGET_SUFFIX:STRING='-git' \
+    -DSYNCTHINGWIDGETS_TARGET_SUFFIX:STRING='-git' \
    -DBUILD_SHARED_LIBS:BOOL=ON \
    -DWEBVIEW_PROVIDER="${_webview_provider}" \
    -DJS_PROVIDER="${_js_provider}" \
--- a/tageditor/git/PKGBUILD
+++ b/tageditor/git/PKGBUILD
@ -15,7 +15,7 @@ _json_export=${TAGEDITOR_JSON_EXPORT:-ON}
 _reponame=tageditor
 pkgname=tageditor-git
 _name=${pkgname%-git}
-pkgver=504.d3f84c4
+pkgver=529.f6852b2
 pkgrel=2
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc='A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska'
@ -45,11 +45,13 @@ build() {
  cmake \
    -DCMAKE_BUILD_TYPE:STRING='Release' \
    -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
+    -DCONFIGURATION_NAME:STRING='git' \
+    -DCONFIGURATION_PACKAGE_SUFFIX:STRING='-git' \
    -DBUILD_SHARED_LIBS:BOOL=ON \
    -DWEBVIEW_PROVIDER="${_webview_provider}" \
    -DJS_PROVIDER="${_js_provider}" \
    -DENABLE_JSON_EXPORT="${_json_export}" \
-    -DREFLECTION_GENERATOR_EXECUTABLE:FILEPATH='/usr/bin/reflective_rapidjson_generator' \
+    -DREFLECTION_GENERATOR_EXECUTABLE:FILEPATH='/usr/bin/reflective_rapidjson_generator-git' \
    .
  make
 }
--- a/tagparser/git/PKGBUILD
+++ b/tagparser/git/PKGBUILD
@ -6,7 +6,7 @@
 _reponame=tagparser
 pkgname=tagparser-git
 _name=${pkgname%-git}
-pkgver=550.6e9b397
+pkgver=560.fb4633a
 pkgrel=2
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc='C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags'
@ -16,7 +16,7 @@ optdepends=("$_name-doc: API documentation")
 makedepends=('cmake' 'git')
 checkdepends=('cppunit' 'openssl')
 #provides=("${_name}")
-conflicts=("${_name}")
+#conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
 source=("${_reponame}::${MARTCHUS_GIT_URL_PREFIX:-git://github.com/Martchus}/${_reponame}.git")
 sha256sums=('SKIP')
@ -31,6 +31,9 @@ build() {
  cmake \
    -DCMAKE_BUILD_TYPE:STRING='Release' \
    -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
+    -DCONFIGURATION_NAME:STRING='git' \
+    -DCONFIGURATION_PACKAGE_SUFFIX:STRING='-git' \
+    -DCONFIGURATION_TARGET_SUFFIX:STRING='git' \
    -DBUILD_SHARED_LIBS:BOOL=ON \
    .
  make
--- a/videodownloader/git/PKGBUILD
+++ b/videodownloader/git/PKGBUILD
@ -6,8 +6,8 @@
 _reponame=videodownloader
 pkgname=videodownloader-git
 _name=${pkgname%-git}
-pkgver=27.8960d5b
-pkgrel=1
+pkgver=109.29a80c0
+pkgrel=2
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc='A video downloader with Qt GUI (currently only YouTube and Vimeo are maintained)'
 license=('GPL')
@ -29,6 +29,8 @@ build() {
  cmake \
    -DCMAKE_BUILD_TYPE:STRING='Release' \
    -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
+    -DCONFIGURATION_NAME:STRING='git' \
+    -DCONFIGURATION_PACKAGE_SUFFIX:STRING='-git' \
    -DBUILD_SHARED_LIBS:BOOL=ON \
    .
  make