Update to version 2.1.0, add patch for build

4 files changed, 58 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f9e3950e6780..19064ba84ea7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = kalker
 	pkgdesc = A calculator program that supports user-defined variables, functions, derivation, and integration.
-	pkgver = 2.0.4
+	pkgver = 2.1.0
 	pkgrel = 1
 	url = https://github.com/PaddiM8/kalker
 	arch = i686
@@ -9,7 +9,13 @@ pkgbase = kalker
 	license = MIT
 	makedepends = cargo
 	depends = gcc-libs
-	source = kalker-2.0.4.tar.gz::https://github.com/PaddiM8/kalker/archive/v2.0.4.tar.gz
-	b2sums = 07faa060344afc5b8d34655062e037f1f5c43aa07efd5e5088f7b3a644e49445ee09f341e91f27b97ebfb86ad28d5c5abdf2f9192907dccf2b79c2443d9abd8c
+	depends = mpfr
+	depends = gmp
+	depends = libmpc
+	depends = glibc
+	source = kalker-2.1.0.tar.gz::https://github.com/PaddiM8/kalker/archive/v2.1.0.tar.gz
+	source = build.patch
+	b2sums = 5d21c6281121193e027e64ba18c6496fe7dd2aa4d5a28ff592eba81dd8f5c3a3611cba57ec18ab8c527227382396278e34461ae0157a3a62aac9054a7f72ac1b
+	b2sums = 3837356a5404453253956a6be7e7d7513b3d263e18a111b4b80817fddb15e099b52c37c1d2e247ac346716d0e8d47d971c3467f483c67db5d4396154ddf155bf
 
 pkgname = kalker
diff --git a/.gitignore b/.gitignore
index ddd398d2942f..0aa0fbac7c08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
-pkg
-src
-*.tar.*
-*.log
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
+!build.patch
diff --git a/PKGBUILD b/PKGBUILD
index ec364b2a4e51..b6cb8cecb616 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,15 +2,24 @@
 # Contributor : Daniel Chesters <archlinux@coin-coin.xyz>
 
 pkgname=kalker
-pkgver=2.0.4
+pkgver=2.1.0
 pkgrel=1
 pkgdesc="A calculator program that supports user-defined variables, functions, derivation, and integration."
 url="https://github.com/PaddiM8/kalker"
-depends=('gcc-libs')
+depends=('gcc-libs' 'mpfr' 'gmp' 'libmpc' 'glibc')
 makedepends=('cargo')
 arch=('i686' 'x86_64' 'aarch64')
 license=('MIT')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/PaddiM8/$pkgname/archive/v$pkgver.tar.gz")
+source=(
+	"$pkgname-$pkgver.tar.gz::https://github.com/PaddiM8/$pkgname/archive/v$pkgver.tar.gz"
+	"build.patch"
+)
+
+prepare() {
+	cd "$pkgname-$pkgver"
+	patch -p1 <../build.patch
+	cargo fetch --target "$CARCH-unknown-linux-gnu"
+}
 
 build() {
 	cd "$pkgname-$pkgver"
@@ -24,4 +33,5 @@ package() {
 }
 
 # vim:set ts=2 sw=2 et:
-b2sums=('07faa060344afc5b8d34655062e037f1f5c43aa07efd5e5088f7b3a644e49445ee09f341e91f27b97ebfb86ad28d5c5abdf2f9192907dccf2b79c2443d9abd8c')
+b2sums=('5d21c6281121193e027e64ba18c6496fe7dd2aa4d5a28ff592eba81dd8f5c3a3611cba57ec18ab8c527227382396278e34461ae0157a3a62aac9054a7f72ac1b'
+	'3837356a5404453253956a6be7e7d7513b3d263e18a111b4b80817fddb15e099b52c37c1d2e247ac346716d0e8d47d971c3467f483c67db5d4396154ddf155bf')
diff --git a/build.patch b/build.patch
new file mode 100644
index 000000000000..172991b33e1d
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,30 @@
+diff --git a/kalk/Cargo.toml b/kalk/Cargo.toml
+index 99915ea..1d00a9c 100644
+--- a/kalk/Cargo.toml
++++ b/kalk/Cargo.toml
+@@ -14,10 +14,14 @@ categories = ["mathematics", "parser-implementations"]
+ crate-type = ["cdylib", "rlib"]
+
+ [dependencies]
+-rug = { version = "1.17.0", features = ["float"], optional = true }
++rug = { version = "1.24.0", features = ["float"], optional = true }
+ lazy_static = "1.4.0"
+ wasm-bindgen = "0.2.69"
+-gmp-mpfr-sys = { version = "1.4.9", optional = true }
++
++[dependencies.gmp-mpfr-sys]
++version = "1.6.2"
++default-features = false
++features = ["mpfr", "use-system-libs"]
+
+ [dev-dependencies]
+ wasm-bindgen-test = "0.3.19"
+@@ -25,7 +29,7 @@ test-case = "1.0.0"
+ regex = "1"
+
+ [features]
+-default = ["rug", "gmp-mpfr-sys"]
++default = ["rug"]
+
+ # Breaks when optimizing for some reason.
+ [package.metadata.wasm-pack.profile.release