diff options
-rw-r--r-- | .SRCINFO | 15 | ||||
-rw-r--r-- | PKGBUILD | 40 |
2 files changed, 27 insertions, 28 deletions
@@ -1,8 +1,8 @@ pkgbase = brewtarget pkgdesc = Beer calculator compatible with BeerSmith. Generates instructions from the recipe and interactive mash designer. - pkgver = 3.0.9 + pkgver = 3.0.10 pkgrel = 1 - url = http://www.brewtarget.org/ + url = https://github.com/Brewtarget/brewtarget/ arch = x86_64 arch = i686 license = CCPL:by-sa @@ -10,17 +10,18 @@ pkgbase = brewtarget license = LGPL2.1 license = LGPL3 license = WTFPL-2 - makedepends = cmake makedepends = boost + makedepends = cmake + makedepends = meson + makedepends = ninja + makedepends = pandoc makedepends = qt5-tools depends = qt5-base depends = qt5-multimedia depends = qt5-svg depends = xalan-c depends = xerces-c - source = brewtarget-3.0.9.tar.gz::https://github.com/Brewtarget/brewtarget/archive/refs/tags/v3.0.9.tar.gz - source = https://github.com/Brewtarget/brewtarget/commit/96b8fd080aab08cda355290835ebb812b519fcfd.patch - sha512sums = 7547948bf3d79d68f5ee156a3560e3ba53b45160349d24ebb9ae2086ee5b00bf086830a1bf702d50cd4f7a9385f09afd2e5e742e3e0bc59195448748c8b017ea - sha512sums = ed5c75eb3a79d33b3a9088e9086be3afbd1c4cde41e3e31f6b55c87797855cb12a9f6db5f357a4ce4bed732769a1c8f20edeee4d1c901a301f38fba12cc958a6 + source = brewtarget-3.0.10.tar.gz::https://github.com/Brewtarget/brewtarget/archive/refs/tags/v3.0.10.tar.gz + sha512sums = 7d8a7ee24e6b7107da604667d13ab07022c1d934acdb435a5b9757f76ce836fc7d8a313b82069b1e61df8475e3815fcdf45cbfca88609daa62c488e04d6d4bea pkgname = brewtarget @@ -3,38 +3,36 @@ # Contributor: Ricardo Leuck <leuck.r at gmail> (original brewtarget-git PKGBUILD) pkgname=brewtarget -pkgver=3.0.9 +pkgver=3.0.10 pkgrel=1 pkgdesc="Beer calculator compatible with BeerSmith. Generates instructions from the recipe and interactive mash designer." -url="http://www.brewtarget.org/" +url="https://github.com/Brewtarget/brewtarget/" arch=('x86_64' 'i686') license=('CCPL:by-sa' 'GPL3' 'LGPL2.1' 'LGPL3' 'WTFPL-2') depends=('qt5-base' 'qt5-multimedia' 'qt5-svg' 'xalan-c' 'xerces-c') -makedepends=('cmake' 'boost' 'qt5-tools') -source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/Brewtarget/brewtarget/archive/refs/tags/v${pkgver}.tar.gz" - "https://github.com/Brewtarget/brewtarget/commit/96b8fd080aab08cda355290835ebb812b519fcfd.patch") -sha512sums=('7547948bf3d79d68f5ee156a3560e3ba53b45160349d24ebb9ae2086ee5b00bf086830a1bf702d50cd4f7a9385f09afd2e5e742e3e0bc59195448748c8b017ea' - 'ed5c75eb3a79d33b3a9088e9086be3afbd1c4cde41e3e31f6b55c87797855cb12a9f6db5f357a4ce4bed732769a1c8f20edeee4d1c901a301f38fba12cc958a6') +makedepends=('boost' 'cmake' 'meson' 'ninja' 'pandoc' 'qt5-tools') +source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/Brewtarget/brewtarget/archive/refs/tags/v${pkgver}.tar.gz") +sha512sums=('7d8a7ee24e6b7107da604667d13ab07022c1d934acdb435a5b9757f76ce836fc7d8a313b82069b1e61df8475e3815fcdf45cbfca88609daa62c488e04d6d4bea') prepare() { -# Disable boost-stacktrace_backtrace, requires an optional boost lib that isn't built on Arch. - sed -i 's/ COMPONENTS stacktrace_backtrace//' ${pkgname}-${pkgver}/CMakeLists.txt -# More fixes for older databases - patch -d ${pkgname}-${pkgver} -p1 -i ../96b8fd080aab08cda355290835ebb812b519fcfd.patch + cd ${pkgname}-${pkgver} + +# Disable boost-stacktrace_backtrace, requires an optional boost lib that's only built in Debianland + sed -i "/boostModules += 'stacktrace_backtrace'/ {N;N;d}" meson.build +# Make libbacktrace not required, we're not running the bt script + sed -i "/compiler\.find_library('backtrace'/ {n;s/true/false/}" meson.build +# Disable static linking + sed -i 's/static : true/static : false/g' meson.build +# Don't screw with Arch's build flags + sed -i '/if compliler.getid/ s/gcc/disable/' meson.build } build() { - mkdir -p "${pkgname}-build" - cd "${pkgname}-build" - cmake "../${pkgname}-${pkgver}" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DNO_MESSING_WITH_FLAGS=ON - make + meson setup --prefix=/usr ${pkgname}-${pkgver} build + ninja -C build } package() { - cd "${pkgname}-build" - make DESTDIR="${pkgdir}" install - install -Dm644 "../${pkgname}-${pkgver}/COPYRIGHT" "${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT" - install -Dm644 "../${pkgname}-${pkgver}/COPYING.WTFPL" "${pkgdir}/usr/share/licenses/${pkgname}/COPYING.WTFPL" + DESTDIR="${pkgdir}" ninja install -C build + install -Dm644 "${pkgname}-${pkgver}/"{COPYRIGHT,COPYING.WTFPL} -t "${pkgdir}/usr/share/licenses/${pkgname}/" } |