From 83941477144599f4eb2b7fd64d8b73b4af558579 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Mon, 28 Sep 2020 18:33:04 +0200
Subject: [PATCH] Use ninja to build Git versions of my projects

---
 c++utilities/git/PKGBUILD         | 9 +++++----
 passwordfile/git/PKGBUILD         | 9 +++++----
 passwordmanager/git/PKGBUILD      | 7 ++++---
 qtutilities/git/PKGBUILD          | 9 +++++----
 reflective-rapidjson/git/PKGBUILD | 9 +++++----
 tageditor/git/PKGBUILD            | 9 +++++----
 tagparser/git/PKGBUILD            | 9 +++++----
 videodownloader/git/PKGBUILD      | 7 ++++---
 8 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/c++utilities/git/PKGBUILD b/c++utilities/git/PKGBUILD
index 28b2ff43..bedccd96 100644
--- a/c++utilities/git/PKGBUILD
+++ b/c++utilities/git/PKGBUILD
@@ -13,7 +13,7 @@ pkgdesc='Common C++ classes and routines such as argument parser, IO and convers
 license=('GPL')
 depends=('gcc-libs')
 optdepends=("$_name-doc: API documentation")
-makedepends=('cmake' 'git')
+makedepends=('cmake' 'git' 'ninja')
 checkdepends=('cppunit')
 #provides=("${_name}")
 #conflicts=("${_name}")
@@ -29,6 +29,7 @@ pkgver() {
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   cmake \
+    -G Ninja \
     -DCMAKE_BUILD_TYPE:STRING='Release' \
     -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
     -DCONFIGURATION_NAME:STRING='git' \
@@ -36,15 +37,15 @@ build() {
     -DCONFIGURATION_TARGET_SUFFIX:STRING='git' \
     -DBUILD_SHARED_LIBS:BOOL=ON \
     .
-  make
+  ninja
 }
 
 check() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
-  make check
+  ninja check
 }
 
 package() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja install
 }
diff --git a/passwordfile/git/PKGBUILD b/passwordfile/git/PKGBUILD
index b0142c0e..e983cd67 100644
--- a/passwordfile/git/PKGBUILD
+++ b/passwordfile/git/PKGBUILD
@@ -13,7 +13,7 @@ pkgdesc='C++ library to read/write passwords from/to encrypted files using AES-2
 license=('GPL')
 depends=('c++utilities-git' 'openssl')
 optdepends=("$_name-doc: API documentation")
-makedepends=('cmake' 'git')
+makedepends=('cmake' 'git' 'ninja')
 checkdepends=('cppunit')
 #provides=("${_name}")
 #conflicts=("${_name}")
@@ -30,6 +30,7 @@ pkgver() {
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   cmake \
+    -G Ninja \
     -DCMAKE_BUILD_TYPE:STRING='Release' \
     -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
     -DCONFIGURATION_NAME:STRING='git' \
@@ -37,15 +38,15 @@ build() {
     -DCONFIGURATION_TARGET_SUFFIX:STRING='git' \
     -DBUILD_SHARED_LIBS:BOOL=ON \
     .
-  make
+  ninja
 }
 
 check() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
-  make check
+  ninja check
 }
 
 package() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja install
 }
diff --git a/passwordmanager/git/PKGBUILD b/passwordmanager/git/PKGBUILD
index 0ed3f975..5c54ecbb 100644
--- a/passwordmanager/git/PKGBUILD
+++ b/passwordmanager/git/PKGBUILD
@@ -15,7 +15,7 @@ arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc='A simple password store using AES-256-CBC encryption via OpenSSL'
 license=('GPL')
 depends=('qt5-base' 'qtutilities-git' 'passwordfile-git' 'openssl' 'libxkbcommon-x11' 'desktop-file-utils' 'xdg-utils')
-makedepends=('cmake' 'qt5-tools' 'git' 'mesa' 'kirigami2')
+makedepends=('cmake' 'ninja' 'qt5-tools' 'git' 'mesa' 'kirigami2')
 optdepends=('kirigami2: Qt Quick GUI')
 provides=("${_name}")
 conflicts=("${_name}")
@@ -37,15 +37,16 @@ pkgver() {
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   cmake \
+    -G Ninja \
     -DCMAKE_BUILD_TYPE:STRING='Release' \
     -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
     -DCONFIGURATION_NAME:STRING='git' \
     -DCONFIGURATION_PACKAGE_SUFFIX:STRING='-git' \
     -DQUICK_GUI="$_quick_gui" .
-  make
+  ninja
 }
 
 package() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja install
 }
diff --git a/qtutilities/git/PKGBUILD b/qtutilities/git/PKGBUILD
index 912c5641..1f4daff5 100644
--- a/qtutilities/git/PKGBUILD
+++ b/qtutilities/git/PKGBUILD
@@ -13,7 +13,7 @@ pkgdesc='Common Qt related C++ classes and routines used by my applications such
 license=('GPL')
 depends=('c++utilities-git' 'qt5-base' 'mesa')
 optdepends=("$_name-doc: API documentation")
-makedepends=('cmake' 'git' 'qt5-tools')
+makedepends=('cmake' 'git' 'ninja' 'qt5-tools')
 #provides=("${_name}")
 #conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
@@ -28,6 +28,7 @@ pkgver() {
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   cmake \
+    -G Ninja \
     -DCMAKE_BUILD_TYPE:STRING='Release' \
     -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
     -DCONFIGURATION_NAME:STRING='git' \
@@ -35,15 +36,15 @@ build() {
     -DCONFIGURATION_TARGET_SUFFIX:STRING='git' \
     -DBUILD_SHARED_LIBS:BOOL=ON \
     .
-  make
+  ninja
 }
 
 check() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
-  make QT_QPA_PLATFORM=offscreen check
+  QT_QPA_PLATFORM=offscreen ninja check
 }
 
 package() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja install
 }
