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 6D00615802F for ; Sun, 2 Apr 2023 19:57:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 95D5DE0825; Sun, 2 Apr 2023 19:57:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 81E37E0825 for ; Sun, 2 Apr 2023 19:57:55 +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 A9FD3340D09 for ; Sun, 2 Apr 2023 19:57:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C88408E4 for ; Sun, 2 Apr 2023 19:57:52 +0000 (UTC) From: "Arsen Arsenović" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arsen Arsenović" Message-ID: <1680465433.23a6d260ee7a72fc42d36d6311a137fa3c55bcdc.arsen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/wxGTK/, x11-libs/wxGTK/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/wxGTK/files/wxGTK-3.2.2.1-dont-break-flags.patch x11-libs/wxGTK/wxGTK-3.2.2.1-r1.ebuild X-VCS-Directories: x11-libs/wxGTK/files/ x11-libs/wxGTK/ X-VCS-Committer: arsen X-VCS-Committer-Name: Arsen Arsenović X-VCS-Revision: 23a6d260ee7a72fc42d36d6311a137fa3c55bcdc X-VCS-Branch: master Date: Sun, 2 Apr 2023 19:57:52 +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: 80d602eb-de11-410e-bd05-cccf9f5e27ba X-Archives-Hash: 6d4fe2293a10ab64b82fd2a2ac09167a commit: 23a6d260ee7a72fc42d36d6311a137fa3c55bcdc Author: Arsen Arsenović gentoo org> AuthorDate: Sun Apr 2 11:34:00 2023 +0000 Commit: Arsen Arsenović gentoo org> CommitDate: Sun Apr 2 19:57:13 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23a6d260 x11-libs/wxGTK: Remove broken flag deduplication logic in 3.2.2.1 Closes: https://bugs.gentoo.org/903668 Signed-off-by: Arsen Arsenović gentoo.org> .../files/wxGTK-3.2.2.1-dont-break-flags.patch | 48 ++++++++++++++++++++++ x11-libs/wxGTK/wxGTK-3.2.2.1-r1.ebuild | 1 + 2 files changed, 49 insertions(+) diff --git a/x11-libs/wxGTK/files/wxGTK-3.2.2.1-dont-break-flags.patch b/x11-libs/wxGTK/files/wxGTK-3.2.2.1-dont-break-flags.patch new file mode 100644 index 000000000000..db351b29d648 --- /dev/null +++ b/x11-libs/wxGTK/files/wxGTK-3.2.2.1-dont-break-flags.patch @@ -0,0 +1,48 @@ +From f092f50b794b487e552e930b11d165a736fc8edb Mon Sep 17 00:00:00 2001 +From: Arsen Arsenović +Date: Sun, 2 Apr 2023 13:25:11 +0200 +Subject: [PATCH] configure: Remove flag deduplication logic + +Parsing compiler flags is a complex task that this function screws up. + +Bug: https://bugs.gentoo.org/903668 +--- + configure | 5 ++--- + configure.in | 5 ++--- + 2 files changed, 4 insertions(+), 6 deletions(-) + +diff --git a/configure b/configure +index a476a3c..a9b815b 100755 +--- a/configure ++++ b/configure +@@ -45550,9 +45550,8 @@ esac + + dedup_flags() + { +- printf "%s " "$@" | +- awk 'BEGIN { RS=" "; ORS=" " } +- { if ($0=="-arch" || $0=="-framework" || !seen[$0]++) print }' ++ # Gentoo: Don't hack out flags, parsing them is complex. ++ printf '%s ' "$@" + } + + WX_CPPFLAGS=`dedup_flags "$CPPFLAGS"` +diff --git a/configure.in b/configure.in +index a4c4178..9cf9c30 100644 +--- a/configure.in ++++ b/configure.in +@@ -8570,9 +8570,8 @@ dnl flags which are explicitly allowed to occur multiple times, as all their + dnl occurrences must be preserved). + dedup_flags() + { +- printf "%s " "$@" | +- awk 'BEGIN { RS=" "; ORS=" " } +- { if ($0=="-arch" || $0=="-framework" || !seen[[$0]]++) print }' ++ # Gentoo: Don't hack out flags, parsing them is complex. ++ printf '%s ' "$@" + } + + WX_CPPFLAGS=`dedup_flags "$CPPFLAGS"` +-- +2.40.0 + diff --git a/x11-libs/wxGTK/wxGTK-3.2.2.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-3.2.2.1-r1.ebuild index 8071c1a865b4..7a0988e01d87 100644 --- a/x11-libs/wxGTK/wxGTK-3.2.2.1-r1.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.2.2.1-r1.ebuild @@ -83,6 +83,7 @@ PATCHES=( "${FILESDIR}/${PN}-3.2.1-configure-tests.patch" "${FILESDIR}/${PN}-3.2.1-wayland-control.patch" "${FILESDIR}/${PN}-3.2.1-prefer-lib64-in-tests.patch" + "${FILESDIR}/${PN}-3.2.2.1-dont-break-flags.patch" ) src_prepare() {