diff --git a/extra/libreoffice-fresh/.SRCINFO b/extra/libreoffice-fresh/.SRCINFO index 95db88cec..ad328c477 100644 --- a/extra/libreoffice-fresh/.SRCINFO +++ b/extra/libreoffice-fresh/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = libreoffice-fresh pkgver = 24.2.1 - pkgrel = 3 + pkgrel = 4 url = https://www.libreoffice.org/ arch = x86_64 license = MPL-2.0 @@ -49,9 +49,7 @@ pkgbase = libreoffice-fresh makedepends = beanshell makedepends = clucene makedepends = qt5-base - makedepends = plasma-framework5 - makedepends = frameworkintegration5 - makedepends = kconfig5 + makedepends = qt5-x11extras makedepends = qt6-base makedepends = kio makedepends = kconfig @@ -190,8 +188,8 @@ pkgbase = libreoffice-fresh sha256sums = d7b952a51e1e40d3faf2f465b68f46d56828d8c46948748fa82fe82a29af2599 sha256sums = f7905962a634ab4ab5c5e591c1816e6baf3f66db91adfeee25c631b6939110ef sha256sums = d0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879 - sha256sums = 5e1dc35b9851cf2ef93a2fae151cf90258c81f3ab56f86e3e9ea6c56be4eed19 - sha256sums = 57c92c48e0d82a073a0095bfe44fb541c68bead6205436a5432879185f420768 + sha256sums = 9fb33dbc3ffeb6af2ea7341b58242142d4eca903584c21c5f4b44ff27fbf5b5f + sha256sums = 512355b5ef646791089da8c2b35cf8b019673c0c8a58685962af3b5d9eb5d6bb pkgname = libreoffice-fresh-sdk pkgdesc = Software Development Kit for LibreOffice Fresh @@ -283,23 +281,23 @@ pkgname = libreoffice-fresh depends = librevenge depends = libxext depends = openjpeg2 - optdepends = java-runtime: adds java support + optdepends = java-runtime: adds java support optdepends = java-environment>=17: required by extension-wiki-publisher and extension-nlpsolver - optdepends = pstoedit: translates PostScript and PDF graphics into other vector formats - optdepends = libmythes: for use in thesaurus - optdepends = beanshell: interactive java -- good for prototyping/macros - optdepends = libwpg: library for importing and converting WordPerfect Graphics format - optdepends = sane: for scanner access - optdepends = unixodbc: adds ODBC database support + optdepends = pstoedit: translates PostScript and PDF graphics into other vector formats + optdepends = libmythes: for use in thesaurus + optdepends = beanshell: interactive java -- good for prototyping/macros + optdepends = libwpg: library for importing and converting WordPerfect Graphics format + optdepends = sane: for scanner access + optdepends = unixodbc: adds ODBC database support optdepends = gst-plugins-base-libs: for multimedia content, e.g. in Impress - optdepends = libpaper: takes care of papersize - optdepends = postgresql-libs: for postgresql-connector - optdepends = mariadb-libs: for mysql-connector - optdepends = coin-or-mp: required by the Calc solver - optdepends = gtk3: for GTK3 integration - optdepends = gtk4: for GTK4 integration (experimental) - optdepends = kio5: for KF5 KDE desktop integration - optdepends = qt6-base: for Qt6 desktop integration + optdepends = libpaper: takes care of papersize + optdepends = postgresql-libs: for postgresql-connector + optdepends = mariadb-libs: for mysql-connector + optdepends = coin-or-mp: required by the Calc solver + optdepends = gtk3: for GTK3 integration + optdepends = gtk4: for GTK4 integration (experimental) + optdepends = kio: for KF6 KDE desktop integration + optdepends = qt6-base: for Qt6 desktop integration provides = libreoffice provides = libreoffice-en-US conflicts = libreoffice-still diff --git a/extra/libreoffice-fresh/PKGBUILD b/extra/libreoffice-fresh/PKGBUILD index 2319281b3..82b558b54 100644 --- a/extra/libreoffice-fresh/PKGBUILD +++ b/extra/libreoffice-fresh/PKGBUILD @@ -20,7 +20,7 @@ pkgbase=libreoffice-fresh pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') _LOver=24.2.1.2 pkgver=24.2.1 -pkgrel=3 +pkgrel=4 arch=('x86_64') license=('MPL-2.0' 'LGPL-3.0-or-later') url="https://www.libreoffice.org/" @@ -31,7 +31,7 @@ makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python' 'libwpd>=0.9.2' 'libwps' 'libmspub' 'harfbuzz-icu' 'nss' 'hicolor-icon-theme' 'gst-plugins-base-libs' 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'ant' 'gperf' 'gtk3' 'gtk4' 'cppunit' 'beanshell' 'clucene' - 'qt5-base' 'plasma-framework5' 'frameworkintegration5' 'kconfig5' + 'qt5-base' 'qt5-x11extras' 'qt6-base' 'kio' 'kconfig' 'kcoreaddons' 'kwindowsystem' 'ki18n' 'kcoreaddons' 'junit' 'libmythes' 'libwpg' 'java-environment=17' 'postgresql-libs' 'mariadb-libs' 'libgl' 'bluez-libs' 'gdb' 'doxygen' 'libatomic_ops' 'mdds' @@ -129,8 +129,9 @@ sha256sums=('3ccf577e8f665059ed5a06577b3b37278080be9f29cc4ad3352857a8f2549fa8' 'd7b952a51e1e40d3faf2f465b68f46d56828d8c46948748fa82fe82a29af2599' 'f7905962a634ab4ab5c5e591c1816e6baf3f66db91adfeee25c631b6939110ef' 'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879' - '5e1dc35b9851cf2ef93a2fae151cf90258c81f3ab56f86e3e9ea6c56be4eed19' - '57c92c48e0d82a073a0095bfe44fb541c68bead6205436a5432879185f420768') + '9fb33dbc3ffeb6af2ea7341b58242142d4eca903584c21c5f4b44ff27fbf5b5f' + '512355b5ef646791089da8c2b35cf8b019673c0c8a58685962af3b5d9eb5d6bb') + prepare() { cd libreoffice-$_LOver @@ -200,9 +201,9 @@ build() { --enable-dbus \ --enable-evolution2\ --enable-gio\ - --enable-gtk3-kde5 \ - --enable-kf5 \ - --disable-kf6 \ + --disable-gtk3-kde5 \ + --disable-kf5 \ + --enable-kf6 \ --enable-qt5 \ --enable-qt6 \ --enable-gtk3 \ @@ -339,8 +340,7 @@ package_libreoffice-fresh() { 'coin-or-mp: required by the Calc solver' 'gtk3: for GTK3 integration' 'gtk4: for GTK4 integration (experimental)' - 'kio5: for KF5 KDE desktop integration' -# 'kio: for KF6 KDE desktop integration' + 'kio: for KF6 KDE desktop integration' 'qt6-base: for Qt6 desktop integration') backup=(etc/libreoffice/sofficerc etc/libreoffice/bootstraprc diff --git a/extra/libreoffice-fresh/libreoffice-fresh.csh b/extra/libreoffice-fresh/libreoffice-fresh.csh index 70ed9efdf..4f73ccc81 100644 --- a/extra/libreoffice-fresh/libreoffice-fresh.csh +++ b/extra/libreoffice-fresh/libreoffice-fresh.csh @@ -5,8 +5,6 @@ # to force a certain look'n feel #setenv SAL_USE_VCLPLUGIN gen -#setenv SAL_USE_VCLPLUGIN gtk3_kde5 -#setenv SAL_USE_VCLPLUGIN kf5 #setenv SAL_USE_VCLPLUGIN kf6 #setenv SAL_USE_VCLPLUGIN qt5 #setenv SAL_USE_VCLPLUGIN qt6 diff --git a/extra/libreoffice-fresh/libreoffice-fresh.sh b/extra/libreoffice-fresh/libreoffice-fresh.sh index b10ba58a8..b70f669ea 100644 --- a/extra/libreoffice-fresh/libreoffice-fresh.sh +++ b/extra/libreoffice-fresh/libreoffice-fresh.sh @@ -5,8 +5,6 @@ # to force a certain look'n feel #export SAL_USE_VCLPLUGIN=gen -#export SAL_USE_VCLPLUGIN=gtk3_kde5 -#export SAL_USE_VCLPLUGIN=kf5 #export SAL_USE_VCLPLUGIN=kf6 #export SAL_USE_VCLPLUGIN=qt5 #export SAL_USE_VCLPLUGIN=qt6