Re: [PR PATCH] [Updated] qpdf: changed build_style to cmake.

[benalb <benalb@users.noreply.github.com>]

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

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

https://github.com/benalb/void-packages qpdf
https://github.com/void-linux/void-packages/pull/36330

qpdf: changed build_style to cmake.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package

-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (X86-64-LIBC)



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

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

From dc8d69809c97c4a6ff3b5d1f61d8c5936662130f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 25 Mar 2022 12:28:53 +0100
Subject: [PATCH 1/3] qpdf: changed build_style to cmake.

---
 srcpkgs/qpdf/template | 45 ++++++++++++++++++-------------------------
 1 file changed, 19 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/qpdf/template b/srcpkgs/qpdf/template
index 324de5aefaa2..1a376a4ad78d 100644
--- a/srcpkgs/qpdf/template
+++ b/srcpkgs/qpdf/template
@@ -1,45 +1,38 @@
 # Template file for 'qpdf'
 pkgname=qpdf
-version=10.6.3
+version=10.6.3.0cmake1
 revision=1
 wrksrc="qpdf-release-qpdf-${version}"
-build_style=gnu-configure
-hostmakedepends="perl gettext tar"
-makedepends="pcre-devel libjpeg-turbo-devel"
+build_style=cmake
+hostmakedepends="perl"
+makedepends="zlib-devel libjpeg-turbo-devel"
 short_desc="Content-Preserving PDF Transformation System"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/qpdf/qpdf"
 changelog="https://raw.githubusercontent.com/qpdf/qpdf/stable/manual/release-notes.rst"
 distfiles="${homepage}/archive/release-qpdf-${version}.tar.gz"
-checksum=64bbb654ec19b6812284ef1bc40c57b091de5281f265f1c3c83dd8ccf6bedcf5
+checksum=729112f37d5eb53060cc8f5c4346e814670f147cb8498d47d010415754ce8087
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-	LDFLAGS+=" -latomic"
+        makedepends+=" libatomic-devel"
+        LDFLAGS+=" -latomic"
 fi
 
-do_check() {
-	# libtsdc++ throws an exception on musl if std::locale("") is used, since
-	# its generic locale implementation only supports the C locale.
-	# by forcing LANG=C, no exception is thrown and the test suite can run to completion
-	LANG=C make check
-}
-
 libqpdf_package() {
-	short_desc+=" - shared library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-	}
+        short_desc+=" - shared library"
+        pkg_install() {
+                vmove "usr/lib/*.so.*"
+        }
 }
 
 libqpdf-devel_package() {
-	depends="libqpdf>=${version}_${revision} libjpeg-turbo zlib-devel"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
+        depends="libqpdf>=${version}_${revision} libjpeg-turbo zlib-devel"
+        short_desc+=" - development files"
+        pkg_install() {
+                vmove usr/include
+                vmove usr/lib/pkgconfig
+                vmove "usr/lib/*.a"
+                vmove "usr/lib/*.so"
+        }
 }

From 334f7d4c16d9f91a763af5eec37efbc1b209dd2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 25 Mar 2022 13:06:18 +0100
Subject: [PATCH 2/3] added pkg-config to hostmakedepends

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

diff --git a/srcpkgs/qpdf/template b/srcpkgs/qpdf/template
index 1a376a4ad78d..0b8b4d806984 100644
--- a/srcpkgs/qpdf/template
+++ b/srcpkgs/qpdf/template
@@ -4,7 +4,7 @@ version=10.6.3.0cmake1
 revision=1
 wrksrc="qpdf-release-qpdf-${version}"
 build_style=cmake
-hostmakedepends="perl"
+hostmakedepends="perl pkg-config"
 makedepends="zlib-devel libjpeg-turbo-devel"
 short_desc="Content-Preserving PDF Transformation System"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"

From 8d3fb39a2d9dd326b23ec2007d9424c4cc80159f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sat, 26 Mar 2022 23:06:12 +0100
Subject: [PATCH 3/3] fixed indentation, add configure_args if CROSSBUILD

---
 srcpkgs/qpdf/template | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/qpdf/template b/srcpkgs/qpdf/template
index 0b8b4d806984..537e5333d203 100644
--- a/srcpkgs/qpdf/template
+++ b/srcpkgs/qpdf/template
@@ -15,24 +15,28 @@ distfiles="${homepage}/archive/release-qpdf-${version}.tar.gz"
 checksum=729112f37d5eb53060cc8f5c4346e814670f147cb8498d47d010415754ce8087
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-        makedepends+=" libatomic-devel"
-        LDFLAGS+=" -latomic"
+	makedepends+=" libatomic-devel"
+	LDFLAGS+=" -latomic"
+fi
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args="-DLL_FMT=%lld -DRANDOM_DEVICE=/dev/urandom"
 fi
 
 libqpdf_package() {
-        short_desc+=" - shared library"
-        pkg_install() {
-                vmove "usr/lib/*.so.*"
-        }
+	short_desc+=" - shared library"
+	pkg_install() {
+	vmove "usr/lib/*.so.*"
+	}
 }
 
 libqpdf-devel_package() {
-        depends="libqpdf>=${version}_${revision} libjpeg-turbo zlib-devel"
-        short_desc+=" - development files"
-        pkg_install() {
-                vmove usr/include
-                vmove usr/lib/pkgconfig
-                vmove "usr/lib/*.a"
-                vmove "usr/lib/*.so"
-        }
+	depends="libqpdf>=${version}_${revision} libjpeg-turbo zlib-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
 }