From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E026B15800F for ; Fri, 13 Jan 2023 19:08:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2895EE0827; Fri, 13 Jan 2023 19:08:28 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 073F3E0827 for ; Fri, 13 Jan 2023 19:08:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E9238340F13 for ; Fri, 13 Jan 2023 19:08:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 84F437FA for ; Fri, 13 Jan 2023 19:08:25 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1673636886.c530f3090fb695e76a9f0376c0597418523d70e4.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/files/libreoffice-7.4.4.2-zxing-cpp-1.4.0-c++17.patch app-office/libreoffice/libreoffice-7.4.4.2.ebuild X-VCS-Directories: app-office/libreoffice/ app-office/libreoffice/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c530f3090fb695e76a9f0376c0597418523d70e4 X-VCS-Branch: master Date: Fri, 13 Jan 2023 19:08:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 61a4a1bb-a673-4b91-92e8-c223962a6dab X-Archives-Hash: bffda88d40bc6e06e629e503d5d07896 commit: c530f3090fb695e76a9f0376c0597418523d70e4 Author: Sam James gentoo org> AuthorDate: Fri Jan 13 19:07:13 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jan 13 19:08:06 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c530f309 app-office/libreoffice: fix build w/ USE=clang & clang <16 Closes: https://bugs.gentoo.org/890324 Signed-off-by: Sam James gentoo.org> ...libreoffice-7.4.4.2-zxing-cpp-1.4.0-c++17.patch | 36 ++++++++++++++++++++++ app-office/libreoffice/libreoffice-7.4.4.2.ebuild | 1 + 2 files changed, 37 insertions(+) diff --git a/app-office/libreoffice/files/libreoffice-7.4.4.2-zxing-cpp-1.4.0-c++17.patch b/app-office/libreoffice/files/libreoffice-7.4.4.2-zxing-cpp-1.4.0-c++17.patch new file mode 100644 index 000000000000..0c47a14fe308 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-7.4.4.2-zxing-cpp-1.4.0-c++17.patch @@ -0,0 +1,36 @@ +https://gerrit.libreoffice.org/c/core/+/145479 + +From a7a6b436f1a83321ccba5b6b44a275205aa729e0 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Fri, 13 Jan 2023 15:09:59 +0000 +Subject: [PATCH] configure.ac: Fix build with --with-system-zxing and < Clang + 16 + +Clang 15 and older default to -std=c++14, not -std=c++17 (unlike Clang 16 onwards). + +This doesn't show up with GCC because GCC 11 onwards defaults to -std=c++17. + +The new version of libzxing requires C++ 17, per its release notes. Adapt +the configure check accordingly to pass -std=c++17 when checking for its +headers and save accordingly if successful. + +(Do this via ${CXXFLAGS_CXX11} which has the appropriate switch +for our compiler, despite its name.) + +Bug: https://bugs.gentoo.org/890324 +Change-Id: Iaaa8fdc05eea0e26416b605bfda8f2d831f8729c +Signed-off-by: Sam James +--- a/configure.ac ++++ b/configure.ac +@@ -11187,7 +11187,7 @@ else + continue + fi + dnl TODO: White space in $i would cause problems: +- CXXFLAGS="$save_CXXFLAGS -I$i/ZXing" ++ CXXFLAGS="$save_CXXFLAGS ${CXXFLAGS_CXX11} -I$i/ZXing" + AC_CHECK_HEADER(MultiFormatWriter.h, [ZXING_CFLAGS=-I$i/ZXing; break], + [unset ac_cv_header_MultiFormatWriter_h], [#include ]) + done +-- +2.39.0 + diff --git a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild index 1c1165c55a5f..7ce3b1b6b9f2 100644 --- a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild +++ b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild @@ -297,6 +297,7 @@ PATCHES=( # 7.5 branch "${FILESDIR}/${PN}-7.3.7.2-boost-1.81-locale.patch" "${FILESDIR}/${PN}-7.3.7.2-zxing-cpp-1.4.0.patch" + "${FILESDIR}/${PN}-7.4.4.2-zxing-cpp-1.4.0-c++17.patch" ) S="${WORKDIR}/${PN}-${MY_PV}"