public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/pdfpc/
Date: Thu, 19 Jun 2025 20:48:02 +0000 (UTC)	[thread overview]
Message-ID: <1750366077.faa39a4baa5d739cc20626fd0d97f5a6be5f4ac9.ulm@gentoo> (raw)

commit:     faa39a4baa5d739cc20626fd0d97f5a6be5f4ac9
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 19 20:37:06 2025 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 19 20:47:57 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faa39a4b

app-text/pdfpc: Revert to unconditional X11 support

There seems to be no easy way to make X11 support conditional on the
X flag. Therefore drop X from IUSE but keep conditional wayland support.

This needs proper support by the upstream build system.

Closes: https://bugs.gentoo.org/958395
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-text/pdfpc/{pdfpc-4.7.0-r1.ebuild => pdfpc-4.7.0-r2.ebuild} | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/app-text/pdfpc/pdfpc-4.7.0-r1.ebuild b/app-text/pdfpc/pdfpc-4.7.0-r2.ebuild
similarity index 86%
rename from app-text/pdfpc/pdfpc-4.7.0-r1.ebuild
rename to app-text/pdfpc/pdfpc-4.7.0-r2.ebuild
index 53474c8a0f61..38452bae00dc 100644
--- a/app-text/pdfpc/pdfpc-4.7.0-r1.ebuild
+++ b/app-text/pdfpc/pdfpc-4.7.0-r2.ebuild
@@ -25,7 +25,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="X +gstreamer soup wayland webkit"
+IUSE="+gstreamer soup wayland webkit"
 
 RDEPEND="
 	app-text/discount:=
@@ -36,10 +36,9 @@ RDEPEND="
 	gnome-base/librsvg
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X,wayland?]
 	x11-libs/libX11
 	x11-libs/pango
-	x11-libs/gtk+:3[X?,wayland?]
-	!X? ( !wayland? ( x11-libs/gtk+:3[X] ) )
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
@@ -67,10 +66,6 @@ src_prepare() {
 	if ! use wayland; then  #958395
 		sed -i -e 's/GDK_WINDOWING_WAYLAND/GdK_nO_wAyLaNd/' \
 			src/display_backend.c || die
-		use X || ewarn 'Neither "X" nor "wayland" USE flag set - enabling X11'
-	elif ! use X; then
-		sed -i -e 's/GDK_WINDOWING_X11/GdK_nO_xElEvEn/' \
-			src/display_backend.c || die
 	fi
 
 	cmake_src_prepare


             reply	other threads:[~2025-06-19 20:48 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-06-19 20:48 Ulrich Müller [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-08-09 21:20 [gentoo-commits] repo/gentoo:master commit in: app-text/pdfpc/ Sam James
2025-06-19 17:29 Ulrich Müller
2025-06-19 16:41 Ulrich Müller
2025-06-19 12:20 Ulrich Müller
2025-06-19 11:17 Ulrich Müller
2025-06-18 21:38 Ulrich Müller
2025-02-12  8:21 Sam James
2025-02-12  8:21 Sam James
2025-01-12 18:27 Ulrich Müller
2023-11-02 18:49 Ulrich Müller
2023-11-02 18:16 Arthur Zamarin
2023-11-02  4:12 Sam James

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1750366077.faa39a4baa5d739cc20626fd0d97f5a6be5f4ac9.ulm@gentoo \
    --to=ulm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox