From bdfda0111659c37a8fb66a1b4c8e87f5bd01454d Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Mon, 10 Aug 2026 00:18:17 -0400 Subject: [PATCH] app-office/scribus: fix broken automagic dep new in 1.7.3 iwdevtools notes that libjxl is a new automagic dep. The binhost builders also scream that libjxl is littering preserved-libs due to scribus, meaning we actively ship broken binaries. Fixes: a5e39bfd17c58679cfe33a92def98cb53ddbc95f Signed-off-by: Eli Schwartz --- .../scribus/{scribus-1.7.3.ebuild => scribus-1.7.3-r1.ebuild} | 4 +++- app-office/scribus/scribus-9999.ebuild | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) rename app-office/scribus/{scribus-1.7.3.ebuild => scribus-1.7.3-r1.ebuild} (95%) diff --git a/app-office/scribus/scribus-1.7.3.ebuild b/app-office/scribus/scribus-1.7.3-r1.ebuild similarity index 95% rename from app-office/scribus/scribus-1.7.3.ebuild rename to app-office/scribus/scribus-1.7.3-r1.ebuild index c5adfe8ed3647..483068b3ef3a2 100644 --- a/app-office/scribus/scribus-1.7.3.ebuild +++ b/app-office/scribus/scribus-1.7.3-r1.ebuild @@ -24,7 +24,7 @@ fi LICENSE="GPL-2" SLOT="$(ver_cut 1-2)" -IUSE="+boost debug examples graphicsmagick +minimal osg +pdf scripts +templates tk" +IUSE="+boost debug examples graphicsmagick +jpegxl +minimal osg +pdf scripts +templates tk" REQUIRED_USE="${PYTHON_REQUIRED_USE} tk? ( scripts )" @@ -61,6 +61,7 @@ DEPEND="${PYTHON_DEPS} x11-libs/libxcb boost? ( dev-libs/boost:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) + jpegxl? ( >=media-libs/libjxl-0.11.2:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( @@ -112,6 +113,7 @@ src_configure() { -DWANT_NOOSG=$(usex !osg) -DWITH_PODOFO=$(usex pdf) -DWANT_NOTEMPLATES=$(usex !templates) + $(cmake_use_find_package jpegxl JXL) ) cmake_src_configure } diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild index e3b42449be30e..91d051c5520c1 100644 --- a/app-office/scribus/scribus-9999.ebuild +++ b/app-office/scribus/scribus-9999.ebuild @@ -24,7 +24,7 @@ fi LICENSE="GPL-2" SLOT="$(ver_cut 1-2)" -IUSE="+boost debug examples graphicsmagick +minimal osg +pdf scripts +templates tk" +IUSE="+boost debug examples graphicsmagick +jpegxl +minimal osg +pdf scripts +templates tk" REQUIRED_USE="${PYTHON_REQUIRED_USE} tk? ( scripts )" @@ -61,6 +61,7 @@ DEPEND="${PYTHON_DEPS} x11-libs/libxcb boost? ( dev-libs/boost:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) + jpegxl? ( >=media-libs/libjxl-0.11.2:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( @@ -111,6 +112,7 @@ src_configure() { -DWANT_NOOSG=$(usex !osg) -DWITH_PODOFO=$(usex pdf) -DWANT_NOTEMPLATES=$(usex !templates) + $(cmake_use_find_package jpegxl JXL) ) cmake_src_configure }