commit: 24c483b135142e7e9a75006afe4d89ad7d5dd865 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Nov 9 16:17:04 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Nov 9 17:08:39 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24c483b1
sys-libs/gwenhywfar: Fix Qt6 detection w/ dev-qt/qtchooser installed Thanks-to: Moritz Bechler <mbechler <AT> eenterphace.org> Closes: https://bugs.gentoo.org/961547 Closes: https://bugs.gentoo.org/965843 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/gwenhywfar-5.12.1-fix-qt6-detect.patch | 12 ++++ sys-libs/gwenhywfar/gwenhywfar-5.12.1-r2.ebuild | 76 ++++++++++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/sys-libs/gwenhywfar/files/gwenhywfar-5.12.1-fix-qt6-detect.patch b/sys-libs/gwenhywfar/files/gwenhywfar-5.12.1-fix-qt6-detect.patch new file mode 100644 index 000000000000..2450d10afe79 --- /dev/null +++ b/sys-libs/gwenhywfar/files/gwenhywfar-5.12.1-fix-qt6-detect.patch @@ -0,0 +1,12 @@ +Gentoo-bug: https://bugs.gentoo.org/965843 + +--- a/m4/ax_have_qt.m4 ++++ b/m4/ax_have_qt.m4 +@@ -146,7 +146,7 @@ + if test "$ver" = "2.0"; then + # Add QT_HOST_BINS and QT_HOST_LIBEXECS paths to PATH + for var in QT_HOST_BINS QT_HOST_LIBEXECS; do +- PATH=$PATH:`$QTPATHS --query $var` ++ PATH=`$QTPATHS --query $var`:$PATH + done + fi diff --git a/sys-libs/gwenhywfar/gwenhywfar-5.12.1-r2.ebuild b/sys-libs/gwenhywfar/gwenhywfar-5.12.1-r2.ebuild new file mode 100644 index 000000000000..89a78b7b20e6 --- /dev/null +++ b/sys-libs/gwenhywfar/gwenhywfar-5.12.1-r2.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools qmake-utils + +DESCRIPTION="Multi-platform helper library for other libraries" +HOMEPAGE="https://www.aquamaniac.de/"; +SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/533/${P}.tar.gz"; + +LICENSE="LGPL-2.1" +SLOT="0/79" # correspond with libgwenhywfar.so version +KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" +IUSE="debug gtk qt6 test" # doc (is broken, bug #950614 + +# broken upstream, reported but got no reply +RESTRICT="test" + +RDEPEND=" + dev-libs/libgcrypt:0= + dev-libs/libgpg-error + dev-libs/libxml2:2= + dev-libs/openssl:0= + net-libs/gnutls:= + virtual/libiconv + virtual/libintl + gtk? ( x11-libs/gtk+:3 ) + qt6? ( + dev-qt/qtbase:6[concurrent,dbus,gui,network,opengl,sql,widgets,xml] + virtual/opengl + ) +" +DEPEND="${RDEPEND} + sys-apps/which" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig +" +# doc? ( app-text/doxygen ) + +PATCHES=( "${FILESDIR}/${P}-fix-qt6-detect.patch" ) # bug 965843, downstream workaround + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + --with-docpath="${EPREFIX}/usr/share/doc/${PF}/apidoc" + --with-libxml2-code=yes + $(use_enable debug) + #$(use_enable doc full-doc) + ) + use qt6 && myeconfargs+=( + --with-qmake="$(qt6_get_bindir)/qmake" + ) + + local guis=() + use gtk && guis+=( gtk3 ) + use qt6 && guis+=( qt5 ) # yes. qt5. + QTPATHS="$(qt6_get_bindir)/qtpaths" \ + econf "${myeconfargs[@]}" "--with-guis=${guis[*]}" +} + +src_compile() { + emake + #use doc && emake srcdoc +} + +src_install() { + default + #use doc && emake DESTDIR="${D}" install-srcdoc + find "${D}" -name '*.la' -type f -delete || die +}
