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 06CF815817D for ; Sun, 23 Jun 2024 17:37:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 17631E2A4C; Sun, 23 Jun 2024 17:36:55 +0000 (UTC) Received: from mail-qt1-x82e.google.com (mail-qt1-x82e.google.com [IPv6:2607:f8b0:4864:20::82e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D1F3CE2A49 for ; Sun, 23 Jun 2024 17:36:54 +0000 (UTC) Received: by mail-qt1-x82e.google.com with SMTP id d75a77b69052e-440581d6a50so17870861cf.0 for ; Sun, 23 Jun 2024 10:36:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719164213; x=1719769013; darn=lists.gentoo.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fYJ4w5wPpqqpl4XLGX1xSqpPuzm0oZicd/x1l3mEn4c=; b=k80mCGwrxkmB0A+hJMwEB08A7TeskVoFVQYSN0mVQbAiNhzpDyc2DcjaUxiBj+9bFz 1bKYXfgFRsjtDaLPsdSfg35Gt6NRPKbBBJbsKmzsLFvrnvTOH0/5cSFpPvd2xn4yHUq6 FHXD2e6bBPKFn2qjRKiYh+KNR/ZcrCx+kYx0RbUvFRTyoTKb9zzxxdWj/bfvCFZNUuwA fQesRZWZ781zEH+1uLQvO/kiEXplRZATM2AwBlehuQ3VTzThLALqvVL9qZj5SgcUSR45 zvkRIGUSt6+fmJ2MrgpRMi3s8ZyfimLFaRaFMVTasMowsni0N4svBn/tAqrVLPbmR2ZY Dglw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719164213; x=1719769013; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fYJ4w5wPpqqpl4XLGX1xSqpPuzm0oZicd/x1l3mEn4c=; b=rqaaeB+XjOdRMAyJUtPF9XAhbPiQcTMT3kFtWjS/WxCx3mcJ0+f8z2GmCecTfFzcA8 /CIHrZpEZI9gaJhPiBiatRvN+/PFr/y40D+IHKcpyZ5O95MsHXN4yC1KoH19pUvs/CH+ ITBYzLDFLevNRUxBI3jB7soyA3rDcIG4OK1PRbe3yKjL8y5bA1iW89SJnk8MTniPjYjK +ACbjnv/mdl0TP7ZcIoVha5buaXs5WKo9KZz75wLtkplkUbxkPlJO8l2VGD7KwX7+E9M AYi/sSjiTKv9Ua1LjW9popqR5R3mJw+kUKrhJmo+w2RPnEirxj3FPuu+bSdAmug5Vz2K K8+w== X-Gm-Message-State: AOJu0Yy1y4Ncx02oZqKpWMRbjPykXm+tQp/NJsOxItBskDCqOSGiRwVp w7sDCRPNar6Q+1CrrladTen8G/+uKL5xZNAzQT25Apuse/89roY31SpKKD40 X-Google-Smtp-Source: AGHT+IH5L+k87pKpEebqMWXMGULT63A4I/Fuqah+3CrdWRthT48QIBeiDNLjTeLI//iYR/VfX/0tSQ== X-Received: by 2002:ac8:5fcd:0:b0:440:5ce7:d6a5 with SMTP id d75a77b69052e-444d9103c5fmr30945801cf.0.1719164213024; Sun, 23 Jun 2024 10:36:53 -0700 (PDT) Received: from acleverhostname.lan ([2603:6011:3f0:69d0::12ac]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-444c2c88de3sm33620671cf.87.2024.06.23.10.36.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jun 2024 10:36:52 -0700 (PDT) From: Eli Schwartz To: gentoo-dev@lists.gentoo.org Cc: gnome@gentoo.org, xfce@gentoo.org, binhost@gentoo.org Subject: [gentoo-dev] [PATCH 3/5] x11-libs/wxGTK: prevent automagically building against gtk[X,wayland] Date: Sun, 23 Jun 2024 13:35:49 -0400 Message-ID: <20240623173646.3368935-4-eschwartz93@gmail.com> X-Mailer: git-send-email 2.44.2 In-Reply-To: <20240623173646.3368935-1-eschwartz93@gmail.com> References: <20240623173646.3368935-1-eschwartz93@gmail.com> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 68374811-b3ef-4b95-8142-5e3f29813711 X-Archives-Hash: 24a94eab3dc135d89046d1e3cc5e2fd1 The upstream code checks whether GDK_WINDOWING_WAYLAND is defined by the gtk headers, and if so will compile against the wayland symbols it provides. This despite that wxGTK has a wayland USE flag, and checks it in the build system -- just not for this. This means that when built on a system with gtk+[-wayland] will be compatible with anything, but when built on a system with gtk+[wayland], requires that at runtime regardless of USE flag. This cannot be expressed with USE flags. We could bind tightly to whether gtk was built with wayland and arbitrarily restrict wxGTK[-wayland] to only build and install on a system with gtk+[-wayland]. But we recently added a hack to gtk itself which allows hiding the automagic macros entirely. Inject this via append-cflags if the USE flags aren't set, to simulate building on a system with more minimal gtk packages. Bug: https://bugs.gentoo.org/624960 Closes: https://bugs.gentoo.org/927952 Signed-off-by: Eli Schwartz --- ...wxGTK-3.2.2.1-r4.ebuild => wxGTK-3.2.2.1-r5.ebuild} | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) copy x11-libs/wxGTK/{wxGTK-3.2.2.1-r4.ebuild => wxGTK-3.2.2.1-r5.ebuild} (95%) diff --git a/x11-libs/wxGTK/wxGTK-3.2.2.1-r4.ebuild b/x11-libs/wxGTK/wxGTK-3.2.2.1-r5.ebuild similarity index 95% copy from x11-libs/wxGTK/wxGTK-3.2.2.1-r4.ebuild copy to x11-libs/wxGTK/wxGTK-3.2.2.1-r5.ebuild index a9276d1c119a..260365bf3510 100644 --- a/x11-libs/wxGTK/wxGTK-3.2.2.1-r4.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.2.2.1-r5.ebuild @@ -20,8 +20,8 @@ S="${WORKDIR}/wxWidgets-${PV}" LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" SLOT="${WXRELEASE}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -IUSE="+X curl doc debug keyring gstreamer libnotify +lzma opengl pch sdl +spell test tiff wayland webkit" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="+X curl doc debug keyring gstreamer libnotify +lzma opengl pch sdl +spell test tiff wayland webkit X" REQUIRED_USE="test? ( tiff ) tiff? ( X ) spell? ( X ) keyring? ( X )" RESTRICT="!test? ( test )" @@ -38,7 +38,7 @@ RDEPEND=" media-libs/libpng:0=[${MULTILIB_USEDEP}] sys-libs/zlib[${MULTILIB_USEDEP}] x11-libs/cairo[${MULTILIB_USEDEP}] - x11-libs/gtk+:3[wayland?,${MULTILIB_USEDEP}] + x11-libs/gtk+:3[wayland?,X?,${MULTILIB_USEDEP}] x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] x11-libs/libSM[${MULTILIB_USEDEP}] x11-libs/libX11[${MULTILIB_USEDEP}] @@ -127,6 +127,10 @@ src_prepare() { } multilib_src_configure() { + # defang automagic dependencies, bug #927952 + use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND + use X || append-cflags -DGENTOO_GTK_HIDE_X11 + # Workaround for bug #915154 append-ldflags $(test-flags-CCLD -Wl,--undefined-version) -- 2.44.2