From 6096af9c3bf3fa2a169292626a273b40795e3469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 3 Jun 2024 07:54:02 +0700 Subject: [PATCH] libreoffice: split qt6 out of kde Some users want only qt6 not full KDE integration. --- srcpkgs/libreoffice-qt6 | 1 + srcpkgs/libreoffice/template | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) create mode 120000 srcpkgs/libreoffice-qt6 diff --git a/srcpkgs/libreoffice-qt6 b/srcpkgs/libreoffice-qt6 new file mode 120000 index 00000000000..d5e3a56f350 --- /dev/null +++ b/srcpkgs/libreoffice-qt6 @@ -0,0 +1 @@ +libreoffice \ No newline at end of file diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index bdfa954cafd..96ea62b01ea 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,7 +1,7 @@ # Template file for 'libreoffice' pkgname=libreoffice version=24.2.3.2 -revision=1 +revision=2 build_style=meta make_build_target="build" hostmakedepends="automake flex gperf hyphen icu libtool openldap which gettext xz @@ -588,15 +588,25 @@ libreoffice-impress_package() { } } +libreoffice-qt6_package() { + short_desc+=" - Qt6 integration" + pkg_install() { + cat > ${wrksrc}/file-lists/qt6_list.txt <<-EOF + %dir /usr/lib/libreoffice/program + /usr/lib/libreoffice/program/libvclplug_qt6lo.so + EOF + _split qt6 + } +} + libreoffice-kde_package() { short_desc+=" - KDE integration" - replaces="libreoffice-qt6<=24.2.2.2_2" + depends="libreoffice-qt6>=${version}_${revision}" pkg_install() { cat > ${wrksrc}/file-lists/kde_list.txt <<-EOF %dir /usr/lib/libreoffice/program %dir /usr/share/metainfo /usr/lib/libreoffice/program/libvclplug_kf6lo.so - /usr/lib/libreoffice/program/libvclplug_qt6lo.so /usr/share/metainfo/org.libreoffice.kde.metainfo.xml EOF _split kde