From 03107cf077c6debb4b463421aa192d8abd7696ca Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 16 Mar 2022 23:34:55 +0100 Subject: [PATCH 1/3] libqalculate: update to 4.1. previously 'qalculate', rearranged subpackages in a way which makes more sense. --- srcpkgs/libqalculate | 1 - srcpkgs/libqalculate-devel | 2 +- srcpkgs/{qalculate => libqalculate}/template | 27 ++++++++++---------- srcpkgs/qalculate | 1 + 4 files changed, 15 insertions(+), 16 deletions(-) delete mode 120000 srcpkgs/libqalculate rename srcpkgs/{qalculate => libqalculate}/template (59%) create mode 120000 srcpkgs/qalculate diff --git a/srcpkgs/libqalculate b/srcpkgs/libqalculate deleted file mode 120000 index 2cf8203b7872..000000000000 --- a/srcpkgs/libqalculate +++ /dev/null @@ -1 +0,0 @@ -qalculate \ No newline at end of file diff --git a/srcpkgs/libqalculate-devel b/srcpkgs/libqalculate-devel index 2cf8203b7872..2822077292df 120000 --- a/srcpkgs/libqalculate-devel +++ b/srcpkgs/libqalculate-devel @@ -1 +1 @@ -qalculate \ No newline at end of file +libqalculate \ No newline at end of file diff --git a/srcpkgs/qalculate/template b/srcpkgs/libqalculate/template similarity index 59% rename from srcpkgs/qalculate/template rename to srcpkgs/libqalculate/template index d24fcba07f06..0414d879df42 100644 --- a/srcpkgs/qalculate/template +++ b/srcpkgs/libqalculate/template @@ -1,29 +1,28 @@ -# Template file for 'qalculate' -# NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk" -# and "srcpkgs/qalculate-qt" -pkgname=qalculate -version=3.20.1 -revision=3 -wrksrc="lib${pkgname}-${version}" +# Template file for 'libqalculate' +# NOTE: keep this package synchronized with 'qalculate-gtk' and 'qalculate-qt' +pkgname=libqalculate +version=4.1.0 +revision=1 build_style=gnu-configure hostmakedepends="intltool pkg-config doxygen" makedepends="libxml2-devel cln-devel readline-devel libcurl-devel icu-devel mpfr-devel" -short_desc="Multi-purpose desktop calculator" +short_desc="Multi-purpose desktop calculator library" maintainer="Artem Zhurikhin " license="GPL-2.0-or-later" homepage="https://qalculate.github.io" +changelog="https://qalculate.github.io/news.html" distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz" -checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7 +checksum=d943e5285bdc0b3cd77b8f7a10391d7c753fc19b0ddd48e5d4179decf709d6ff -libqalculate_package() { - short_desc+=" - library files" - replaces="libqalculate-data>=0" +qalculate_package() { + short_desc="Multi-purpose desktop calculator - CLI version" pkg_install() { - vmove usr/lib/libqalculate.so.* - vmove usr/share/qalculate + vmove usr/bin/qalc + vmove usr/share/man/man1/qalc.1 } } + libqalculate-devel_package() { short_desc+=" - development files" depends="libqalculate>=${version}_${revision} libxml2-devel cln-devel gmp-devel mpfr-devel" diff --git a/srcpkgs/qalculate b/srcpkgs/qalculate new file mode 120000 index 000000000000..2822077292df --- /dev/null +++ b/srcpkgs/qalculate @@ -0,0 +1 @@ +libqalculate \ No newline at end of file From 14bf3b43d41d604fa2eea8edfa71cce35c9e3a97 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 16 Mar 2022 23:35:05 +0100 Subject: [PATCH 2/3] qalculate-gtk: update to 4.1.0. --- srcpkgs/qalculate-gtk/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template index a38571989276..642bd9e5da80 100644 --- a/srcpkgs/qalculate-gtk/template +++ b/srcpkgs/qalculate-gtk/template @@ -1,8 +1,7 @@ # Template file for 'qalculate-gtk' -# NOTE: keep this package synchronized with "srcpkgs/qalculate" -# and "srcpkgs/qalculate-qt" +# NOTE: keep this package synchronized with 'libqalculate' and 'qalculate-qt' pkgname=qalculate-gtk -version=3.20.1 +version=4.1.0 revision=1 build_style=gnu-configure hostmakedepends="intltool pkg-config glib-devel" @@ -12,5 +11,6 @@ short_desc="Multi-purpose desktop calculator - GTK+ version" maintainer="Artem Zhurikhin " license="GPL-2.0-or-later" homepage="https://qalculate.github.io" +changelog="https://qalculate.github.io/news.html" distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz" -checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136 +checksum=8bab126f4f87e9321572f10e9262bf095c7e72470d4b61e2a173d273673bdeca From f52973c89f881bf30fbfd83e0a701201f014bdde Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 16 Mar 2022 23:35:06 +0100 Subject: [PATCH 3/3] qalculate-qt: update to 4.1.0. --- srcpkgs/qalculate-qt/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template index c960ee0eed61..d1995bdec691 100644 --- a/srcpkgs/qalculate-qt/template +++ b/srcpkgs/qalculate-qt/template @@ -1,8 +1,7 @@ # Template file for 'qalculate-qt' -# NOTE: keep this package synchronized with "srcpkgs/qalculate" -# and "srcpkgs/qalculate-gtk" +# NOTE: keep this package synchronized with 'libqalculate' and 'qalculate-gtk' pkgname=qalculate-qt -version=3.20.1 +version=4.1.0 revision=1 build_style=qmake hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools" @@ -12,5 +11,6 @@ short_desc="Multi-purpose desktop calculator - QT version" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://qalculate.github.io" +changelog="https://qalculate.github.io/news.html" distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz" -checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a +checksum=b54b880750bf75e756f074c1fb6a38dcfe23ad9a53954b83a8a86981c6cb824e