Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] qalculate: update to 3.20.1 + add qalculate-qt
@ 2021-07-29 13:27 FollieHiyuki
  2021-07-29 13:40 ` [PR PATCH] [Updated] " FollieHiyuki
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: FollieHiyuki @ 2021-07-29 13:27 UTC (permalink / raw)
  To: ml

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

There is a new pull request by FollieHiyuki against master on the void-packages repository

https://github.com/FollieHiyuki/void-packages qalculate-update
https://github.com/void-linux/void-packages/pull/32245

qalculate: update to 3.20.1 + add qalculate-qt
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32245.patch is attached

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

From c3db6cb35d6edccb370a07f3579cb989a82251d4 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 15:44:40 +0300
Subject: [PATCH 1/3] qalculate: update to 3.20.1

---
 common/shlibs              | 2 +-
 srcpkgs/qalculate/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 04eefcdcbdd1..da24f1de5810 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2996,7 +2996,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.21 libqalculate-3.0.0_1
+libqalculate.so.22 libqalculate-3.20.1_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index 6a2388c5cf4f..ac326495fa31 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.19.0
+version=3.20.1
 revision=1
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ 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=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
+checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
 
 libqalculate_package() {
 	short_desc+=" - library files"

From 0fb6f0a9936d2a40482d600d452bcc0c4d3c5212 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 15:46:26 +0300
Subject: [PATCH 2/3] qalculate-gtk: update to 3.20.1

---
 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 3fe5bc6a6d54..f71c085f5e8a 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.19.0
+version=3.20.1
 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=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
+checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136

From 0a7711764dca1a54c032d4af9d029227270bfb49 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 16:21:08 +0300
Subject: [PATCH 3/3] New package: qalculate-qt-3.20.1

---
 srcpkgs/qalculate-gtk/template |  1 +
 srcpkgs/qalculate-qt/template  | 16 ++++++++++++++++
 srcpkgs/qalculate/template     |  1 +
 3 files changed, 18 insertions(+)
 create mode 100644 srcpkgs/qalculate-qt/template

diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index f71c085f5e8a..a38571989276 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,5 +1,6 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate-gtk
 version=3.20.1
 revision=1
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
new file mode 100644
index 000000000000..72244c6be563
--- /dev/null
+++ b/srcpkgs/qalculate-qt/template
@@ -0,0 +1,16 @@
+# Template file for 'qalculate-qt'
+# NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-gtk"
+pkgname=qalculate-qt
+version=3.20.1
+revision=1
+build_style=qmake
+hostmakedepends="intltool pkg-config qt5-qmake"
+makedepends="libqalculate-devel qt5-devel"
+depends="gnuplot"
+short_desc="Multi-purpose desktop calculator - QT version"
+maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://qalculate.github.io"
+distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
+checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index ac326495fa31..4d9e490bf26d 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,5 +1,6 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate
 version=3.20.1
 revision=1

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] qalculate: update to 3.20.1 + add qalculate-qt
  2021-07-29 13:27 [PR PATCH] qalculate: update to 3.20.1 + add qalculate-qt FollieHiyuki
@ 2021-07-29 13:40 ` FollieHiyuki
  2021-07-29 13:42 ` FollieHiyuki
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: FollieHiyuki @ 2021-07-29 13:40 UTC (permalink / raw)
  To: ml

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

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

https://github.com/FollieHiyuki/void-packages qalculate-update
https://github.com/void-linux/void-packages/pull/32245

qalculate: update to 3.20.1 + add qalculate-qt
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32245.patch is attached

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

From c3db6cb35d6edccb370a07f3579cb989a82251d4 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 15:44:40 +0300
Subject: [PATCH 1/4] qalculate: update to 3.20.1

---
 common/shlibs              | 2 +-
 srcpkgs/qalculate/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 04eefcdcbdd1..da24f1de5810 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2996,7 +2996,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.21 libqalculate-3.0.0_1
+libqalculate.so.22 libqalculate-3.20.1_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index 6a2388c5cf4f..ac326495fa31 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.19.0
+version=3.20.1
 revision=1
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ 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=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
+checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
 
 libqalculate_package() {
 	short_desc+=" - library files"

From 0fb6f0a9936d2a40482d600d452bcc0c4d3c5212 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 15:46:26 +0300
Subject: [PATCH 2/4] qalculate-gtk: update to 3.20.1

---
 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 3fe5bc6a6d54..f71c085f5e8a 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.19.0
+version=3.20.1
 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=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
+checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136

From 0a7711764dca1a54c032d4af9d029227270bfb49 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 16:21:08 +0300
Subject: [PATCH 3/4] New package: qalculate-qt-3.20.1

---
 srcpkgs/qalculate-gtk/template |  1 +
 srcpkgs/qalculate-qt/template  | 16 ++++++++++++++++
 srcpkgs/qalculate/template     |  1 +
 3 files changed, 18 insertions(+)
 create mode 100644 srcpkgs/qalculate-qt/template

diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index f71c085f5e8a..a38571989276 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,5 +1,6 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate-gtk
 version=3.20.1
 revision=1
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
new file mode 100644
index 000000000000..72244c6be563
--- /dev/null
+++ b/srcpkgs/qalculate-qt/template
@@ -0,0 +1,16 @@
+# Template file for 'qalculate-qt'
+# NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-gtk"
+pkgname=qalculate-qt
+version=3.20.1
+revision=1
+build_style=qmake
+hostmakedepends="intltool pkg-config qt5-qmake"
+makedepends="libqalculate-devel qt5-devel"
+depends="gnuplot"
+short_desc="Multi-purpose desktop calculator - QT version"
+maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://qalculate.github.io"
+distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
+checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index ac326495fa31..4d9e490bf26d 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,5 +1,6 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate
 version=3.20.1
 revision=1

From 60b9cc54eae0707c96e54fa74d2fd02558b25a72 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 16:39:18 +0300
Subject: [PATCH 4/4] plasma-workspace: revbump for libqalculate.so.22

---
 srcpkgs/plasma-workspace/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 0c7495ad3dbd..7d0e7f1722a7 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,7 +1,7 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
 version=5.22.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
  -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner 

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] qalculate: update to 3.20.1 + add qalculate-qt
  2021-07-29 13:27 [PR PATCH] qalculate: update to 3.20.1 + add qalculate-qt FollieHiyuki
  2021-07-29 13:40 ` [PR PATCH] [Updated] " FollieHiyuki
