[PR PATCH] [ci skip] zxing-cpp: update to 2.0.0.

[PR PATCH] [ci skip] zxing-cpp: update to 2.0.0.

[mhmdanas]

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

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

https://github.com/mhmdanas/void-packages zxing-cpp-2.0.0
https://github.com/void-linux/void-packages/pull/42335

[ci skip] zxing-cpp: update to 2.0.0.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

@Johnnynator

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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/42335.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zxing-cpp-2.0.0-42335.patch --]
[-- Type: text/x-diff, Size: 3811 bytes --]

From da2dc986ff91a38cb64d1666b01f0e9be37f4683 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Fri, 17 Feb 2023 16:59:42 +0000
Subject: [PATCH 1/3] zxing-cpp: update to 2.0.0.

---
 common/shlibs              |  2 +-
 srcpkgs/zxing-cpp/template | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 0c1d545fbe27..ecc9d1955f89 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1603,7 +1603,7 @@ libKF5Kirigami2.so.5 kirigami2-5.47.0_1
 libtaskmanager.so.6 plasma-workspace-5.8.4_1
 libnotificationmanager.so.1 plasma-workspace-5.15.90_1
 libKPipeWire.so.5 kpipewire-5.26.0_1
-libZXing.so.1 zxing-cpp-1.2.0_1
+libZXing.so.3 zxing-cpp-2.0.0_1
 libfreerdp-client2.so.2 libfreerdp-2.2.0_3
 libfreerdp2.so.2 libfreerdp-2.2.0_3
 libwinpr2.so.2 libfreerdp-2.2.0_3
diff --git a/srcpkgs/zxing-cpp/template b/srcpkgs/zxing-cpp/template
index 8bc0a8a2b89b..8c3f10f294bf 100644
--- a/srcpkgs/zxing-cpp/template
+++ b/srcpkgs/zxing-cpp/template
@@ -1,15 +1,22 @@
 # Template file for 'zxing-cpp'
 pkgname=zxing-cpp
-version=1.2.0
+version=2.0.0
 revision=1
 build_style=cmake
-configure_args="-DBUILD_EXAMPLES=OFF -DBUILD_BLACKBOX_TESTS=OFF"
+configure_args="-DBUILD_EXAMPLES=OFF -DBUILD_BLACKBOX_TESTS=OFF -DBUILD_DEPENDENCIES=LOCAL"
+checkdepends="gtest-devel"
 short_desc="Multi-format 1D/2D barcode image processing library"
 maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-or-later"
+license="Apache-2.0"
 homepage="https://github.com/nu-book/zxing-cpp/"
 distfiles="https://github.com/nu-book/zxing-cpp/archive/refs/tags/v${version}.tar.gz"
-checksum=653d9e44195d86cf64a36af9ff3a1978ec5599df3882439fefa56e7064f55e8a
+checksum=12b76b7005c30d34265fc20356d340da179b0b4d43d2c1b35bcca86776069f76
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -DBUILD_UNIT_TESTS=ON"
+else
+	configure_args+=" -DBUILD_UNIT_TESTS=OFF"
+fi
 
 zxing-cpp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 88fd73aa0acb62cfd340f818f1c580ba9004a1b2 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Fri, 17 Feb 2023 17:01:55 +0000
Subject: [PATCH 2/3] libreoffice: revbump for zxing-cpp-2.0.0.

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

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 11e023847f1e..ebc76272d6d8 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.4.3.2
-revision=1
+revision=2
 build_style=meta
 make_build_target="build"
 nocross="Several dependencies are nocross=yes"

From 30bb0227e3ed799af1182aa8de14f3fc59d30d54 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Fri, 17 Feb 2023 17:01:55 +0000
Subject: [PATCH 3/3] prison: revbump for zxing-cpp-2.0.0.

---
 srcpkgs/prison/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index b5f4fa4f52b9..1294e2923c33 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,7 +1,7 @@
 # Template file for 'prison'
 pkgname=prison
 version=5.103.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen
  qt5-declarative-devel qt5-qmake qt5-host-tools"
