From 922cc969916ca22f8699d63b1ca4de84ebc53b60 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 6 Dec 2015 19:17:57 +0100 Subject: [PATCH] use cmake --- c++utilities/default/PKGBUILD | 6 +++--- c++utilities/git/PKGBUILD | 10 +++++----- c++utilities/mingw-w64/PKGBUILD | 12 ++++++------ dbus-soundrecorder/default/PKGBUILD | 8 ++++---- geocoordinatecalculator/default/PKGBUILD | 6 +++--- geocoordinatecalculator/mingw-w64/PKGBUILD | 15 ++++++++------- passwordfile/default/PKGBUILD | 6 +++--- passwordfile/git/PKGBUILD | 10 +++++----- passwordfile/mingw-w64/PKGBUILD | 12 ++++++------ passwordmanager/default/PKGBUILD | 6 +++--- passwordmanager/git/PKGBUILD | 10 +++++----- passwordmanager/mingw-w64/PKGBUILD | 15 ++++++++------- qtutilities/default/PKGBUILD | 12 ++++++------ qtutilities/git/PKGBUILD | 10 +++++----- qtutilities/mingw-w64/PKGBUILD | 14 +++++++------- repoindex/default/PKGBUILD | 1 - tageditor/default/PKGBUILD | 11 +++-------- tageditor/git/PKGBUILD | 15 +++++---------- tageditor/mingw-w64/PKGBUILD | 17 +++++++---------- tagparser/default/PKGBUILD | 8 ++++---- tagparser/git/PKGBUILD | 12 ++++++------ tagparser/mingw-w64/PKGBUILD | 12 ++++++------ videodownloader/default/PKGBUILD | 8 ++++---- videodownloader/git/PKGBUILD | 12 ++++++------ videodownloader/mingw-w64/PKGBUILD | 15 ++++++++------- 25 files changed, 126 insertions(+), 137 deletions(-) diff --git a/c++utilities/default/PKGBUILD b/c++utilities/default/PKGBUILD index 8d58a64a..8bcd8b26 100644 --- a/c++utilities/default/PKGBUILD +++ b/c++utilities/default/PKGBUILD @@ -2,20 +2,20 @@ _reponame=cpp-utilities pkgname=c++utilities pkgver=3.0.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') pkgdesc="Common C++ classes and routines used by my applications such as argument parser, IO and conversion utilities." license=('GPL') depends=('gcc-libs') -makedepends=('qt5-base') +makedepends=('cmake') url="https://github.com/Martchus/${_reponame}" source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('6de9cb9d9d2af191be79652590d5a23dfaa886c5384c59e7227508542d764dff') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro" + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" make } diff --git a/c++utilities/git/PKGBUILD b/c++utilities/git/PKGBUILD index 30dbb0e1..cd80c067 100644 --- a/c++utilities/git/PKGBUILD +++ b/c++utilities/git/PKGBUILD @@ -3,13 +3,13 @@ _name=c++utilities _reponame=cpp-utilities pkgname=c++utilities-git pkgver=50.4d6bf67 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') pkgdesc="Common C++ classes and routines used by my applications such as argument parser, IO and conversion utilities (git version)." license=('GPL') depends=('gcc-libs') -makedepends=('qt5-base' 'git') +makedepends=('cmake' 'git') provides=('c++utilities') conflicts=('c++utilities') url="https://github.com/Martchus/${_reponame}" @@ -22,12 +22,12 @@ pkgver() { } build() { - cd "${srcdir}/${pkgname}" - INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$_name.pro" + cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" make } package() { - cd "${srcdir}/${pkgname}" + cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" make install } diff --git a/c++utilities/mingw-w64/PKGBUILD b/c++utilities/mingw-w64/PKGBUILD index 5ec5f5a6..b4516e40 100644 --- a/c++utilities/mingw-w64/PKGBUILD +++ b/c++utilities/mingw-w64/PKGBUILD @@ -3,25 +3,25 @@ _name=c++utilities _reponame=cpp-utilities pkgname=mingw-w64-c++utilities pkgver=3.0.0 -pkgrel=1 +pkgrel=2 arch=('any') pkgdesc="Common C++ classes and routines used by my applications such as argument parser, IO and conversion utilities (mingw-w64)." license=('GPL') depends=('mingw-w64-crt') -makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-base') +makedepends=('mingw-w64-gcc' 'mingw-w64-cmake') url="https://github.com/Martchus/${_reponame}" source=("c++utilities-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('41dfde4b9e86c787cc93495508d017bdf490d6e93793c756e284d52ef340207d') -options=('staticlibs' '!strip') +options=(!buildflags staticlibs !strip !emptydirs) _architectures="i686-w64-mingw32 x86_64-w64-mingw32" build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - # build for each architecture + # build utilities for each architecture for _arch in ${_architectures}; do mkdir -p build-${_arch} && pushd build-${_arch} - INSTALL_ROOT=$pkgdir/usr/${_arch} ${_arch}-qmake-qt5 ../${_name}.pro CONFIG+=mingw-w64-install CONFIG+=mingw-w64-manualstrip-dll CONFIG+=mingw-w64-noversion + ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr/${_arch}" ../ make popd done @@ -31,7 +31,7 @@ package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" for _arch in ${_architectures}; do pushd build-${_arch} - make install + make install-mingw-w64-strip popd done } diff --git a/dbus-soundrecorder/default/PKGBUILD b/dbus-soundrecorder/default/PKGBUILD index fe2d3ced..cc5132bf 100644 --- a/dbus-soundrecorder/default/PKGBUILD +++ b/dbus-soundrecorder/default/PKGBUILD @@ -2,19 +2,19 @@ _reponame=dbus-soundrecorder pkgname=dbus-soundrecorder pkgver=1.1.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') pkgdesc="Records sound from Pulse Audio using ffmpeg while watching D-Bus to determine tracks and meta data." license=('GPL') -depends=('c++utilities') -makedepends=('qt5-base') +depends=('c++utilities' 'qt5-base') +makedepends=('cmake') url="https://github.com/Martchus/${_reponame}" source=("dbus-soundrecorder-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('0af1914803cf2f1d11fdb8e46f6c896a18040f6606a08d0742356dc0c7872261') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro" + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" make } diff --git a/geocoordinatecalculator/default/PKGBUILD b/geocoordinatecalculator/default/PKGBUILD index 6f2ccc00..3a4f3273 100644 --- a/geocoordinatecalculator/default/PKGBUILD +++ b/geocoordinatecalculator/default/PKGBUILD @@ -2,19 +2,19 @@ _reponame=geocoordinatecalculator pkgname=geocoordinatecalculator pkgver=1.0.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') pkgdesc="Tool for basic calculations with geo coordinates such as format conversions and calculation of distance, bearing, mid point, destination and more." license=('GPL') depends=('c++utilities') -makedepends=('qt5-base') +makedepends=('cmake') url="https://github.com/Martchus/${_reponame}" source=("geocoordinatecalculator-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('5eeeb11027e93bf676977877013756ccb17047d539596f24d20ab8b3787c9cbf') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro" + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" make } diff --git a/geocoordinatecalculator/mingw-w64/PKGBUILD b/geocoordinatecalculator/mingw-w64/PKGBUILD index 0ec9ed55..dc001de0 100644 --- a/geocoordinatecalculator/mingw-w64/PKGBUILD +++ b/geocoordinatecalculator/mingw-w64/PKGBUILD @@ -3,23 +3,24 @@ _name=geocoordinatecalculator _reponame=geocoordinatecalculator pkgname=mingw-w64-geocoordinatecalculator pkgver=1.0.1 -pkgrel=1 +pkgrel=2 arch=('any') pkgdesc="Tool for basic calculations with geo coordinates such as format conversions and calculation of distance, bearing, mid point, destination and more (mingw-w64)." license=('GPL') depends=('mingw-w64-crt' 'mingw-w64-c++utilities') -makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-base') +makedepends=('mingw-w64-gcc' 'mingw-w64-cmake') url="https://github.com/Martchus/${_reponame}" source=("geocoordinatecalculator-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") -sha256sums=('SKIP') +sha256sums=('5eeeb11027e93bf676977877013756ccb17047d539596f24d20ab8b3787c9cbf') +options=(!buildflags staticlibs !strip !emptydirs) _architectures="i686-w64-mingw32 x86_64-w64-mingw32" build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - # build for each architecture + # build utilities for each architecture for _arch in ${_architectures}; do mkdir -p build-${_arch} && pushd build-${_arch} - INSTALL_ROOT=$pkgdir/usr/${_arch} ${_arch}-qmake-qt5 ../${_name}.pro CONFIG+=mingw-w64-install CONFIG+=mingw-w64-manualstrip-exe CONFIG+=mingw-w64-noversion + ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr/${_arch}" ../ make popd done @@ -27,9 +28,9 @@ build() { package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - for _arch in ${_architectures}; do + for _arch in ${_architectures}; do pushd build-${_arch} - make install + make install-mingw-w64-strip popd done } diff --git a/passwordfile/default/PKGBUILD b/passwordfile/default/PKGBUILD index f07e780b..67030651 100644 --- a/passwordfile/default/PKGBUILD +++ b/passwordfile/default/PKGBUILD @@ -2,12 +2,12 @@ _reponame=passwordfile pkgname=passwordfile pkgver=3.0.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') pkgdesc="C++ library to read/write passwords from/to encrypted files (using AES-256-CBC via OpenSSL)." license=('GPL') depends=('c++utilities' 'openssl') -makedepends=('qt5-base') +makedepends=('cmake') install= url="https://github.com/Martchus/${_reponame}" source=("passwordfile-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") @@ -15,7 +15,7 @@ sha256sums=('959176b21b45c8435c7c87d501c263dc4d8088e861b8659294448f6c77768ebb') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro" + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" make } diff --git a/passwordfile/git/PKGBUILD b/passwordfile/git/PKGBUILD index 25ae90c6..2dffe288 100644 --- a/passwordfile/git/PKGBUILD +++ b/passwordfile/git/PKGBUILD @@ -3,12 +3,12 @@ _name=passwordfile _reponame=passwordfile pkgname=passwordfile-git pkgver=20.bcefbb6 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') pkgdesc="C++ library to read/write passwords from/to encrypted files (using AES-256-CBC via OpenSSL, git version)." license=('GPL') depends=('c++utilities' 'openssl') -makedepends=('qt5-base' 'git') +makedepends=('cmake' 'git') provides=('passwordfile') conflicts=('passwordfile') install= @@ -22,12 +22,12 @@ pkgver() { } build() { - cd "${srcdir}/${pkgname}" - INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$_name.pro" + cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" make } package() { - cd "${srcdir}/${pkgname}" + cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" make install } diff --git a/passwordfile/mingw-w64/PKGBUILD b/passwordfile/mingw-w64/PKGBUILD index 4a99f485..0f045377 100644 --- a/passwordfile/mingw-w64/PKGBUILD +++ b/passwordfile/mingw-w64/PKGBUILD @@ -8,19 +8,19 @@ arch=('any') pkgdesc="C++ library to read/write passwords from/to encrypted files (using AES-256-CBC via OpenSSL, mingw-w64)." license=('GPL') depends=('mingw-w64-crt' 'mingw-w64-c++utilities' 'mingw-w64-openssl') -makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-base') +makedepends=('mingw-w64-gcc' 'mingw-w64-cmake') url="https://github.com/Martchus/${_reponame}" source=("passwordfile-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") -sha256sums=('SKIP') -options=('staticlibs' '!strip') +sha256sums=('959176b21b45c8435c7c87d501c263dc4d8088e861b8659294448f6c77768ebb') +options=(!buildflags staticlibs !strip !emptydirs) _architectures="i686-w64-mingw32 x86_64-w64-mingw32" build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - # build for each architecture + # build utilities for each architecture for _arch in ${_architectures}; do mkdir -p build-${_arch} && pushd build-${_arch} - INSTALL_ROOT=$pkgdir/usr/${_arch} ${_arch}-qmake-qt5 ../${_name}.pro CONFIG+=mingw-w64-install CONFIG+=mingw-w64-manualstrip-dll CONFIG+=mingw-w64-noversion + ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr/${_arch}" ../ make popd done @@ -30,7 +30,7 @@ package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" for _arch in ${_architectures}; do pushd build-${_arch} - make install + make install-mingw-w64-strip popd done } diff --git a/passwordmanager/default/PKGBUILD b/passwordmanager/default/PKGBUILD index 3220adb3..23af0056 100644 --- a/passwordmanager/default/PKGBUILD +++ b/passwordmanager/default/PKGBUILD @@ -2,12 +2,12 @@ _reponame=passwordmanager pkgname=passwordmanager pkgver=2.0.9 -pkgrel=1 +pkgrel=2 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') -makedepends=('qt5-tools') +makedepends=('cmake' 'qt5-tools') install=${pkgname}.install url="https://github.com/Martchus/${_reponame}" source=("passwordmanager-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") @@ -15,7 +15,7 @@ sha256sums=('a6086f9dd394064368dd0098f01be163bccd6aa00e7c093f5a2cbf1b5951c176') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro" + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" make } diff --git a/passwordmanager/git/PKGBUILD b/passwordmanager/git/PKGBUILD index bdfc43b0..16db2dd6 100644 --- a/passwordmanager/git/PKGBUILD +++ b/passwordmanager/git/PKGBUILD @@ -3,12 +3,12 @@ _name=passwordmanager _reponame=passwordmanager pkgname=passwordmanager-git pkgver=36.90d37ae -pkgrel=9 +pkgrel=10 arch=('i686' 'x86_64') pkgdesc="A simple password store using AES-256-CBC encryption via OpenSSL (git version)." license=('GPL') depends=('qt5-base' 'qtutilities' 'passwordfile' 'openssl' 'libxkbcommon-x11' 'desktop-file-utils' 'xdg-utils') -makedepends=('qt5-tools' 'git') +makedepends=('cmake' 'qt5-tools' 'git') provides=('passwordmanager') conflicts=('passwordmanager') install=${_name}.install @@ -22,12 +22,12 @@ pkgver() { } build() { - cd "${srcdir}/${pkgname}" - INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$_name.pro" + cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" make } package() { - cd "${srcdir}/${pkgname}" + cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" make install } diff --git a/passwordmanager/mingw-w64/PKGBUILD b/passwordmanager/mingw-w64/PKGBUILD index 017a7da0..81ac82d3 100644 --- a/passwordmanager/mingw-w64/PKGBUILD +++ b/passwordmanager/mingw-w64/PKGBUILD @@ -8,19 +8,20 @@ arch=('any') pkgdesc="A simple password store using AES-256-CBC encryption via OpenSSL (mingw-w64)." license=('GPL') depends=('mingw-w64-crt' 'mingw-w64-qt5-base' 'mingw-w64-qtutilities' 'mingw-w64-passwordfile' 'mingw-w64-openssl') -makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-tools' 'ffmpeg') +makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ffmpeg') url="https://github.com/Martchus/${_reponame}" source=("passwordmanager-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") -sha256sums=('SKIP') +sha256sums=('a6086f9dd394064368dd0098f01be163bccd6aa00e7c093f5a2cbf1b5951c176') +options=(!buildflags staticlibs !strip !emptydirs) _architectures="i686-w64-mingw32 x86_64-w64-mingw32" build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - # build for each architecture + # build utilities for each architecture for _arch in ${_architectures}; do mkdir -p build-${_arch} && pushd build-${_arch} - INSTALL_ROOT=$pkgdir/usr/${_arch} ${_arch}-qmake-qt5 ../${_name}.pro CONFIG+=mingw-w64-install CONFIG+=mingw-w64-manualstrip-exe - make -j 1 + ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr/${_arch}" ../ + make popd done } @@ -29,7 +30,7 @@ package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" for _arch in ${_architectures}; do pushd build-${_arch} - make install - popd + make install-mingw-w64-strip + popd done } diff --git a/qtutilities/default/PKGBUILD b/qtutilities/default/PKGBUILD index d680d65d..495d1f0f 100644 --- a/qtutilities/default/PKGBUILD +++ b/qtutilities/default/PKGBUILD @@ -1,21 +1,21 @@ # Maintainer: Martchus +_reponame=qtutilities pkgname=qtutilities pkgver=3.0.1 -pkgrel=1 +pkgrel=2 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') -makedepends= -url="https://github.com/Martchus/${pkgname}" -source=("qtutilities-${pkgver}.tar.gz::https://github.com/Martchus/${pkgname}/archive/v${pkgver}.tar.gz") -_reponame=qtutilities +makedepends=('cmake') +url="https://github.com/Martchus/${_reponame}" +source=("qtutilities-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('01f176f139be5bc2bb136428c497a1b491611e51c480d0fb261ae0536a270236') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro" + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" make } diff --git a/qtutilities/git/PKGBUILD b/qtutilities/git/PKGBUILD index e7bf0524..823b8e5d 100644 --- a/qtutilities/git/PKGBUILD +++ b/qtutilities/git/PKGBUILD @@ -3,13 +3,13 @@ _name=qtutilities _reponame=qtutilities pkgname=qtutilities-git pkgver=35.721e79d -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') pkgdesc="Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models (git version)." license=('GPL') depends=('c++utilities' 'qt5-base') -makedepends=('git') +makedepends=('cmake' 'git') provides=('qtutilities') conflicts=('qtutilities') url="https://github.com/Martchus/${_reponame}" @@ -22,13 +22,13 @@ pkgver() { } build() { - cd "${srcdir}/${pkgname}" - INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$_name.pro" + cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" make } package() { - cd "${srcdir}/${pkgname}" + cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" make install } diff --git a/qtutilities/mingw-w64/PKGBUILD b/qtutilities/mingw-w64/PKGBUILD index 5101b090..596238bc 100644 --- a/qtutilities/mingw-w64/PKGBUILD +++ b/qtutilities/mingw-w64/PKGBUILD @@ -3,17 +3,17 @@ _name=qtutilities _reponame=qtutilities pkgname=mingw-w64-qtutilities pkgver=3.0.1 -pkgrel=1 +pkgrel=2 arch=('any') pkgdesc="Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models. (mingw-w64)." license=('GPL') depends=('mingw-w64-crt' 'mingw-w64-qt5-base' 'mingw-w64-c++utilities') -makedepends=('mingw-w64-gcc') +makedepends=('mingw-w64-gcc' 'mingw-w64-cmake') url="https://github.com/Martchus/${_reponame}" source=("qtutilities-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('01f176f139be5bc2bb136428c497a1b491611e51c480d0fb261ae0536a270236') -options=('staticlibs' '!strip') +options=(!buildflags staticlibs !strip !emptydirs) _architectures="i686-w64-mingw32 x86_64-w64-mingw32" build() { @@ -21,7 +21,7 @@ build() { # build utilities for each architecture for _arch in ${_architectures}; do mkdir -p build-${_arch} && pushd build-${_arch} - INSTALL_ROOT=$pkgdir/usr/${_arch} ${_arch}-qmake-qt5 ../${_name}.pro CONFIG+=mingw-w64-install CONFIG+=mingw-w64-manualstrip-dll CONFIG+=mingw-w64-noversion + ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr/${_arch}" ../ make popd done @@ -29,9 +29,9 @@ build() { package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - for _arch in ${_architectures}; do + for _arch in ${_architectures}; do pushd build-${_arch} - make install - popd + make install-mingw-w64-strip + popd done } diff --git a/repoindex/default/PKGBUILD b/repoindex/default/PKGBUILD index b40d87e8..5c719ac8 100644 --- a/repoindex/default/PKGBUILD +++ b/repoindex/default/PKGBUILD @@ -10,7 +10,6 @@ depends=('qt5-base' 'qt5-network' 'pacman' 'c++utilities') makedepends= url="https://github.com/Martchus/${_reponame}" source=("repoindex-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") -_reponame=repoindex sha256sums=('SKIP') build() { diff --git a/tageditor/default/PKGBUILD b/tageditor/default/PKGBUILD index 1e48944a..d43db14f 100644 --- a/tageditor/default/PKGBUILD +++ b/tageditor/default/PKGBUILD @@ -1,16 +1,15 @@ # Maintainer: Martchus # decide whether to link against the deprecated Qt WebKit module (in qt5-webkit package ~40 MB) or # the newer, chromium-based Qt WebEngine module (in qt5-webengine package ~100 MB) -_webviewprovider=qt5-webkit _reponame=tageditor pkgname=tageditor -pkgver=1.2.1 +pkgver=1.3.0 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="A tag editor with Qt GUI and command-line interface supporting MP4 (iTunes), ID3, Vorbis and Matroska." license=('GPL') depends=('qt5-script' $_webviewprovider 'qtutilities' 'tagparser' 'desktop-file-utils' 'xdg-utils') -makedepends=('qt5-tools') +makedepends=('cmake' 'qt5-tools') install=${pkgname}.install url="https://github.com/Martchus/${_reponame}" source=("tageditor-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") @@ -18,11 +17,7 @@ sha256sums=('d089b9e66616c39147b639639152c5848f59dafa2c0a9a77d0137fbed13a2af9') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - cfg=() - if [[ _webviewprovider == qt5-webkit ]]; then - cfg+=(forcewebkit) - fi - INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro" $(for val in "${cfg[@]}"; do echo -n "CONFIG+=$val "; done) + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" make } diff --git a/tageditor/git/PKGBUILD b/tageditor/git/PKGBUILD index f122eb5e..38943fba 100644 --- a/tageditor/git/PKGBUILD +++ b/tageditor/git/PKGBUILD @@ -6,18 +6,17 @@ _reponame=tageditor _webviewprovider=qt5-webkit pkgname=tageditor-git pkgver=66.77a0bc2 -pkgrel=11 +pkgrel=12 arch=('i686' 'x86_64') pkgdesc="A tag editor with Qt GUI and command-line interface supporting MP4 (iTunes), ID3, Vorbis and Matroska (git version)." license=('GPL') depends=('qt5-script' $_webviewprovider 'qtutilities' 'tagparser' 'desktop-file-utils' 'xdg-utils') -makedepends=('qt5-tools' 'git') +makedepends=('cmake' 'qt5-tools' 'git') provides=('tageditor') conflicts=('tageditor') install=${_name}.install url="https://github.com/Martchus/${_reponame}" source=("${pkgname}::git://github.com/Martchus/${_reponame}.git") - sha256sums=('SKIP') pkgver() { @@ -26,16 +25,12 @@ pkgver() { } build() { - cd "${srcdir}/${pkgname}" - cfg=() - if [[ _webviewprovider == qt5-webkit ]]; then - cfg+=(forcewebkit) - fi - INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$_name.pro" $(for val in "${cfg[@]}"; do echo -n "CONFIG+=$val "; done) + cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" make } package() { - cd "${srcdir}/${pkgname}" + cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" make install } diff --git a/tageditor/mingw-w64/PKGBUILD b/tageditor/mingw-w64/PKGBUILD index 3c935aa1..1b2c01d8 100644 --- a/tageditor/mingw-w64/PKGBUILD +++ b/tageditor/mingw-w64/PKGBUILD @@ -5,29 +5,26 @@ _reponame=tageditor # the newer, chromium-based Qt WebEngine module (qt5-webengine package ~100 MB) _webviewprovider=qt5-webkit pkgname=mingw-w64-tageditor -pkgver=1.2.1 +pkgver=1.3.0 pkgrel=1 arch=('any') pkgdesc="A tageditor with Qt GUI and command line interface supporting MP4 (iTunes), ID3, Vorbis and Matroska." license=('GPL') depends=(mingw-w64-{crt,qt5-script,$_webviewprovider,qtutilities,tagparser}) -makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-tools' 'ffmpeg') +makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ffmpeg') url="https://github.com/Martchus/${_reponame}" source=("tageditor-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('d089b9e66616c39147b639639152c5848f59dafa2c0a9a77d0137fbed13a2af9') +options=(!buildflags staticlibs !strip !emptydirs) _architectures="i686-w64-mingw32 x86_64-w64-mingw32" build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - cfg=(mingw-w64-{install,manualstrip-exe}) - if [[ _webviewprovider == qt5-webkit ]]; then - cfg+=(forcewebkit) - fi # build utilities for each architecture for _arch in ${_architectures}; do mkdir -p build-${_arch} && pushd build-${_arch} - INSTALL_ROOT=$pkgdir/usr/${_arch} ${_arch}-qmake-qt5 ../${_name}.pro $(for val in "${cfg[@]}"; do echo -n "CONFIG+=$val "; done) - make -j 1 + ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr/${_arch}" ../ + make popd done } @@ -36,7 +33,7 @@ package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" for _arch in ${_architectures}; do pushd build-${_arch} - make install - popd + make install-mingw-w64-strip + popd done } diff --git a/tagparser/default/PKGBUILD b/tagparser/default/PKGBUILD index 22b27dc0..b9740408 100644 --- a/tagparser/default/PKGBUILD +++ b/tagparser/default/PKGBUILD @@ -1,20 +1,20 @@ # Maintainer: Martchus _reponame=tagparser pkgname=tagparser -pkgver=3.0.1 +pkgver=4.0.0 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="C++ library for reading and writing MP4 (iTunes), ID3, Vorbis and Matroska tags." license=('GPL') -depends=('c++utilities') -makedepends=('qt5-base') +depends=('c++utilities' 'zlib') +makedepends=('cmake') url="https://github.com/Martchus/${_reponame}" source=("tagparser-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('4b4f029170e934976f7619da3f89ffb34ce173dd6f36f3a9afe4cb1f37802af8') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro" + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" make } diff --git a/tagparser/git/PKGBUILD b/tagparser/git/PKGBUILD index 6fc3f0da..55b1ebb2 100644 --- a/tagparser/git/PKGBUILD +++ b/tagparser/git/PKGBUILD @@ -3,12 +3,12 @@ _name=tagparser _reponame=tagparser pkgname=tagparser-git pkgver=59.8cc75e1 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') pkgdesc="C++ library for reading and writing MP4 (iTunes), ID3, Vorbis and Matroska tags." license=('GPL') -depends=('c++utilities') -makedepends=('qt5-base' 'git') +depends=('c++utilities' 'zlib') +makedepends=('cmake' 'git') provides=('videodownloader') conflicts=('videodownloader') url="https://github.com/Martchus/${_reponame}" @@ -21,12 +21,12 @@ pkgver() { } build() { - cd "${srcdir}/${pkgname}" - INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$_name.pro" + cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" make } package() { - cd "${srcdir}/${pkgname}" + cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" make install } diff --git a/tagparser/mingw-w64/PKGBUILD b/tagparser/mingw-w64/PKGBUILD index 1a2e0229..a91da6ae 100644 --- a/tagparser/mingw-w64/PKGBUILD +++ b/tagparser/mingw-w64/PKGBUILD @@ -2,17 +2,17 @@ _name=tagparser _reponame=tagparser pkgname=mingw-w64-tagparser -pkgver=3.0.1 +pkgver=4.0.0 pkgrel=1 arch=('any') pkgdesc="C++ library for reading and writing MP4 (iTunes), ID3, Vorbis and Matroska tags (mingw-w64)." license=('GPL') -depends=('mingw-w64-crt' 'mingw-w64-c++utilities') -makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-base') +depends=('mingw-w64-crt' 'mingw-w64-c++utilities' 'mingw-w64-zlib') +makedepends=('mingw-w64-gcc' 'mingw-w64-cmake') url="https://github.com/Martchus/${_reponame}" source=("tagparser-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('4b4f029170e934976f7619da3f89ffb34ce173dd6f36f3a9afe4cb1f37802af8') -options=('staticlibs' '!strip') +options=(!buildflags staticlibs !strip !emptydirs) _architectures="i686-w64-mingw32 x86_64-w64-mingw32" build() { @@ -20,7 +20,7 @@ build() { # build utilities for each architecture for _arch in ${_architectures}; do mkdir -p build-${_arch} && pushd build-${_arch} - INSTALL_ROOT=$pkgdir/usr/${_arch} ${_arch}-qmake-qt5 ../${_name}.pro CONFIG+=mingw-w64-install CONFIG+=mingw-w64-manualstrip-dll CONFIG+=mingw-w64-noversion + ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr/${_arch}" ../ make popd done @@ -30,7 +30,7 @@ package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" for _arch in ${_architectures}; do pushd build-${_arch} - make install + make install-mingw-w64-strip popd done } diff --git a/videodownloader/default/PKGBUILD b/videodownloader/default/PKGBUILD index 1d5c2208..c72feef9 100644 --- a/videodownloader/default/PKGBUILD +++ b/videodownloader/default/PKGBUILD @@ -2,12 +2,12 @@ _reponame=videodownloader pkgname=videodownloader pkgver=1.2.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') -pkgdesc="A video downloader with Qt GUI (currently only YouTube is maintained)." +pkgdesc="A video downloader with Qt GUI (currently only YouTube and Vimeo are maintained, git version)." license=('GPL') depends=('qtutilities' 'openssl' 'desktop-file-utils' 'xdg-utils') -makedepends=('qt5-tools') +makedepends=('cmake' 'qt5-tools') install=${pkgname}.install url="https://github.com/Martchus/${_reponame}" source=("videodownloader-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") @@ -15,7 +15,7 @@ sha256sums=('fefa04939c9310474e70b509142f7d7330e1c175d3507a081c58f447a34da347') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro" + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" make } diff --git a/videodownloader/git/PKGBUILD b/videodownloader/git/PKGBUILD index 5120be26..6f9488ff 100644 --- a/videodownloader/git/PKGBUILD +++ b/videodownloader/git/PKGBUILD @@ -3,12 +3,12 @@ _name=videodownloader _reponame=videodownloader pkgname=videodownloader-git pkgver=27.8960d5b -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') -pkgdesc="A video downloader with Qt GUI (currently only YouTube is maintained, git version)." +pkgdesc="A video downloader with Qt GUI (currently only YouTube and Vimeo are maintained, git version)." license=('GPL') depends=('qtutilities' 'openssl' 'desktop-file-utils' 'xdg-utils') -makedepends=('qt5-tools' 'git') +makedepends=('cmake' 'qt5-tools' 'git') provides=('videodownloader') conflicts=('videodownloader') install=${_name}.install @@ -22,12 +22,12 @@ pkgver() { } build() { - cd "${srcdir}/${pkgname}" - INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$_name.pro" + cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" make } package() { - cd "${srcdir}/${pkgname}" + cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" make install } diff --git a/videodownloader/mingw-w64/PKGBUILD b/videodownloader/mingw-w64/PKGBUILD index 5a70b302..7852ac6d 100644 --- a/videodownloader/mingw-w64/PKGBUILD +++ b/videodownloader/mingw-w64/PKGBUILD @@ -3,15 +3,16 @@ _name=videodownloader _reponame=videodownloader pkgname=mingw-w64-videodownloader pkgver=1.2.1 -pkgrel=1 +pkgrel=2 arch=('any') -pkgdesc="A video downloader with Qt GUI (currently only YouTube is maintained, mingw-w64)." +pkgdesc="A video downloader with Qt GUI (currently only YouTube and Vimeo are maintained, git version)." license=('GPL') depends=('mingw-w64-crt' 'mingw-w64-qtutilities' 'mingw-w64-openssl') -makedepends=('mingw-w64-gcc' 'ffmpeg') +makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ffmpeg') url="https://github.com/Martchus/${_reponame}" source=("videodownloader-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") -md5sums=('fefa04939c9310474e70b509142f7d7330e1c175d3507a081c58f447a34da347') +sha256sums=('fefa04939c9310474e70b509142f7d7330e1c175d3507a081c58f447a34da347') +options=(!buildflags staticlibs !strip !emptydirs) _architectures="i686-w64-mingw32 x86_64-w64-mingw32" build() { @@ -19,8 +20,8 @@ build() { # build utilities for each architecture for _arch in ${_architectures}; do mkdir -p build-${_arch} && pushd build-${_arch} - INSTALL_ROOT=$pkgdir/usr/${_arch} ${_arch}-qmake-qt5 ../${_name}.pro CONFIG+=mingw-w64-install CONFIG+=mingw-w64-manualstrip-exe - make -j 1 + ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr/${_arch}" ../ + make popd done } @@ -29,7 +30,7 @@ package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" for _arch in ${_architectures}; do pushd build-${_arch} - make install + make install-mingw-w64-strip popd done }