From: tibequadorian <tibequadorian@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] qalculate: update to 4.1.0.
Date: Wed, 16 Mar 2022 23:48:40 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36179@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1226 bytes --]
There is a new pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages qalculate
https://github.com/void-linux/void-packages/pull/36179
qalculate: update to 4.1.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36179.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qalculate-36179.patch --]
[-- Type: text/x-diff, Size: 6024 bytes --]
From 03107cf077c6debb4b463421aa192d8abd7696ca Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 <ashpool@xecut.net>"
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 <tibequadorian@posteo.de>
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 <ashpool@xecut.net>"
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 <tibequadorian@posteo.de>
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 <orphan@voidlinux.org>"
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
next reply other threads:[~2022-03-16 22:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-16 22:48 tibequadorian [this message]
2022-04-14 16:08 ` [PR PATCH] [Closed]: " ahesford
2022-04-14 16:39 ` tibequadorian
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36179@inbox.vuxu.org \
--to=tibequadorian@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).