From e10a3e5f5f0b30c245ef0a41ec7af114112a6870 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 16 May 2024 14:48:29 +0700
Subject: [PATCH] libreoffice: update to 24.2.3.2.

---
 srcpkgs/libreoffice-qt6      |  1 -
 srcpkgs/libreoffice/template | 46 +++++++++++++-----------------------
 2 files changed, 17 insertions(+), 30 deletions(-)
 delete mode 120000 srcpkgs/libreoffice-qt6

diff --git a/srcpkgs/libreoffice-qt6 b/srcpkgs/libreoffice-qt6
deleted file mode 120000
index d5e3a56f350..00000000000
--- a/srcpkgs/libreoffice-qt6
+++ /dev/null
@@ -1 +0,0 @@
-libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 32937e7e778..bdfa954cafd 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,14 +1,15 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
-version=24.2.2.2
-revision=2
+version=24.2.3.2
+revision=1
 build_style=meta
 make_build_target="build"
 hostmakedepends="automake flex gperf hyphen icu libtool openldap which gettext xz
- tar perl-Archive-Zip pkg-config qt5-qmake sane unzip zip python3-setuptools
+ tar perl-Archive-Zip pkg-config sane unzip zip python3-setuptools
  fontforge python3-lxml qt6-base gtk4-devel gobject-introspection gnupg"
 makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
- frameworkintegration-devel glyphy-devel gpgmepp-devel gst-plugins-base1-devel
+ kf6-kio-devel
+ kf6-frameworkintegration-devel glyphy-devel gpgmepp-devel gst-plugins-base1-devel
  gtk+3-devel gtk4-devel hunspell-devel hyphen-devel libXt-devel libabw-devel glm
  libatomic_ops-devel libbluetooth-devel libcdr-devel libe-book-devel
  libepubgen-devel libetonyek-devel libexttextcat-devel libfbclient3-devel
@@ -18,7 +19,7 @@ makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
  liborcus-devel libargon2-devel zxcvbn-c-devel libzmf-devel
  libpagemaker-devel libqxp-devel librsvg-devel libvisio-devel libwpg-devel
  libwps-devel lpsolve-devel mdds mythes-devel neon-devel nss-devel nspr-devel
- postgresql-libs-devel python3-devel qt5-devel redland-devel sane-devel
+ postgresql-libs-devel python3-devel redland-devel sane-devel
  telepathy-glib-devel unixodbc-devel vigra-devel libcppunit-devel imath-devel
  qt6-base-devel libwebp-devel libgirepository-devel icu-devel twaindsm-devel
  libepoxy-devel libcurl-devel cairo-devel graphite-devel libjpeg-turbo-devel
@@ -96,9 +97,9 @@ distfiles="
  ${_addurl}/Java-WebSocket-1.5.4.tar.gz
  ${_addurl}/zxcvbn-c-2.5.tar.gz
 "
-checksum="c205a65042f65c94b54ea310344b851043633c3eb5259f4e567d9341aae5e45e
- e4ca31ec501c3c59e6c7aa4cc1279185675b088b2d042f17a7e6b0a8304ce025
- 925016b4172c1dcfb2774cdb0376df949241e369375399b9875b154e65f319b2
+checksum="f6e2059cd85d07793e8d95828b2412906bdba8bf61a5f76b8c51907898481e64
+ 8e8acf4c09e2a43e8a86a19418bade97f67b837917bd0c2c6af9c8a8b261bb6b
+ e71053a3b51f79079ef745663e68432c2bf20e49557083ab4de1a40c9fae2b4a
  1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
  75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
  7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66
@@ -424,10 +425,10 @@ do_configure() {
 	opts+=" --enable-gtk3"
 	opts+=" --enable-introspection"
 	opts+=" --enable-gtk4"
-	opts+=" --enable-qt5"
+	# opts+=" --enable-qt5"
 	opts+=" --enable-qt6"
-	opts+=" --enable-kf5"
-	opts+=" --enable-gtk3-kde5"
+	opts+=" --enable-kf6"
+	# opts+=" --enable-gtk3-kde5"
 	opts+=" --disable-dependency-tracking"
 	opts+=" --enable-release-build"
 	opts+=" --enable-split-app-modules"
@@ -589,29 +590,16 @@ libreoffice-impress_package() {
 
 libreoffice-kde_package() {
 	short_desc+=" - KDE integration"
+	replaces="libreoffice-qt6<=24.2.2.2_2"
 	pkg_install() {
-		cat > ${wrksrc}/file-lists/kde5_list.txt <<-EOF
+		cat > ${wrksrc}/file-lists/kde_list.txt <<-EOF
 		%dir /usr/lib/libreoffice/program
 		%dir /usr/share/metainfo
-		/usr/lib/libreoffice/program/libkf5be1lo.so
-		/usr/lib/libreoffice/program/libvclplug_gtk3_kde5lo.so
-		/usr/lib/libreoffice/program/libvclplug_kf5lo.so
-		/usr/lib/libreoffice/program/libvclplug_qt5lo.so
-		/usr/lib/libreoffice/program/lo_kde5filepicker
+		/usr/lib/libreoffice/program/libvclplug_kf6lo.so
+		/usr/lib/libreoffice/program/libvclplug_qt6lo.so
 		/usr/share/metainfo/org.libreoffice.kde.metainfo.xml
 		EOF
-		_split kde5
-	}
-}
-
-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
+		_split kde
 	}
 }