[PR PATCH] qt6base: revuild with lib blake2

[PR PATCH] qt6base: revuild with lib blake2

[yopito]

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

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

https://github.com/yopito/void-packages qt6.with.blake2
https://github.com/void-linux/void-packages/pull/31084

qt6base: revuild with lib blake2
<!-- Mark items with [x] where applicable -->

#### General
- [ ] 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?
- [ ] 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/31084.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6.with.blake2-31084.patch --]
[-- Type: text/x-diff, Size: 3118 bytes --]

From f3f3fab06cb879de1f56340cc61bbd37f94535e9 Mon Sep 17 00:00:00 2001
From: Pierre Bourgin <pierre.bourgin@free.fr>
Date: Mon, 24 May 2021 13:09:43 +0200
Subject: [PATCH 1/2] New package: libb2 0.98.1

---
 common/shlibs          |  1 +
 srcpkgs/libb2-devel    |  1 +
 srcpkgs/libb2/template | 26 ++++++++++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 120000 srcpkgs/libb2-devel
 create mode 100644 srcpkgs/libb2/template

diff --git a/common/shlibs b/common/shlibs
index 4e992b40b792..b78aba1bcd59 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -48,6 +48,7 @@ libpcprofile.so glibc-2.32_1
 libcidn.so.1 glibc-2.32_1
 libmvec.so.1 glibc-2.32_1
 libz.so.1 zlib-1.2.3_1
+libb2.so.1 libb2-0.98.1_1
 libbz2.so.1 bzip2-1.0.5_1
 libarchive.so.13 libarchive-3.5.1_2
 libcc1.so.0 gcc-6.2.1_1
diff --git a/srcpkgs/libb2-devel b/srcpkgs/libb2-devel
new file mode 120000
index 000000000000..47abfe4da640
--- /dev/null
+++ b/srcpkgs/libb2-devel
@@ -0,0 +1 @@
+libb2
\ No newline at end of file
diff --git a/srcpkgs/libb2/template b/srcpkgs/libb2/template
new file mode 100644
index 000000000000..8f9552a88753
--- /dev/null
+++ b/srcpkgs/libb2/template
@@ -0,0 +1,26 @@
+# Template file for 'libb2'
+pkgname=libb2
+version=0.98.1
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake libtool pkg-config"
+short_desc="BLAKE2 cryptographic hash function"
+maintainer="Pierre Bourgin <pierre.bourgin@free.fr>"
+license="CC0-1.0"
+homepage="https://www.blake2.net/"
+distfiles="https://github.com/BLAKE2/libb2/archive/v${version}.tar.gz"
+checksum=10053dbc2fa342516b780a6bbf6e7b2a2360b8d49c5ac426936bf3df82526732
+
+pre_configure() {
+	autoreconf -fi
+}
+
+libb2-devel_package() {
+	depends="${sourcepkg}-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 6dc2848213ec1593cb438ea722f1cc659d05bd0f Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Mon, 24 May 2021 16:07:20 +0200
Subject: [PATCH 2/2] qt6-base: rebuild with lib blake2

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

diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index c720e7f51671..3a6156796d62 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.1.0
-revision=1
+revision=2
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -22,7 +22,7 @@ makedepends="zlib-devel libzstd-devel dbus-devel
  libpng-devel tslib-devel libinput-devel gtk+3-devel
  libmariadbclient-devel postgresql-libs-devel libatomic-devel
  unixodbc-devel cups-devel libproxy-devel brotli-devel
- sqlite-devel Vulkan-Headers mit-krb5-devel vulkan-loader"
+ sqlite-devel Vulkan-Headers mit-krb5-devel vulkan-loader libb2-devel"
 short_desc="Cross-platform application and UI framework (QT6)"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"

Re: qt6base: rebuild with lib blake2

[Johnnynator]

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

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/31084#issuecomment-847723517

Comment:
lgtm, will push this together with qt 6.1.1 which should be released early next week.

Re: qt6base: rebuild with lib blake2

[yopito]

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

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/31084#issuecomment-847797690

Comment:
Fine for me.

Re: [PR PATCH] [Closed]: qt6base: rebuild with lib blake2

[Johnnynator]

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

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

qt6base: rebuild with lib blake2
https://github.com/void-linux/void-packages/pull/31084

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

#### General
- [ ] 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?
- [ ] 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
-->