Github messages for voidlinux
 help / color / mirror / Atom feed
From: ashpooljh <ashpooljh@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] qalculate, qalculate-gtk: update to 3.14.0, drop noarch.
Date: Tue, 27 Oct 2020 19:27:17 +0100	[thread overview]
Message-ID: <20201027182717.1bMIN8Q5t2QLB4IHI3B64PUu4j7TiajBnxYCsHGIuu8@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25872@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 347 bytes --]

There is an updated pull request by ashpooljh against master on the void-packages repository

https://github.com/ashpooljh/void-packages qalc
https://github.com/void-linux/void-packages/pull/25872

qalculate, qalculate-gtk: update to 3.14.0, drop noarch.


A patch file from https://github.com/void-linux/void-packages/pull/25872.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qalc-25872.patch --]
[-- Type: text/x-diff, Size: 3759 bytes --]

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 73f18b6e73fb0ad61ed4078c4d536946fa6de3cc 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: move into libqalculate.

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

diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index 718059f8136..ebb16324b22 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,12 @@ 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}"
+	replaces="libqalculate-data>=0"
 	pkg_install() {
 		vmove usr/lib/libqalculate.so.*
+		vmove usr/share/qalculate
 	}
 }
 libqalculate-devel_package() {

  parent reply	other threads:[~2020-10-27 18:27 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-25 12:05 [PR PATCH] qalculate, qalculate-gtk: update to 3.13.0 ashpooljh
2020-10-25 12:37 ` [PR PATCH] [Updated] " ashpooljh
2020-10-25 16:44 ` [PR PATCH] [Updated] qalculate, qalculate-gtk: update to 3.13.0, drop noarch ashpooljh
2020-10-26 16:43 ` ashpooljh
2020-10-27 15:06 ` [PR REVIEW] qalculate, qalculate-gtk: update to 3.14.0, " ahesford
2020-10-27 18:05 ` [PR PATCH] [Updated] " ashpooljh
2020-10-27 18:17 ` [PR REVIEW] " ashpooljh
2020-10-27 18:27 ` ashpooljh [this message]
2020-10-27 18:28 ` ashpooljh
2020-10-27 18:43 ` ericonr
2020-10-27 18:47 ` [PR PATCH] [Updated] " ashpooljh
2020-10-29 14:30 ` [PR REVIEW] " ahesford
2020-10-29 14:45 ` [PR PATCH] [Updated] " ashpooljh
2020-10-29 17:03 ` [PR PATCH] [Closed]: " ahesford

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=20201027182717.1bMIN8Q5t2QLB4IHI3B64PUu4j7TiajBnxYCsHGIuu8@z \
    --to=ashpooljh@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).