From 96ac4edc3d9e93415e6d82a33837e78b9bcc72c4 Mon Sep 17 00:00:00 2001 From: Edgar Date: Thu, 23 Sep 2021 10:16:21 +0200 Subject: [PATCH] :bug: Fixed PKGBUILD --- CMakeLists.txt | 6 ++++-- dist/arch-git/PKGBUILD | 27 +++++++++++++++++++++++++++ dist/arch/PKGBUILD | 13 ++++++------- 3 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 dist/arch-git/PKGBUILD diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a7ba38..2d9cac4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,7 @@ cmake_minimum_required(VERSION 3.10) -cmake_policy(SET CMP0087 NEW) +if(${CMAKE_VERSION} VERSION_GREATER "3.14") + cmake_policy(SET CMP0087 NEW) +endif() set(CMAKE_MODULE_PATH "${CMAKE_BINARY_DIR}" ${CMAKE_MODULE_PATH}) include(FeatureSummary) @@ -218,7 +220,7 @@ if(UNIX) ) install( FILES ${CMAKE_SOURCE_DIR}/rsrc/icons/fuel.png - DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/256x256/apps + DESTINATION ${CMAKE_INSTALL_DATADIR}/pixmaps/ ) endif() diff --git a/dist/arch-git/PKGBUILD b/dist/arch-git/PKGBUILD new file mode 100644 index 0000000..6d50766 --- /dev/null +++ b/dist/arch-git/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: Edgar +pkgname=fuel-git +pkgver=2.0.1 +pkgrel=3 +pkgdesc="A GUI front-end to Fossil SCM" +arch=(i686 x86_64) +url="https://fuel-scm.org/" +license=('GPL2') +depends=('qt5-base>=5.4.0' 'qt5-webengine>=5.4.0' 'fossil' 'qtkeychain-qt5') +makedepends=('git' 'cmake') +source=("git://github.com/AnotherFoxGuy/fuel-scm") +md5sums=('SKIP') + +build() { + cd "$srcdir/fuel-scm" + [ -d build ] && rm -r build + mkdir build + cd build + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr .. + make +} + +package() { + cd "$srcdir/fuel-scm/build" + make DESTDIR="${pkgdir}" install +} + diff --git a/dist/arch/PKGBUILD b/dist/arch/PKGBUILD index 13cd8d4..bb5ba43 100644 --- a/dist/arch/PKGBUILD +++ b/dist/arch/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Kostas Karanikolas +# Maintainer: Edgar pkgname=fuel pkgver=2.0.1 pkgrel=3 @@ -6,22 +6,21 @@ pkgdesc="A GUI front-end to Fossil SCM" arch=(i686 x86_64) url="https://fuel-scm.org/" license=('GPL2') -depends=('qt5-base>=5.4.0', 'qt5-webkit>=5.4.0' 'fossil') +depends=('qt5-base>=5.4.0', 'qt5-webkit>=5.4.0', 'fossil', 'qtkeychain-qt5') source=("https://fuel-scm.org/files/releases/${pkgname}-${pkgver}.tar.gz") sha256sums=('034593d16eba9e30a73d1b40bfd4f1a7f9ba438a04dc07cc7bb2cd2202da40fc') # Generate with 'makepkg -g' build() { - cd "${srcdir}" + cd "$srcdir" [ -d build ] && rm -r build mkdir build cd build - cmake -DCMAKE_BUILD_TYPE=Release .. + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr .. make } package() { - cd "${srcdir}/build" - make INSTALL_ROOT="${pkgdir}" install + cd "$srcdir/build" + make DESTDIR="${pkgdir}" install } -