@@ -14,6 +14,12 @@ homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
 checksum=44c5f902fac041e6aeb2baa6f26a1b58b3531d500f40e0411e171d3607b0f288
 
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args="-DBUILD_TESTING=ON"
+else
+	configure_args="-DBUILD_TESTING=OFF"
+fi
+
 post_install() {
 	vlicense LICENSES/BSD-3-Clause.txt
 	vlicense LICENSES/MIT.txt

Re: [ci skip] zxing-cpp: update to 2.0.0.

[Johnnynator]

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

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/42335#issuecomment-1435721515

Comment:
Libreoffice doesn't compile against zxing-cpp 2 ootb. You shoould add this patch: https://gerrit.libreoffice.org/c/core/+/144874

Re: [PR PATCH] [Updated] [ci skip] zxing-cpp: update to 2.0.0.

[mhmdanas]

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

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

https://github.com/mhmdanas/void-packages zxing-cpp-2.0.0
https://github.com/void-linux/void-packages/pull/42335

[ci skip] zxing-cpp: update to 2.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

@Johnnynator

I can move the unrelated template changes into another PR if so you prefer.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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/42335.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zxing-cpp-2.0.0-42335.patch --]
[-- Type: text/x-diff, Size: 6128 bytes --]

From da2dc986ff91a38cb64d1666b01f0e9be37f4683 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Fri, 17 Feb 2023 16:59:42 +0000
Subject: [PATCH 1/3] zxing-cpp: update to 2.0.0.

---
 common/shlibs              |  2 +-
 srcpkgs/zxing-cpp/template | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 0c1d545fbe27..ecc9d1955f89 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1603,7 +1603,7 @@ libKF5Kirigami2.so.5 kirigami2-5.47.0_1
 libtaskmanager.so.6 plasma-workspace-5.8.4_1
 libnotificationmanager.so.1 plasma-workspace-5.15.90_1
 libKPipeWire.so.5 kpipewire-5.26.0_1
-libZXing.so.1 zxing-cpp-1.2.0_1
+libZXing.so.3 zxing-cpp-2.0.0_1
 libfreerdp-client2.so.2 libfreerdp-2.2.0_3
 libfreerdp2.so.2 libfreerdp-2.2.0_3
 libwinpr2.so.2 libfreerdp-2.2.0_3
diff --git a/srcpkgs/zxing-cpp/template b/srcpkgs/zxing-cpp/template
index 8bc0a8a2b89b..8c3f10f294bf 100644
--- a/srcpkgs/zxing-cpp/template
+++ b/srcpkgs/zxing-cpp/template
@@ -1,15 +1,22 @@
 # Template file for 'zxing-cpp'
 pkgname=zxing-cpp
-version=1.2.0
+version=2.0.0
 revision=1
 build_style=cmake
-configure_args="-DBUILD_EXAMPLES=OFF -DBUILD_BLACKBOX_TESTS=OFF"
+configure_args="-DBUILD_EXAMPLES=OFF -DBUILD_BLACKBOX_TESTS=OFF -DBUILD_DEPENDENCIES=LOCAL"
+checkdepends="gtest-devel"
 short_desc="Multi-format 1D/2D barcode image processing library"
 maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-or-later"
+license="Apache-2.0"
 homepage="https://github.com/nu-book/zxing-cpp/"
 distfiles="https://github.com/nu-book/zxing-cpp/archive/refs/tags/v${version}.tar.gz"
-checksum=653d9e44195d86cf64a36af9ff3a1978ec5599df3882439fefa56e7064f55e8a
+checksum=12b76b7005c30d34265fc20356d340da179b0b4d43d2c1b35bcca86776069f76
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -DBUILD_UNIT_TESTS=ON"
+else
+	configure_args+=" -DBUILD_UNIT_TESTS=OFF"
+fi
 
 zxing-cpp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From f2d35d3604f6e698ebb1dec0e37c7c48752451f4 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Fri, 17 Feb 2023 17:01:55 +0000
Subject: [PATCH 2/3] libreoffice: revbump for zxing-cpp-2.0.0.

---
 srcpkgs/libreoffice/patches/15e5d86.diff | 51 ++++++++++++++++++++++++
 srcpkgs/libreoffice/template             |  2 +-
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libreoffice/patches/15e5d86.diff

