Date: Wednesday, July 11, 2018 @ 00:50:36 Author: heftig Revision: 356655
3.2.0-1 Modified: cdemu-client/trunk/PKGBUILD Deleted: cdemu-client/trunk/fixes.diff ------------+ PKGBUILD | 18 +++++++----------- fixes.diff | 14 -------------- 2 files changed, 7 insertions(+), 25 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-07-11 00:47:07 UTC (rev 356654) +++ PKGBUILD 2018-07-11 00:50:36 UTC (rev 356655) @@ -4,7 +4,7 @@ # Contributor: Charles Lindsay <[email protected]> pkgname=cdemu-client -pkgver=3.1.0 +pkgver=3.2.0 pkgrel=1 pkgdesc="Simple command-line client for controlling cdemu-daemon" arch=(any) @@ -11,28 +11,24 @@ url="http://cdemu.sourceforge.net/"; license=(GPL) depends=(python-gobject cdemu-daemon) -makedepends=(intltool cmake) +makedepends=(intltool cmake ninja bash-completion) conflicts=('cdemu') -source=("https://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2"; - fixes.diff) -sha256sums=('336a078b0b1f70de81d7ee92ee3e3a1e1957843accc4e90a876aeef28648d868' - '908f919e779832eb05013cb0e3ecb49795afddaa4aa8cb946ec78c3218acf534') +source=("https://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2";) +sha256sums=('a9fea8c54433b6827ea23e13cb10b931609854370afd99a69bea8a750f4a9fff') prepare() { mkdir build cd $pkgname-$pkgver - patch -Np2 -i ../fixes.diff } build() { cd build - cmake ../$pkgname-$pkgver \ + cmake -G Ninja ../$pkgname-$pkgver \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr - make + cmake --build . } package() { - cd build - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" cmake --build build --target install } Deleted: fixes.diff =================================================================== --- fixes.diff 2018-07-11 00:47:07 UTC (rev 356654) +++ fixes.diff 2018-07-11 00:50:36 UTC (rev 356655) @@ -1,14 +0,0 @@ -diff --git i/cdemu-client/CMakeLists.txt w/cdemu-client/CMakeLists.txt -index cdcff25232886440..5296229538cd64bf 100644 ---- i/cdemu-client/CMakeLists.txt -+++ w/cdemu-client/CMakeLists.txt -@@ -38,7 +38,8 @@ install ( - - install ( - FILES data/cdemu-bash-completion.sh -- DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/bash_completion.d -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/bash-completion/completions -+ RENAME cdemu - ) - - install (