diff --git a/reflective-rapidjson/git/PKGBUILD b/reflective-rapidjson/git/PKGBUILD
index 8faf81f0..bebdecdb 100644
--- a/reflective-rapidjson/git/PKGBUILD
+++ b/reflective-rapidjson/git/PKGBUILD
@@ -15,7 +15,7 @@ license=('GPL')
 depends=('c++utilities-git' 'rapidjson' "llvm-libs>=${_llvmver}.0.0" "llvm-libs<$((_llvmver + 1)).0.0" "clang>=${_llvmver}.0.0" "clang<$((_llvmver + 1)).0.0")
 optdepends=("boost: use Boost.Hana instead of code generator"
             "$_name-doc: API documentation")
-makedepends=('cmake' 'clang-tools-extra' 'llvm' 'git')
+makedepends=('cmake' 'clang-tools-extra' 'llvm' 'git' 'ninja')
 checkdepends=('cppunit' 'boost')
 #provides=("${_name}")
 #conflicts=("${_name}")
@@ -31,6 +31,7 @@ pkgver() {
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   cmake \
+    -G Ninja \
     -DCMAKE_BUILD_TYPE:STRING='Release' \
     -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
     -DCONFIGURATION_NAME:STRING='git' \
@@ -38,15 +39,15 @@ build() {
     -DCONFIGURATION_TARGET_SUFFIX:STRING='git' \
     -DBUILD_SHARED_LIBS:BOOL=ON \
     .
-  make
+  ninja
 }
 
 check() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
-  make check
+  ninja check
 }
 
 package() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja install
 }
diff --git a/tageditor/git/PKGBUILD b/tageditor/git/PKGBUILD
index dda67e1a..192516be 100644
--- a/tageditor/git/PKGBUILD
+++ b/tageditor/git/PKGBUILD
@@ -26,7 +26,7 @@ depends=('qtutilities-git' 'tagparser-git' 'desktop-file-utils' 'xdg-utils')
 [[ $_webview_provider == webengine ]] && depends+=('qt5-webengine')
 [[ $_js_provider == script ]] && depends+=('qt5-script')
 [[ $_js_provider == qml ]] && depends+=('qt5-declarative')
-makedepends=('cmake' 'qt5-tools' 'git' 'mesa')
+makedepends=('cmake' 'qt5-tools' 'git' 'ninja' 'mesa')
 [[ $_json_export == ON ]] && makedepends+=('reflective-rapidjson-git')
 checkdepends=('cppunit' 'jq')
 provides=("${_name}")
@@ -43,6 +43,7 @@ pkgver() {
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   cmake \
+    -G Ninja \
     -DCMAKE_BUILD_TYPE:STRING='Release' \
     -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
     -DCONFIGURATION_NAME:STRING='git' \
@@ -53,13 +54,13 @@ build() {
     -DENABLE_JSON_EXPORT="${_json_export}" \
     -DREFLECTION_GENERATOR_EXECUTABLE:FILEPATH='/usr/bin/reflective_rapidjson_generator-git' \
     .
-  make
+  ninja
 }
 
 check() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   if [[ $TEST_FILE_PATH ]]; then
-    make check
+    ninja check
   else
     msg2 'Skipping execution of testsuite because the environment variable TEST_FILE_PATH is not set.'
   fi
@@ -67,5 +68,5 @@ check() {
 
 package() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja install
 }
diff --git a/tagparser/git/PKGBUILD b/tagparser/git/PKGBUILD
index 5f2f6e3d..5183d526 100644
--- a/tagparser/git/PKGBUILD
+++ b/tagparser/git/PKGBUILD
@@ -13,7 +13,7 @@ pkgdesc='C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis,
 license=('GPL')
 depends=('c++utilities-git' 'zlib')
 optdepends=("$_name-doc: API documentation")
-makedepends=('cmake' 'git')
+makedepends=('cmake' 'git' 'ninja')
 checkdepends=('cppunit' 'openssl')
 #provides=("${_name}")
 #conflicts=("${_name}")
@@ -29,6 +29,7 @@ pkgver() {
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   cmake \
+    -G Ninja \
     -DCMAKE_BUILD_TYPE:STRING='Release' \
     -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
     -DCONFIGURATION_NAME:STRING='git' \
@@ -36,13 +37,13 @@ build() {
     -DCONFIGURATION_TARGET_SUFFIX:STRING='git' \
     -DBUILD_SHARED_LIBS:BOOL=ON \
     .
-  make
+  ninja
 }
 
 check() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   if [[ $TEST_FILE_PATH ]]; then
-    make check
+    ninja check
   else
     msg2 'Skipping execution of testsuite because the environment variable TEST_FILE_PATH is not set.'
   fi
@@ -50,5 +51,5 @@ check() {
 
 package() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja install
 }
diff --git a/videodownloader/git/PKGBUILD b/videodownloader/git/PKGBUILD
index 677bd827..e76d07ef 100644
--- a/videodownloader/git/PKGBUILD
+++ b/videodownloader/git/PKGBUILD
@@ -12,7 +12,7 @@ arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc='A video downloader with Qt GUI (currently only YouTube and Vimeo are maintained)'
 license=('GPL')
 depends=('qtutilities-git' 'openssl' 'desktop-file-utils' 'xdg-utils')
-makedepends=('cmake' 'qt5-tools' 'git' 'mesa')
+makedepends=('cmake' 'ninja' 'qt5-tools' 'git' 'mesa')
 provides=("${_name}")
 conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
@@ -27,16 +27,17 @@ pkgver() {
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   cmake \
+    -G Ninja \
     -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
+  ninja
 }
 
 package() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja install
 }