diff --git a/srcpkgs/libreoffice/patches/15e5d86.diff b/srcpkgs/libreoffice/patches/15e5d86.diff
new file mode 100644
index 000000000000..f01c44c1e58e
--- /dev/null
+++ b/srcpkgs/libreoffice/patches/15e5d86.diff
@@ -0,0 +1,51 @@
+From 15e5d86cc55ad94ac946e04d5e25b84be5810970 Mon Sep 17 00:00:00 2001
+From: Brett T. Warden <brett.t.warden@intel.com>
+Date: Fri, 30 Dec 2022 08:43:25 +0100
+Subject: [PATCH] Remove dependency on BitArray.h from zxing-1.2.0
+
+In zxing-1.4.0, numerous headers are no longer public. Rework the
+ConvertToSVGFormat method so it uses bitmatrix.get instead of
+bitmatrix.getRow, similar to the ToSVG method in zxing itself.
+
+See https://github.com/zxing-cpp/zxing-cpp/issues/361
+
+Change-Id: Ie25eb8f782e8799fbd57c24ef79bba92acf0f9ff
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144874
+Tested-by: René Engelhard <rene@debian.org>
+Reviewed-by: René Engelhard <rene@debian.org>
+Tested-by: Jenkins
+Reviewed-by: Caolán McNamara <caolanm@redhat.com>
+---
+
+diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx b/cui/source/dialogs/QrCodeGenDialog.cxx
+index f8cbac1..817be7f 100644
+--- a/cui/source/dialogs/QrCodeGenDialog.cxx
++++ b/cui/source/dialogs/QrCodeGenDialog.cxx
+@@ -27,7 +27,6 @@
+ #endif
+ 
+ #include <BarcodeFormat.h>
+-#include <BitArray.h>
+ #include <BitMatrix.h>
+ #include <MultiFormatWriter.h>
+ #include <TextUtfEncoding.h>
+@@ -79,7 +78,6 @@
+     OStringBuffer sb;
+     const int width = bitmatrix.width();
+     const int height = bitmatrix.height();
+-    ZXing::BitArray row(width);
+     sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+               "<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" viewBox=\"0 0 "
+               + OString::number(width) + " " + OString::number(height)
+@@ -87,10 +85,9 @@
+                 "<path d=\"");
+     for (int i = 0; i < height; ++i)
+     {
+-        bitmatrix.getRow(i, row);
+         for (int j = 0; j < width; ++j)
+         {
+-            if (row.get(j))
++            if (bitmatrix.get(j, i))
+             {
+                 sb.append("M" + OString::number(j) + "," + OString::number(i) + "h1v1h-1z");
+             }
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 11e023847f1e..ebc76272d6d8 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.4.3.2
-revision=1
+revision=2
 build_style=meta
 make_build_target="build"
 nocross="Several dependencies are nocross=yes"

From 2b9723615642373c11e1cc3869337bd91b973f4a Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Fri, 17 Feb 2023 17:01:55 +0000
Subject: [PATCH 3/3] prison: revbump for zxing-cpp-2.0.0.

---
 srcpkgs/prison/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index b5f4fa4f52b9..1294e2923c33 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,7 +1,7 @@
 # Template file for 'prison'
 pkgname=prison
 version=5.103.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen
  qt5-declarative-devel qt5-qmake qt5-host-tools"
@@ -14,6 +14,12 @@ homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
 checksum=44c5f902fac041e6aeb2baa6f26a1b58b3531d500f40e0411e171d3607b0f288
 
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args="-DBUILD_TESTING=ON"
+else
+	configure_args="-DBUILD_TESTING=OFF"
+fi
+
 post_install() {
 	vlicense LICENSES/BSD-3-Clause.txt
 	vlicense LICENSES/MIT.txt

Re: [ci skip] zxing-cpp: update to 2.0.0.

[mhmdanas]

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

New comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/42335#issuecomment-1436004118

Comment:
This PR should be merged into https://github.com/void-linux/void-packages/pull/42285 to avoid rebuilding `libreoffice` twice, so closing it.

Re: [PR PATCH] [Closed]: [ci skip] zxing-cpp: update to 2.0.0.

[mhmdanas]

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

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

[ci skip] zxing-cpp: update to 2.0.0.
https://github.com/void-linux/void-packages/pull/42335

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

@Johnnynator

I can move the unrelated template changes into another PR if so you prefer.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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
-->