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 59E1D15817D for ; Sun, 23 Jun 2024 17:37:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B57A4E2A3E; Sun, 23 Jun 2024 17:36:53 +0000 (UTC) Received: from mail-oi1-x232.google.com (mail-oi1-x232.google.com [IPv6:2607:f8b0:4864:20::232]) (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 45BDDE2A39 for ; Sun, 23 Jun 2024 17:36:53 +0000 (UTC) Received: by mail-oi1-x232.google.com with SMTP id 5614622812f47-3c9d70d93dbso2469548b6e.3 for ; Sun, 23 Jun 2024 10:36:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719164212; x=1719769012; 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=jYC2kNr1V3VGIoPj44Ned3b96pic80yLomiTR2obmW8=; b=cbBvlMf9b9WuFI92EX1PoMNNjg+RQ3j5+YT0tJ7bj1/ibwGhFz5oh7V0eSDNngq/9J 9ia7OurDl2uuxaQT3jizK3DjF/fJhgu6VIFhDlILZ5LriFSL9XQlRaIyjWWKRER13UiL PT2s1pA56KOEPfA9smBBMIXHAVPCiUx7NphfGlxoUp+7Nix6X1ySPY7Fhry3Xd7T8/W7 dT+ZXjbhQlMgTElwEJdTEloKbxQ3DsgGSwAHOvs77+dpDrwC/jfLvJjcHxyEWmg16Bgk L56uw9L1Tu9UFPCxYxV0pVU1sFbGR/hMNMV+dzvjk4W/30QOIEMp8ija/uk0/uzmQMEc VlMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719164212; x=1719769012; 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=jYC2kNr1V3VGIoPj44Ned3b96pic80yLomiTR2obmW8=; b=Yap3Bxt69FXCSqGTQxNbCK5da5KmUeioSc2ZcfJx7OZ6SIEetUBfzAohtCo3p0JEKZ g58y81Ta6xrjNtTkdhxIVVQBUTJFbtcKg/+PAzzgzmtv+zJ+BcKB3TXvDVwcjghwM/3b 5xRCTkki81WkS7QiTdP5aPR9+uW4ogusjzbWk8k5radQJ+CmIhII62PqKsInmoz5H+jn dXQZlhTldAzXoLWVyIml+ydhok5dx0/FZlH7a18s9hQP8ShW5zztqTqxdt0bR9ueLIQ5 2PLfWVaW+Dfah675l4yMzRlPTSmTKTDjcYhK8Zq/AaAhviC7c0IZxZQcEc1g+bLhvZIS F8xA== X-Gm-Message-State: AOJu0YxAjo9hG0peaw347lF0ylp9TdjpMIKLFO4KIbduM4T+m/0O2m1U EqJAucn9cj/oXrhUQckaOr1jCUbnPx6naJeOX2ox9DRxcpbCCjLz4B40KYDd X-Google-Smtp-Source: AGHT+IFmc/737A+tWZslZFuKoFo4bl7CAiRxJx7/m9SGXZCAaMAJ1AY2fESEuhfJ3iK8wrEhvd7sJg== X-Received: by 2002:a05:6808:1389:b0:3d2:17c2:8301 with SMTP id 5614622812f47-3d5459cf707mr3552077b6e.30.1719164211866; Sun, 23 Jun 2024 10:36:51 -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.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jun 2024 10:36:50 -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 2/5] net-libs/gtk-vnc: prevent automagically building against gtk[X,wayland] Date: Sun, 23 Jun 2024 13:35:48 -0400 Message-ID: <20240623173646.3368935-3-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: f4991f08-9330-4270-8fdd-e70751e04515 X-Archives-Hash: ff6ab39a4e5fca0ab78a57c6280e779e e.g. 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 means that gtk-vnc 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. This cannot be expressed with USE flags. We could bind tightly to whether gtk was built with wayland (and X), and in the process, arbitrarily restrict gtk-vnc[-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/865659 Signed-off-by: Eli Schwartz --- ...{gtk-vnc-1.3.1.ebuild => gtk-vnc-1.3.1-r1.ebuild} | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) copy net-libs/gtk-vnc/{gtk-vnc-1.3.1.ebuild => gtk-vnc-1.3.1-r1.ebuild} (76%) diff --git a/net-libs/gtk-vnc/gtk-vnc-1.3.1.ebuild b/net-libs/gtk-vnc/gtk-vnc-1.3.1-r1.ebuild similarity index 76% copy from net-libs/gtk-vnc/gtk-vnc-1.3.1.ebuild copy to net-libs/gtk-vnc/gtk-vnc-1.3.1-r1.ebuild index 252a0fcc4541..3c2eb470aa1a 100644 --- a/net-libs/gtk-vnc/gtk-vnc-1.3.1.ebuild +++ b/net-libs/gtk-vnc/gtk-vnc-1.3.1-r1.ebuild @@ -5,15 +5,15 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit gnome.org vala meson python-any-r1 xdg +inherit flag-o-matic gnome.org vala meson python-any-r1 xdg DESCRIPTION="VNC viewer widget for GTK" HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc https://gitlab.gnome.org/GNOME/gtk-vnc" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86" -IUSE="+introspection pulseaudio sasl +vala" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="+introspection pulseaudio sasl +vala wayland X" REQUIRED_USE="vala? ( introspection )" RDEPEND=" @@ -23,7 +23,7 @@ RDEPEND=" >=net-libs/gnutls-3.6.0:0= >=sys-libs/zlib-1.2.11 sasl? ( >=dev-libs/cyrus-sasl-2.1.27:2 ) - >=x11-libs/gtk+-3.22.0:3[introspection?] + >=x11-libs/gtk+-3.22.0:3[introspection?,wayland?,X?] >=x11-libs/cairo-1.15.0 >=x11-libs/libX11-1.6.5 pulseaudio? ( media-libs/libpulse ) @@ -48,6 +48,10 @@ src_prepare() { } src_configure() { + # defang automagic dependencies, bug #927952 + use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND + use X || append-cflags -DGENTOO_GTK_HIDE_X11 + local emesonargs=( $(meson_feature introspection) $(meson_feature pulseaudio) -- 2.44.2