Upstream update to 3.0.9

2 files changed, 17 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 756d78dde700..9c08973d79ac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = brewtarget
 	pkgdesc = Beer calculator compatible with BeerSmith. Generates instructions from the recipe and interactive mash designer.
-	pkgver = 3.0.7
+	pkgver = 3.0.9
 	pkgrel = 1
 	url = http://www.brewtarget.org/
 	arch = x86_64
@@ -18,7 +18,9 @@ pkgbase = brewtarget
 	depends = qt5-svg
 	depends = xalan-c
 	depends = xerces-c
-	source = brewtarget-3.0.7.tar.gz::https://github.com/Brewtarget/brewtarget/archive/refs/tags/v3.0.7.tar.gz
-	sha512sums = 2af31920be2bc3961e60fa6539cd95304ba1abc5460e643d3c514f947c206eaa577503345bff70f9bf7286303a45c67c39e2ef845d6ee3ff48fb5bbe4f1b02e8
+	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
 
 pkgname = brewtarget
diff --git a/PKGBUILD b/PKGBUILD
index c7b5b5547492..d549968f771b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Ricardo Leuck <leuck.r at gmail> (original brewtarget-git PKGBUILD)
 
 pkgname=brewtarget
-pkgver=3.0.7
+pkgver=3.0.9
 pkgrel=1
 pkgdesc="Beer calculator compatible with BeerSmith. Generates instructions from the recipe and interactive mash designer."
 url="http://www.brewtarget.org/"
@@ -11,8 +11,17 @@ 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")
-sha512sums=('2af31920be2bc3961e60fa6539cd95304ba1abc5460e643d3c514f947c206eaa577503345bff70f9bf7286303a45c67c39e2ef845d6ee3ff48fb5bbe4f1b02e8')
+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')
+
+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
+}
 
 prepare() {
 # Disable boost-stacktrace_backtrace, requires an optional boost lib that isn't built on Arch.