Re: [PR PATCH] [Updated] libreoffice: fix build with gpgme 2.18

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

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

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

https://github.com/oreo639/void-packages libreoffice
https://github.com/void-linux/void-packages/pull/40035

libreoffice: fix build with gpgme 2.18
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

The clucene build failure was fixed by: https://github.com/void-linux/void-packages/commit/5aeb4c0ce0d27cfead4bcc9982cb249a48d48bf2

<!--
#### 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/40035.patch is attached

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

From 47309e8d01740b09f0dd809d5679384a8d49b2e2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 19 Oct 2022 00:53:56 -0700
Subject: [PATCH 1/2] libreoffice: fix build with gpgme 2.18

---
 .../libreoffice/patches/gpgme-2.18.0.patch    | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 srcpkgs/libreoffice/patches/gpgme-2.18.0.patch

diff --git a/srcpkgs/libreoffice/patches/gpgme-2.18.0.patch b/srcpkgs/libreoffice/patches/gpgme-2.18.0.patch
new file mode 100644
index 000000000000..caf71d8fbd75
--- /dev/null
+++ b/srcpkgs/libreoffice/patches/gpgme-2.18.0.patch
@@ -0,0 +1,47 @@
+From f7e170eb084cd4e92818de966b287330184749a8 Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene@debian.org>
+Date: Wed, 24 Aug 2022 09:55:33 +0200
+Subject: [PATCH] Make configure work with gpgme >= 1.18
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Sam James wrote:
+> gpgme-1.18.0 dropped a bunch of internal symbols,
+> including progress_callback (see e.g. callbacks.h
+> which has a comment at the top saying it's internal).
+
+Plausibly the workaround to not link against older KDE-specific distro
+packages is not needed anymore.
+
+Check for main as a workaround as we do for other C++ libraries, too.
+
+Change-Id: I57065a5b5b23b9eadb73b01e4f3a289552c3bde4
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138667
+Tested-by: Jenkins
+Reviewed-by: Sam James <sam@gentoo.org>
+Reviewed-by: René Engelhard <rene@debian.org>
+---
+ configure.ac | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 24cb01aa0db02..61806988b94b7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -12539,12 +12539,11 @@ elif test \( \( "$_os" = "Linux" -o "$_os" = "Darwin" \) -a "$ENABLE_NSS" = TRUE
+         # C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way
+         AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [ GPGMEPP_CFLAGS=-I/usr/include/gpgme++ ],
+             [AC_MSG_ERROR([gpgmepp headers not found, install gpgmepp >= 1.14 development package])], [])
+-        # progress_callback is the only func with plain C linkage
+-        # checking for it also filters out older, KDE-dependent libgpgmepp versions
+-        AC_CHECK_LIB(gpgmepp, progress_callback, [ GPGMEPP_LIBS=-lgpgmepp ],
+-            [AC_MSG_ERROR(gpgmepp not found or not functional)], [])
+         AC_CHECK_HEADER(gpgme.h, [],
+             [AC_MSG_ERROR([gpgme headers not found, install gpgme development package])], [])
++        AC_CHECK_LIB(gpgmepp, main, [],
++            [AC_MSG_ERROR(gpgmepp not found or not functional)], [])
++	GPGMEPP_LIBS=-lgpgmepp
+     else
+         AC_MSG_RESULT([internal])
+         BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP"

From e471a4badf39adc45bdbd95f35992f1d72e2bf5b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 19 Oct 2022 02:09:09 -0700
Subject: [PATCH 2/2] amdvlk: fix build with gcc12

---
 .../amdvlk/patches/pal-missing-time-include.patch    | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/amdvlk/patches/pal-missing-time-include.patch

diff --git a/srcpkgs/amdvlk/patches/pal-missing-time-include.patch b/srcpkgs/amdvlk/patches/pal-missing-time-include.patch
new file mode 100644
index 000000000000..eb45353fe253
--- /dev/null
+++ b/srcpkgs/amdvlk/patches/pal-missing-time-include.patch
@@ -0,0 +1,12 @@
+diff --git a/pal/src/util/lnx/lnxUuid.cpp b/pal/src/util/lnx/lnxUuid.cpp
+index 603db2a7..56c5d1f4 100644
+--- a/pal/src/util/lnx/lnxUuid.cpp
++++ b/pal/src/util/lnx/lnxUuid.cpp
+@@ -29,6 +29,7 @@
+ #include "util/imported/libuuid/libuuid.h"
+ 
+ #include <random>
++#include <time.h>
+ #include <unistd.h>
+ 
+ namespace Util