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 5881915817D for ; Sun, 23 Jun 2024 17:38:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73D17E2A6C; Sun, 23 Jun 2024 17:36:57 +0000 (UTC) Received: from mail-oi1-x235.google.com (mail-oi1-x235.google.com [IPv6:2607:f8b0:4864:20::235]) (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 22352E2A5D for ; Sun, 23 Jun 2024 17:36:57 +0000 (UTC) Received: by mail-oi1-x235.google.com with SMTP id 5614622812f47-3c9cc66c649so1786015b6e.1 for ; Sun, 23 Jun 2024 10:36:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719164215; x=1719769015; 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=7IhDf6ImADmjIIgWxj/wXSK/2yfaaEr7c7elQdvh9gc=; b=aD5lnHWOAIk1LJRA2/QmXgWk6ai70Lc56lTfZIsWbRrMsZANgX5BCic2dKs99p7dUe T8I+XLAJUANa0IUK0VE9RzJscCq2PGcylunLAcV9aJxr6Lpbns1x/iQ6K1y7xvaGW6gG hHXDb+GdvMRLFoIfDP3scpgLS5YX0RkcS3+aU6EonC94Q+aenU3HKaOG5osoWp4OWAyt t9569JPB5HB+Tk3wA51Th9nU/SgVN9tpp7l8GWseCCkbWVwZziW7BNIvMRNaCt9syisL Euhljv7ewCVECgGm9jIUqGu7DNlkALeeVpq4Z9cBWrMt9hKUk2BwAttDp7c1yKb6SSwe kLtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719164215; x=1719769015; 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=7IhDf6ImADmjIIgWxj/wXSK/2yfaaEr7c7elQdvh9gc=; b=PgfOgIBlj2I9rfMkwOXaTd28lvV7f6sXlWMeHz9d9t++OAVroAo2UspQ7OQFEem0ap fw0mss9S+ojDEMJ0K+OqACosHvUJGjFn+0pvlHFD2Fc5CJtCbVgMjghM5IvbexJuG1O4 TDi5lXqylDuxfKkXyNkXAjYV2/WVcB6WC7s555A0cx7FJISQ1XYwhbtH56GzA8MlFL9Q 4iW+AB9e+yhFd9ki+jiWactw7T6+D6VDiThlv0qVpM5iwoZrsKD1ZlhscFKEM+SH1YPK JV4IWNOdzirio97Ff6qDGMsb7FdLatJ6wtOY2amINjGaPHDn1fIpE9RFsqtptbSwDryo cHxA== X-Gm-Message-State: AOJu0YxZjgGByjUPbqAHPa2yrc3nDHjqHrDs8E8U5OsGHM4tgnZeRfKQ u0vwWdx/dXDFSL+YdTjN8Ix6KekT2i+yyAYUGfxA74QS9CTJuKH3LTZD/D3S X-Google-Smtp-Source: AGHT+IE4lmwI1SLLBxIcGGR/cxHOhrYVBDciny05DgJUglM4rZa22KOYJJrqK9pRDT9M0tLwFdvCXA== X-Received: by 2002:a05:6808:d48:b0:3d5:1bd8:ab1f with SMTP id 5614622812f47-3d545987072mr3253571b6e.17.1719164214630; Sun, 23 Jun 2024 10:36:54 -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.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jun 2024 10:36:53 -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 4/5] xfce-base/libxfce4ui: prevent automagically building against gtk[wayland] Date: Sun, 23 Jun 2024 13:35:50 -0400 Message-ID: <20240623173646.3368935-5-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: 16c61dba-396d-486a-a531-bb5e79feb548 X-Archives-Hash: f62a8e8702da9445dc3db04fc7bb8637 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 libxfce4ui 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 libxfce4ui[-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. Fixed upstream in: https://gitlab.xfce.org/xfce/libxfce4ui/-/commit/967359624e408365b4c027bab66e737063af604b and hence only worked around for 4.18. Bug: https://bugs.gentoo.org/624960 Closes: https://bugs.gentoo.org/873520 Signed-off-by: Eli Schwartz --- ...e4ui-4.18.6.ebuild => libxfce4ui-4.18.6-r1.ebuild} | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) copy xfce-base/libxfce4ui/{libxfce4ui-4.18.6.ebuild => libxfce4ui-4.18.6-r1.ebuild} (82%) diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.18.6.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.18.6-r1.ebuild similarity index 82% copy from xfce-base/libxfce4ui/libxfce4ui-4.18.6.ebuild copy to xfce-base/libxfce4ui/libxfce4ui-4.18.6-r1.ebuild index bc3c10b62bdf..888730690ed9 100644 --- a/xfce-base/libxfce4ui/libxfce4ui-4.18.6.ebuild +++ b/xfce-base/libxfce4ui/libxfce4ui-4.18.6-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit xdg-utils vala +inherit flag-o-matic xdg-utils vala DESCRIPTION="Unified widget and session management libs for Xfce" HOMEPAGE=" @@ -14,13 +14,13 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" LICENSE="LGPL-2+ GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="glade +introspection startup-notification system-info vala" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="glade +introspection startup-notification system-info vala wayland" REQUIRED_USE="vala? ( introspection )" DEPEND=" >=dev-libs/glib-2.66.0 - >=x11-libs/gtk+-3.24.0:3[introspection?,X] + >=x11-libs/gtk+-3.24.0:3[introspection?,wayland?,X] x11-libs/libX11 x11-libs/libICE x11-libs/libSM @@ -47,6 +47,9 @@ BDEPEND=" " src_configure() { + # defang automagic dependencies, bug #873520 + use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND + local myconf=( $(use_enable introspection) $(use_enable system-info glibtop) -- 2.44.2