mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-08 00:05:33 +03:00
media-gfx/pqiv: defang X11 automagic
Relevant imports appear to be remains of long-fixed bug[1][2], package works on xwayland perfectly even with this patch and USE=-X, or with GDK_BACKEND=wayland set [1]4355bc2827[2]afcdb6fb00Remove passing environmental variables to Make - configure picks up CFLAGS automatically and passes them to build system, and Makefile respects CPPFLAGS Bug: https://bugs.gentoo.org/957685 Signed-off-by: NHOrus <jy6x2b32pie9@yahoo.com> Part-of: https://github.com/gentoo/gentoo/pull/44739 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
parent
47a73a9de1
commit
ccefbde8ba
@ -1,9 +1,9 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit edo linux-info toolchain-funcs xdg
|
||||
inherit edo flag-o-matic linux-info toolchain-funcs xdg
|
||||
|
||||
DESCRIPTION="A powerful GTK 3 based command-line image viewer with a minimal UI"
|
||||
HOMEPAGE="https://github.com/phillipberndt/pqiv https://www.pberndt.com/Programme/Linux/pqiv/"
|
||||
@ -12,14 +12,15 @@ SRC_URI="https://github.com/phillipberndt/pqiv/archive/${PV}.tar.gz -> ${P}.tar.
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~arm arm64 ~riscv x86"
|
||||
IUSE="archive ffmpeg imagemagick pdf postscript webp"
|
||||
IUSE="archive ffmpeg imagemagick pdf postscript webp X"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-libs/glib-2.32:2
|
||||
>=x11-libs/cairo-1.6
|
||||
>=x11-libs/gdk-pixbuf-2.2:2
|
||||
x11-libs/gtk+:3
|
||||
x11-libs/gtk+:3[X?]
|
||||
>=x11-libs/pango-1.10
|
||||
X? ( x11-libs/libX11 )
|
||||
archive? ( app-arch/libarchive:0= )
|
||||
ffmpeg? ( media-video/ffmpeg:0= )
|
||||
imagemagick? ( media-gfx/imagemagick:0= )
|
||||
@ -38,15 +39,16 @@ pkg_setup() {
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
use X || append-cppflags -DGENTOO_GTK_HIDE_X11
|
||||
local backends=(
|
||||
"gdkpixbuf"
|
||||
$(usex archive "archive" "")
|
||||
$(usex archive "archive_cbx" "")
|
||||
$(usex ffmpeg "libav" "")
|
||||
$(usex imagemagick "wand" "")
|
||||
$(usex pdf "poppler" "")
|
||||
$(usex postscript "spectre" "")
|
||||
$(usex webp "webp" "")
|
||||
$(usev archive "archive")
|
||||
$(usev archive "archive_cbx")
|
||||
$(usev ffmpeg "libav")
|
||||
$(usev imagemagick "wand")
|
||||
$(usev pdf "poppler")
|
||||
$(usev postscript "spectre")
|
||||
$(usev webp "webp")
|
||||
)
|
||||
local myconf=(
|
||||
--backends-build=shared
|
||||
@ -59,5 +61,5 @@ src_configure() {
|
||||
|
||||
src_compile() {
|
||||
tc-export CC
|
||||
emake VERBOSE=1 CFLAGS="${CFLAGS}"
|
||||
emake VERBOSE=1
|
||||
}
|
||||
|
||||
@ -12,13 +12,13 @@ SRC_URI="https://github.com/phillipberndt/pqiv/archive/${PV}.tar.gz -> ${P}.tar.
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
|
||||
IUSE="archive ffmpeg imagemagick pdf postscript webp"
|
||||
IUSE="archive ffmpeg imagemagick pdf postscript webp X"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-libs/glib-2.32:2
|
||||
>=x11-libs/cairo-1.6
|
||||
>=x11-libs/gdk-pixbuf-2.2:2
|
||||
x11-libs/gtk+:3
|
||||
x11-libs/gtk+:3[X?]
|
||||
>=x11-libs/pango-1.10
|
||||
X? ( x11-libs/libX11 )
|
||||
archive? ( app-arch/libarchive:0= )
|
||||
@ -41,6 +41,7 @@ pkg_setup() {
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
use X || append-cppflags -DGENTOO_GTK_HIDE_X11
|
||||
local backends=(
|
||||
"gdkpixbuf"
|
||||
$(usev archive "archive")
|
||||
@ -62,5 +63,5 @@ src_configure() {
|
||||
|
||||
src_compile() {
|
||||
tc-export CC
|
||||
emake VERBOSE=1 CFLAGS="${CFLAGS}"
|
||||
emake VERBOSE=1
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user