From e676667ad54dd1aa21fad804225c9a791fd77813 Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Fri, 12 Jan 2024 18:22:24 -0600 Subject: [PATCH] Update kf6 macros and patterns Signed-off-by: Reilly Brogan --- ypkg2/packages.py | 4 ++++ ypkg2/rc.yml | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ypkg2/packages.py b/ypkg2/packages.py index 0ee3de1..82e36b8 100644 --- a/ypkg2/packages.py +++ b/ypkg2/packages.py @@ -220,6 +220,10 @@ def __init__(self, spec): priority=PRIORITY_DEFAULT+1) self.add_pattern("/usr/share/qt5/doc/*.tags", "devel", priority=PRIORITY_DEFAULT+1) + self.add_pattern("/usr/share/doc/qt6/*.qch", "devel", + priority=PRIORITY_DEFAULT+1) + self.add_pattern("/usr/share/doc/qt6/*.tags", "devel", + priority=PRIORITY_DEFAULT+1) # This is almost always man files for api functions self.add_pattern("/usr/share/man/man3", "devel", diff --git a/ypkg2/rc.yml b/ypkg2/rc.yml index b37ca89..8c75d4b 100644 --- a/ypkg2/rc.yml +++ b/ypkg2/rc.yml @@ -26,7 +26,9 @@ actions: - cmake_kf6: | %cmake_ninja -DCMAKE_INSTALL_LIBEXECDIR_kf6:PATH=%libdir%/kf6 \ -DKDE_INSTALL_LIBEXECDIR:PATH=%libdir%/kf6 \ - -DKDE_INSTALL_USE_QT_SYS_PATHS:BOOL=ON + -DKDE_INSTALL_USE_QT_SYS_PATHS:BOOL=ON \ + -DBUILD_QCH=ON \ + -DBUILD_TESTING=OFF - meson_configure: | CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" meson setup --prefix %PREFIX% --buildtype=plain --libdir="lib%LIBSUFFIX%" --libexecdir="lib%LIBSUFFIX%/%PKGNAME%" --sysconfdir=/etc --localstatedir=/var solusBuildDir - ninja_build: &ninja_build |