From 26c9675e1426cc17a8bf442f34181c2bea0520ca Mon Sep 17 00:00:00 2001
From: Ashpool <ashpool@xecut.net>
Date: Sun, 25 Oct 2020 15:04:20 +0300
Subject: [PATCH 1/3] qalculate: update to 3.14.0, drop noarch.

---
 srcpkgs/qalculate/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index c5d041892f4..718059f8136 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,7 +1,7 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
 pkgname=qalculate
-version=3.12.1
+version=3.14.0
 revision=1
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
@@ -13,10 +13,9 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=28c46dc8dd975f253627d80c55a6feab7c44d965dce3ceffefc3cafc9a97c457
+checksum=ef422aa54eac7c711ece65dd3a5cbc66370d3e17173465313201897c201e7d3e
 
 libqalculate-data_package() {
-	archs=noarch
 	short_desc+=" - data files"
 	pkg_install() {
 		vmove usr/share/qalculate

From fac76b84335e3433a4461e57919e08c0822e38fe Mon Sep 17 00:00:00 2001
From: Ashpool <ashpool@xecut.net>
Date: Sun, 25 Oct 2020 15:04:33 +0300
Subject: [PATCH 2/3] qalculate-gtk: update to 3.14.0.

---
 srcpkgs/qalculate-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index 962bafe2263..1938fb85c19 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
 pkgname=qalculate-gtk
-version=3.12.1
+version=3.14.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -12,4 +12,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=1be087dace97c96c94cd0a032be103d8506001919a0ecc1cdd222445f5708596
+checksum=704dd3a98b47e0a84eb61b80c50cd6c445b37a1d28c1b1c271d7aef3592657e7

From df3bf842e56540fdb2aab73500cd7c31168a462d Mon Sep 17 00:00:00 2001
From: Ashpool <ashpool@xecut.net>
Date: Tue, 27 Oct 2020 21:00:39 +0300
Subject: [PATCH 3/3] libqalculate-data: drop package, merge into libqalculate.

---
 srcpkgs/qalculate/template | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index 718059f8136..a89714fbceb 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -2,7 +2,7 @@
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
 pkgname=qalculate
 version=3.14.0
-revision=1
+revision=2
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
@@ -15,17 +15,11 @@ homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
 checksum=ef422aa54eac7c711ece65dd3a5cbc66370d3e17173465313201897c201e7d3e
 
-libqalculate-data_package() {
-	short_desc+=" - data files"
-	pkg_install() {
-		vmove usr/share/qalculate
-	}
-}
 libqalculate_package() {
 	short_desc+=" - library files"
-	depends="libqalculate-data>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/lib/libqalculate.so.*
+		vmove usr/share/qalculate
 	}
 }
 libqalculate-devel_package() {