@ 2021-07-29 13:42 ` FollieHiyuki
  2021-07-29 16:20 ` ericonr
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: FollieHiyuki @ 2021-07-29 13:42 UTC (permalink / raw)
  To: ml

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

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

https://github.com/FollieHiyuki/void-packages qalculate-update
https://github.com/void-linux/void-packages/pull/32245

qalculate: update to 3.20.1 + add qalculate-qt
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32245.patch is attached

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

From c3db6cb35d6edccb370a07f3579cb989a82251d4 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 15:44:40 +0300
Subject: [PATCH 1/4] qalculate: update to 3.20.1

---
 common/shlibs              | 2 +-
 srcpkgs/qalculate/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 04eefcdcbdd1..da24f1de5810 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2996,7 +2996,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.21 libqalculate-3.0.0_1
+libqalculate.so.22 libqalculate-3.20.1_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index 6a2388c5cf4f..ac326495fa31 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.19.0
+version=3.20.1
 revision=1
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ 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=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
+checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
 
 libqalculate_package() {
 	short_desc+=" - library files"

From 0fb6f0a9936d2a40482d600d452bcc0c4d3c5212 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 15:46:26 +0300
Subject: [PATCH 2/4] qalculate-gtk: update to 3.20.1

---
 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 3fe5bc6a6d54..f71c085f5e8a 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.19.0
+version=3.20.1
 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=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
+checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136

From 0a7711764dca1a54c032d4af9d029227270bfb49 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 16:21:08 +0300
Subject: [PATCH 3/4] New package: qalculate-qt-3.20.1

---
 srcpkgs/qalculate-gtk/template |  1 +
 srcpkgs/qalculate-qt/template  | 16 ++++++++++++++++
 srcpkgs/qalculate/template     |  1 +
 3 files changed, 18 insertions(+)
 create mode 100644 srcpkgs/qalculate-qt/template

diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index f71c085f5e8a..a38571989276 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,5 +1,6 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate-gtk
 version=3.20.1
 revision=1
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
new file mode 100644
index 000000000000..72244c6be563
--- /dev/null
+++ b/srcpkgs/qalculate-qt/template
@@ -0,0 +1,16 @@
+# Template file for 'qalculate-qt'
+# NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-gtk"
+pkgname=qalculate-qt
+version=3.20.1
+revision=1
+build_style=qmake
+hostmakedepends="intltool pkg-config qt5-qmake"
+makedepends="libqalculate-devel qt5-devel"
+depends="gnuplot"
+short_desc="Multi-purpose desktop calculator - QT version"
+maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://qalculate.github.io"
+distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
+checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index ac326495fa31..4d9e490bf26d 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,5 +1,6 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate
 version=3.20.1
 revision=1

From 89c1d8886f14f104da74789fe342f768a701b291 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 16:39:18 +0300
Subject: [PATCH 4/4] plasma-workspace: revbump for libqalculate.so.22

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

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 0c7495ad3dbd..fa84666b06fb 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,10 +1,10 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
 version=5.22.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
- -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner 
+ -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
  DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: qalculate: update to 3.20.1 + add qalculate-qt
  2021-07-29 13:27 [PR PATCH] qalculate: update to 3.20.1 + add qalculate-qt FollieHiyuki
  2021-07-29 13:40 ` [PR PATCH] [Updated] " FollieHiyuki
  2021-07-29 13:42 ` FollieHiyuki
@ 2021-07-29 16:20 ` ericonr
  2021-07-29 22:28 ` [PR PATCH] [Updated] " FollieHiyuki
  2021-07-30 20:06 ` [PR PATCH] [Merged]: " ericonr
  4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-07-29 16:20 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32245#issuecomment-889284477

Comment:
Missing some hostmakedeps for the new package:

```
make: *** No rule to make target '/usr/lib/qt5/bin/rcc', needed by 'qrc_icons.cpp'.  Stop.
```

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] qalculate: update to 3.20.1 + add qalculate-qt
  2021-07-29 13:27 [PR PATCH] qalculate: update to 3.20.1 + add qalculate-qt FollieHiyuki
                   ` (2 preceding siblings ...)
  2021-07-29 16:20 ` ericonr
@ 2021-07-29 22:28 ` FollieHiyuki
  2021-07-30 20:06 ` [PR PATCH] [Merged]: " ericonr
  4 siblings, 0 replies; 6+ messages in thread
From: FollieHiyuki @ 2021-07-29 22:28 UTC (permalink / raw)
  To: ml

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

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

https://github.com/FollieHiyuki/void-packages qalculate-update
https://github.com/void-linux/void-packages/pull/32245

qalculate: update to 3.20.1 + add qalculate-qt
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32245.patch is attached

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

From c3db6cb35d6edccb370a07f3579cb989a82251d4 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 15:44:40 +0300
Subject: [PATCH 1/4] qalculate: update to 3.20.1

---
 common/shlibs              | 2 +-
 srcpkgs/qalculate/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 04eefcdcbdd1..da24f1de5810 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2996,7 +2996,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.21 libqalculate-3.0.0_1
+libqalculate.so.22 libqalculate-3.20.1_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index 6a2388c5cf4f..ac326495fa31 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.19.0
+version=3.20.1
 revision=1
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ 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=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
+checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
 
 libqalculate_package() {
 	short_desc+=" - library files"

From 04712bb5780c19734be7c6a1adfc18c2ddf2b32f Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 16:39:18 +0300
Subject: [PATCH 2/4] plasma-workspace: revbump for libqalculate.so.22

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

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 0c7495ad3dbd..fa84666b06fb 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,10 +1,10 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
 version=5.22.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
- -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner 
+ -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
  DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel

From c2b89af0885dd0b510f54308b53a6633547ffc9d Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 15:46:26 +0300
Subject: [PATCH 3/4] qalculate-gtk: update to 3.20.1

---
 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 3fe5bc6a6d54..f71c085f5e8a 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.19.0
+version=3.20.1
 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=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
+checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136

From a942ac4a7a2ae8d8b64a612e7f8e3a47ed71e560 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 16:21:08 +0300
Subject: [PATCH 4/4] New package: qalculate-qt-3.20.1

---
 srcpkgs/qalculate-gtk/template |  1 +
 srcpkgs/qalculate-qt/template  | 16 ++++++++++++++++
 srcpkgs/qalculate/template     |  1 +
 3 files changed, 18 insertions(+)
 create mode 100644 srcpkgs/qalculate-qt/template

diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index f71c085f5e8a..a38571989276 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,5 +1,6 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate-gtk
 version=3.20.1
 revision=1
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
new file mode 100644
index 000000000000..610c93d8ca70
--- /dev/null
+++ b/srcpkgs/qalculate-qt/template
@@ -0,0 +1,16 @@
+# Template file for 'qalculate-qt'
+# NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-gtk"
+pkgname=qalculate-qt
+version=3.20.1
+revision=1
+build_style=qmake
+hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
+makedepends="libqalculate-devel qt5-devel"
+depends="gnuplot"
+short_desc="Multi-purpose desktop calculator - QT version"
+maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://qalculate.github.io"
+distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
+checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index ac326495fa31..4d9e490bf26d 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,5 +1,6 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate
 version=3.20.1
 revision=1

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Merged]: qalculate: update to 3.20.1 + add qalculate-qt
  2021-07-29 13:27 [PR PATCH] qalculate: update to 3.20.1 + add qalculate-qt FollieHiyuki
                   ` (3 preceding siblings ...)
  2021-07-29 22:28 ` [PR PATCH] [Updated] " FollieHiyuki
@ 2021-07-30 20:06 ` ericonr
  4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-07-30 20:06 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

qalculate: update to 3.20.1 + add qalculate-qt
https://github.com/void-linux/void-packages/pull/32245

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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
-->


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-07-30 20:06 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-29 13:27 [PR PATCH] qalculate: update to 3.20.1 + add qalculate-qt FollieHiyuki
2021-07-29 13:40 ` [PR PATCH] [Updated] " FollieHiyuki
2021-07-29 13:42 ` FollieHiyuki
2021-07-29 16:20 ` ericonr
2021-07-29 22:28 ` [PR PATCH] [Updated] " FollieHiyuki
2021-07-30 20:06 ` [PR PATCH] [Merged]: " ericonr

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).