commit:     9c045f9a93ed6c742fd9306de189affdd59ec4bf
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  9 10:26:00 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jun  9 10:46:21 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c045f9a

dev-qt/qtbase: use system dev-libs/md4c in live

Not planning to make this optional, disabling entirely would be
messy given some Qt modules use QT_CONFIG(textmarkdownreader)
among similar things and they'd need [use=] deps. It is also
a very small package that isn't really worth skipping (falling
back to bundled would also make little sense).

Not doing =ON because we do -DQT_FEATURE_force_system_libs=ON
which enables all system switches unless explicitly disabled.

Bug: https://bugs.gentoo.org/957649
Bug: https://bugs.gentoo.org/957680
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qtbase/qtbase-6.10.9999.ebuild | 2 +-
 dev-qt/qtbase/qtbase-6.9.9999.ebuild  | 2 +-
 dev-qt/qtbase/qtbase-6.9999.ebuild    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtbase/qtbase-6.10.9999.ebuild 
b/dev-qt/qtbase/qtbase-6.10.9999.ebuild
index 65a6f0edda90..d61a37880e22 100644
--- a/dev-qt/qtbase/qtbase-6.10.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.10.9999.ebuild
@@ -70,6 +70,7 @@ COMMON_DEPEND="
 
        dbus? ( sys-apps/dbus )
        gui? (
+               dev-libs/md4c
                media-libs/fontconfig
                >=media-libs/freetype-2.13.1:2
                media-libs/harfbuzz:=
@@ -286,7 +287,6 @@ src_configure() {
                $(qt_feature wayland)
                $(qt_feature widgets)
                -DINPUT_opengl=$(usex opengl $(usex gles2-only es2 desktop) no)
-               -DQT_FEATURE_system_textmarkdownreader=OFF # TODO?: package md4c
        ) && use widgets && mycmakeargs+=(
                # note: qtprintsupport is enabled w/ gui+widgets regardless of 
USE=cups
                $(qt_feature cups)

diff --git a/dev-qt/qtbase/qtbase-6.9.9999.ebuild 
b/dev-qt/qtbase/qtbase-6.9.9999.ebuild
index a31452a19a01..1ff67f0d2a92 100644
--- a/dev-qt/qtbase/qtbase-6.9.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9.9999.ebuild
@@ -68,6 +68,7 @@ COMMON_DEPEND="
 
        dbus? ( sys-apps/dbus )
        gui? (
+               dev-libs/md4c
                media-libs/fontconfig
                >=media-libs/freetype-2.13.1:2
                media-libs/harfbuzz:=
@@ -279,7 +280,6 @@ src_configure() {
                $(qt_feature wayland)
                $(qt_feature widgets)
                -DINPUT_opengl=$(usex opengl $(usex gles2-only es2 desktop) no)
-               -DQT_FEATURE_system_textmarkdownreader=OFF # TODO?: package md4c
        ) && use widgets && mycmakeargs+=(
                # note: qtprintsupport is enabled w/ gui+widgets regardless of 
USE=cups
                $(qt_feature cups)

diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild 
b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 65a6f0edda90..d61a37880e22 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -70,6 +70,7 @@ COMMON_DEPEND="
 
        dbus? ( sys-apps/dbus )
        gui? (
+               dev-libs/md4c
                media-libs/fontconfig
                >=media-libs/freetype-2.13.1:2
                media-libs/harfbuzz:=
@@ -286,7 +287,6 @@ src_configure() {
                $(qt_feature wayland)
                $(qt_feature widgets)
                -DINPUT_opengl=$(usex opengl $(usex gles2-only es2 desktop) no)
-               -DQT_FEATURE_system_textmarkdownreader=OFF # TODO?: package md4c
        ) && use widgets && mycmakeargs+=(
                # note: qtprintsupport is enabled w/ gui+widgets regardless of 
USE=cups
                $(qt_feature cups)

Reply via email to