* Re: [PR PATCH] [Updated] qalculate, qalculate-gtk: update to 3.13.0.
2020-10-25 12:05 [PR PATCH] qalculate, qalculate-gtk: update to 3.13.0 ashpooljh
@ 2020-10-25 12:37 ` ashpooljh
2020-10-25 16:44 ` [PR PATCH] [Updated] qalculate, qalculate-gtk: update to 3.13.0, drop noarch ashpooljh
` (11 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ashpooljh @ 2020-10-25 12:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 334 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.13.0.
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: 2390 bytes --]
From 87220ad0a23f57b50a434dfaf6e176c4319843c1 Mon Sep 17 00:00:00 2001
From: Ashpool <ashpool@xecut.net>
Date: Sun, 25 Oct 2020 15:04:20 +0300
Subject: [PATCH 1/2] qalculate: update to 3.13.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..63f074baed4 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.13.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=329700f6ee9f634e5383598197efe94861cd49ce1d9b40b61558fa578d58de1c
libqalculate-data_package() {
- archs=noarch
short_desc+=" - data files"
pkg_install() {
vmove usr/share/qalculate
From 477f248e07d8bc2e01713979f4b03c9b4bed2b60 Mon Sep 17 00:00:00 2001
From: Ashpool <ashpool@xecut.net>
Date: Sun, 25 Oct 2020 15:04:33 +0300
Subject: [PATCH 2/2] qalculate-gtk: update to 3.13.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..5b79f7a5e9a 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.13.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=7c4f7aac2c449e23932671b93b1fafc9f915d7c6bbac81f60d6ad44b6f3f5bc8
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PR PATCH] [Updated] qalculate, qalculate-gtk: update to 3.13.0, drop noarch.
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 ` ashpooljh
2020-10-26 16:43 ` ashpooljh
` (10 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ashpooljh @ 2020-10-25 16:44 UTC (permalink / raw)
To: ml
[-- 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.13.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: 2390 bytes --]
From 87220ad0a23f57b50a434dfaf6e176c4319843c1 Mon Sep 17 00:00:00 2001
From: Ashpool <ashpool@xecut.net>
Date: Sun, 25 Oct 2020 15:04:20 +0300
Subject: [PATCH 1/2] qalculate: update to 3.13.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..63f074baed4 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.13.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=329700f6ee9f634e5383598197efe94861cd49ce1d9b40b61558fa578d58de1c
libqalculate-data_package() {
- archs=noarch
short_desc+=" - data files"
pkg_install() {
vmove usr/share/qalculate
From 99a7265a27cd2d3f03517d46c0a0caff0445e929 Mon Sep 17 00:00:00 2001
From: Ashpool <ashpool@xecut.net>
Date: Sun, 25 Oct 2020 15:04:33 +0300
Subject: [PATCH 2/2] qalculate-gtk: update to 3.13.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..5b79f7a5e9a 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.13.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=7c4f7aac2c449e23932671b93b1fafc9f915d7c6bbac81f60d6ad44b6f3f5bc8
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PR PATCH] [Updated] qalculate, qalculate-gtk: update to 3.13.0, drop noarch.
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
` (9 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ashpooljh @ 2020-10-26 16:43 UTC (permalink / raw)
To: ml
[-- 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.13.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: 2390 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/2] 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/2] 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
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PR REVIEW] qalculate, qalculate-gtk: update to 3.14.0, drop noarch.
2020-10-25 12:05 [PR PATCH] qalculate, qalculate-gtk: update to 3.13.0 ashpooljh
` (2 preceding siblings ...)
2020-10-26 16:43 ` ashpooljh
@ 2020-10-27 15:06 ` ahesford
2020-10-27 18:05 ` [PR PATCH] [Updated] " ashpooljh
` (8 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ahesford @ 2020-10-27 15:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 322 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/25872#discussion_r512772549
Comment:
With the dropping of `noarch`, there is no need to have a separate `data` subpackage. Please drop this package entirely, moving its contents to the `libqalculate` subpackage.
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PR PATCH] [Updated] qalculate, qalculate-gtk: update to 3.14.0, drop noarch.
2020-10-25 12:05 [PR PATCH] qalculate, qalculate-gtk: update to 3.13.0 ashpooljh
` (3 preceding siblings ...)
2020-10-27 15:06 ` [PR REVIEW] qalculate, qalculate-gtk: update to 3.14.0, " ahesford
@ 2020-10-27 18:05 ` ashpooljh
2020-10-27 18:17 ` [PR REVIEW] " ashpooljh
` (7 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ashpooljh @ 2020-10-27 18:05 UTC (permalink / raw)
To: ml
[-- 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: 3739 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 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() {
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PR REVIEW] qalculate, qalculate-gtk: update to 3.14.0, drop noarch.
2020-10-25 12:05 [PR PATCH] qalculate, qalculate-gtk: update to 3.13.0 ashpooljh
` (4 preceding siblings ...)
2020-10-27 18:05 ` [PR PATCH] [Updated] " ashpooljh
@ 2020-10-27 18:17 ` ashpooljh
2020-10-27 18:27 ` [PR PATCH] [Updated] " ashpooljh
` (6 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ashpooljh @ 2020-10-27 18:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 433 bytes --]
New review comment by ashpooljh on void-packages repository
https://github.com/void-linux/void-packages/pull/25872#discussion_r512925580
Comment:
I'm not sure how to do this without hurting any existing installations. I added my attempt in a commit to this PR. In my case, the package upgrade went smoothly, but deleting the old `libqalculate-data` package resulted in deletion of the files which are now a part of `libqalculate`.
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PR PATCH] [Updated] qalculate, qalculate-gtk: update to 3.14.0, drop noarch.
2020-10-25 12:05 [PR PATCH] qalculate, qalculate-gtk: update to 3.13.0 ashpooljh
` (5 preceding siblings ...)
2020-10-27 18:17 ` [PR REVIEW] " ashpooljh
@ 2020-10-27 18:27 ` ashpooljh
2020-10-27 18:28 ` [PR REVIEW] " ashpooljh
` (5 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ashpooljh @ 2020-10-27 18:27 UTC (permalink / raw)
To: ml
[-- 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() {
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PR REVIEW] qalculate, qalculate-gtk: update to 3.14.0, drop noarch.
2020-10-25 12:05 [PR PATCH] qalculate, qalculate-gtk: update to 3.13.0 ashpooljh
` (6 preceding siblings ...)
2020-10-27 18:27 ` [PR PATCH] [Updated] " ashpooljh
@ 2020-10-27 18:28 ` ashpooljh
2020-10-27 18:43 ` ericonr
` (4 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ashpooljh @ 2020-10-27 18:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 217 bytes --]
New review comment by ashpooljh on void-packages repository
https://github.com/void-linux/void-packages/pull/25872#discussion_r512932578
Comment:
Ok, I just found out about `replaces` and it worked. Commit updated.
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PR REVIEW] qalculate, qalculate-gtk: update to 3.14.0, drop noarch.
2020-10-25 12:05 [PR PATCH] qalculate, qalculate-gtk: update to 3.13.0 ashpooljh
` (7 preceding siblings ...)
2020-10-27 18:28 ` [PR REVIEW] " ashpooljh
@ 2020-10-27 18:43 ` ericonr
2020-10-27 18:47 ` [PR PATCH] [Updated] " ashpooljh
` (3 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ericonr @ 2020-10-27 18:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 178 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/25872#discussion_r512941787
Comment:
Remember to remove the symlink.
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PR PATCH] [Updated] qalculate, qalculate-gtk: update to 3.14.0, drop noarch.
2020-10-25 12:05 [PR PATCH] qalculate, qalculate-gtk: update to 3.13.0 ashpooljh
` (8 preceding siblings ...)
2020-10-27 18:43 ` ericonr
@ 2020-10-27 18:47 ` ashpooljh
2020-10-29 14:30 ` [PR REVIEW] " ahesford
` (2 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ashpooljh @ 2020-10-27 18:47 UTC (permalink / raw)
To: ml
[-- 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: 4063 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 206eee8f49121811181f5869617108a5c2caa982 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/libqalculate-data | 1 -
srcpkgs/qalculate/template | 11 +++--------
2 files changed, 3 insertions(+), 9 deletions(-)
delete mode 120000 srcpkgs/libqalculate-data
diff --git a/srcpkgs/libqalculate-data b/srcpkgs/libqalculate-data
deleted file mode 120000
index 2cf8203b787..00000000000
--- a/srcpkgs/libqalculate-data
+++ /dev/null
@@ -1 +0,0 @@
-qalculate
\ No newline at end of file
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() {
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PR REVIEW] qalculate, qalculate-gtk: update to 3.14.0, drop noarch.
2020-10-25 12:05 [PR PATCH] qalculate, qalculate-gtk: update to 3.13.0 ashpooljh
` (9 preceding siblings ...)
2020-10-27 18:47 ` [PR PATCH] [Updated] " ashpooljh
@ 2020-10-29 14:30 ` ahesford
2020-10-29 14:45 ` [PR PATCH] [Updated] " ashpooljh
2020-10-29 17:03 ` [PR PATCH] [Closed]: " ahesford
12 siblings, 0 replies; 14+ messages in thread
From: ahesford @ 2020-10-29 14:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 183 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/25872#discussion_r514302432
Comment:
This should still have `revision=1`
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PR PATCH] [Updated] qalculate, qalculate-gtk: update to 3.14.0, drop noarch.
2020-10-25 12:05 [PR PATCH] qalculate, qalculate-gtk: update to 3.13.0 ashpooljh
` (10 preceding siblings ...)
2020-10-29 14:30 ` [PR REVIEW] " ahesford
@ 2020-10-29 14:45 ` ashpooljh
2020-10-29 17:03 ` [PR PATCH] [Closed]: " ahesford
12 siblings, 0 replies; 14+ messages in thread
From: ashpooljh @ 2020-10-29 14:45 UTC (permalink / raw)
To: ml
[-- 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: 2981 bytes --]
From 69f0cd6dec8b4bb30eec98061aca67e897715895 Mon Sep 17 00:00:00 2001
From: Ashpool <ashpool@xecut.net>
Date: Sun, 25 Oct 2020 15:04:20 +0300
Subject: [PATCH 1/2] qalculate: update to 3.14.0, drop noarch.
---
srcpkgs/libqalculate-data | 1 -
srcpkgs/qalculate/template | 14 ++++----------
2 files changed, 4 insertions(+), 11 deletions(-)
delete mode 120000 srcpkgs/libqalculate-data
diff --git a/srcpkgs/libqalculate-data b/srcpkgs/libqalculate-data
deleted file mode 120000
index 2cf8203b787..00000000000
--- a/srcpkgs/libqalculate-data
+++ /dev/null
@@ -1 +0,0 @@
-qalculate
\ No newline at end of file
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index c5d041892f4..d581a74bf40 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,20 +13,14 @@ 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
- }
-}
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() {
From 2848a38d314541352a6a22c3e5d56b8de56ab119 Mon Sep 17 00:00:00 2001
From: Ashpool <ashpool@xecut.net>
Date: Sun, 25 Oct 2020 15:04:33 +0300
Subject: [PATCH 2/2] 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
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PR PATCH] [Closed]: qalculate, qalculate-gtk: update to 3.14.0, drop noarch.
2020-10-25 12:05 [PR PATCH] qalculate, qalculate-gtk: update to 3.13.0 ashpooljh
` (11 preceding siblings ...)
2020-10-29 14:45 ` [PR PATCH] [Updated] " ashpooljh
@ 2020-10-29 17:03 ` ahesford
12 siblings, 0 replies; 14+ messages in thread
From: ahesford @ 2020-10-29 17:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 190 bytes --]
There's a closed pull request on the void-packages repository
qalculate, qalculate-gtk: update to 3.14.0, drop noarch.
https://github.com/void-linux/void-packages/pull/25872
Description:
^ permalink raw reply [flat|nested] 14+ messages in thread