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 1027E158020 for ; Mon, 31 Oct 2022 17:32:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F11DE0C2B; Mon, 31 Oct 2022 17:32:23 +0000 (UTC) Received: from smtp.gentoo.org (dev.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3C107E0C2B for ; Mon, 31 Oct 2022 17:32:23 +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 71E3C340D8E for ; Mon, 31 Oct 2022 17:32:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D8D3962F for ; Mon, 31 Oct 2022 17:32:20 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1667237535.964a1629b70ecd13442bf87c7db23ac3b5752c17.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/, x11-misc/xscreensaver/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild x11-misc/xscreensaver/xscreensaver-6.05.ebuild X-VCS-Directories: x11-misc/xscreensaver/ x11-misc/xscreensaver/files/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 964a1629b70ecd13442bf87c7db23ac3b5752c17 X-VCS-Branch: master Date: Mon, 31 Oct 2022 17:32:20 +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: d87e7454-484f-4c15-bef1-81bd06873f7e X-Archives-Hash: 352275c582aa2d46d244b21d0144012f commit: 964a1629b70ecd13442bf87c7db23ac3b5752c17 Author: Pascal Jäger leimstift de> AuthorDate: Mon Oct 31 16:31:22 2022 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Mon Oct 31 17:32:15 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=964a1629 x11-misc/xscreensaver: revbump, get install dirs from GTK3 instead of GTK2 Closes: https://bugs.gentoo.org/878875 Signed-off-by: Pascal Jäger leimstift.de> Signed-off-by: Ulrich Müller gentoo.org> ...er-6.05-get-dirs-from-gtk3.0-in-configure.patch | 27 ++++++++++++++++++++++ ...ver-6.05.ebuild => xscreensaver-6.05-r1.ebuild} | 1 + 2 files changed, 28 insertions(+) diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch b/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch new file mode 100644 index 000000000000..c624c8046026 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch @@ -0,0 +1,27 @@ +Even though xscreensaver now uses GTK+3 instead of GTK+2 since version 6.05 +it still gets its directories from GTK+2 which results in an empty prefix +when GTK+2 is not installed. + +Bug: https://bugs.gentoo.org/878875 + +Signed-off-by: Pascal Jäger + +--- a/configure ++++ b/configure +@@ -16035,7 +16035,7 @@ printf "%s\n" "$ac_cv_gtk_config_libs" >&6; } + + GTK_DATADIR="" + if test "$have_gtk" = yes; then +- GTK_DATADIR=`$pkg_config --variable=prefix gtk+-2.0` ++ GTK_DATADIR=`$pkg_config --variable=prefix gtk+-3.0` + GTK_DATADIR="$GTK_DATADIR/share" + fi + +@@ -21440,6 +21440,6 @@ printf %s "checking for locale directory... " >&6; } + if test -n "$GTK_DATADIR" ; then + PO_DATADIR="$GTK_DATADIR" + elif test "$have_gtk" = yes; then +- PO_DATADIR=`$pkg_config --variable=prefix gtk+-2.0` ++ PO_DATADIR=`$pkg_config --variable=prefix gtk+-3.0` + PO_DATADIR="$PO_DATADIR/share" + fi diff --git a/x11-misc/xscreensaver/xscreensaver-6.05.ebuild b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild similarity index 99% rename from x11-misc/xscreensaver/xscreensaver-6.05.ebuild rename to x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild index 9a1a99c055ec..b751510dba2d 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.05.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild @@ -88,6 +88,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.03-without-gl-configure.patch "${FILESDIR}"/${PN}-6.05-remove-update-icon-cache.patch "${FILESDIR}"/${PN}-6.05-configure-exit-codes.patch + "${FILESDIR}"/${PN}-6.05-get-dirs-from-gtk3.0-in-configure.patch ) DOCS=( README{,.hacking} )