git » libreoffice-still.git » commit 8af8f4a

upgpkg: 7.6.6-1; remove gtk3-kde5/kf5 vcl support

author Andreas Radke
2024-03-28 20:33:21 UTC
committer Andreas Radke
2024-03-28 20:33:21 UTC
parent ad39f0b5fe06d8ace4240a6883d2f1cb8bfe0c68

upgpkg: 7.6.6-1; remove gtk3-kde5/kf5 vcl support

.SRCINFO +28 -29
PKGBUILD +11 -12
libreoffice-still.csh +0 -2
libreoffice-still.sh +0 -2

diff --git a/.SRCINFO b/.SRCINFO
index a8f5bf1..a6bb010 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libreoffice-still
-	pkgver = 7.6.5
-	pkgrel = 2
+	pkgver = 7.6.6
+	pkgrel = 1
 	url = https://www.libreoffice.org/
 	arch = x86_64
 	license = MPL-2.0
@@ -46,7 +46,7 @@ pkgbase = libreoffice-still
 	makedepends = gtk3
 	makedepends = gtk4
 	makedepends = qt5-base
-	makedepends = plasma-framework5
+	makedepends = qt5-x11extras
 	makedepends = qt6-base
 	makedepends = cppunit
 	makedepends = beanshell
@@ -115,12 +115,12 @@ pkgbase = libreoffice-still
 	noextract = odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar
 	noextract = f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
 	options = !lto
-	source = https://download.documentfoundation.org/libreoffice/src/7.6.5/libreoffice-7.6.5.2.tar.xz
-	source = https://download.documentfoundation.org/libreoffice/src/7.6.5/libreoffice-7.6.5.2.tar.xz.asc
-	source = https://download.documentfoundation.org/libreoffice/src/7.6.5/libreoffice-help-7.6.5.2.tar.xz
-	source = https://download.documentfoundation.org/libreoffice/src/7.6.5/libreoffice-help-7.6.5.2.tar.xz.asc
-	source = https://download.documentfoundation.org/libreoffice/src/7.6.5/libreoffice-translations-7.6.5.2.tar.xz
-	source = https://download.documentfoundation.org/libreoffice/src/7.6.5/libreoffice-translations-7.6.5.2.tar.xz.asc
+	source = https://download.documentfoundation.org/libreoffice/src/7.6.6/libreoffice-7.6.6.3.tar.xz
+	source = https://download.documentfoundation.org/libreoffice/src/7.6.6/libreoffice-7.6.6.3.tar.xz.asc
+	source = https://download.documentfoundation.org/libreoffice/src/7.6.6/libreoffice-help-7.6.6.3.tar.xz
+	source = https://download.documentfoundation.org/libreoffice/src/7.6.6/libreoffice-help-7.6.6.3.tar.xz.asc
+	source = https://download.documentfoundation.org/libreoffice/src/7.6.6/libreoffice-translations-7.6.6.3.tar.xz
+	source = https://download.documentfoundation.org/libreoffice/src/7.6.6/libreoffice-translations-7.6.6.3.tar.xz.asc
 	source = https://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 	source = https://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 	source = https://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
@@ -147,11 +147,11 @@ pkgbase = libreoffice-still
 	source = libreoffice-still.sh
 	source = libreoffice-still.csh
 	validpgpkeys = C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3
-	sha256sums = 90e6b92f1b8d27bd998a03751c32b2add0afc19954da96ee3c0f4f8b6f5ccbcf
+	sha256sums = 41a83a7f09c539e22c873107d5d4088ac7cdf1a299ad9e9de15e30600fe521b6
 	sha256sums = SKIP
-	sha256sums = 1e4ca22647522952693375e319ebf390b493e1e590cad2d7695e74307153571a
+	sha256sums = fdc28a5108cc2709a1e77209935e42096f8e594e5ed29b9110a07ebc53a31007
 	sha256sums = SKIP
-	sha256sums = 074f01bf7f2adadffd37351f6fd26f9f2709d47d03036094c1efc6a969ee8767
+	sha256sums = 30e212b3387377bdf48ded9674306f8d917aafd4485f72103923829679f607e8
 	sha256sums = SKIP
 	sha256sums = 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1
 	sha256sums = 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
@@ -176,8 +176,8 @@ pkgbase = libreoffice-still
 	sha256sums = 440c9af5f3d1213d8ed7177282380f25cbc981cabc8b590dcb777aaae84178e5
 	sha256sums = d7b952a51e1e40d3faf2f465b68f46d56828d8c46948748fa82fe82a29af2599
 	sha256sums = d0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879
-	sha256sums = b43ed267643fc5ced803dca010427b12b1f10db485173ccb19efb3395e60c82e
-	sha256sums = 66f2cb5d2ff9909ee9633aea73d5306fc8c4ff358fa526f45d9994210d3e23ff
+	sha256sums = 364af7c45bc4e41f9ebaa36944daefb9bf3aca823b7e0059307ef0cbb41bbf4c
+	sha256sums = 060390bec7882072099c54508993fcfa7e3dd34d6e4b44996bd197d5e99cf0f6
 
 pkgname = libreoffice-still-sdk
 	pkgdesc = Software Development Kit for LibreOffice maintenance branch
@@ -267,23 +267,22 @@ pkgname = libreoffice-still
 	depends = librevenge
 	depends = libxext
 	depends = openjpeg2
-	optdepends = java-runtime:     adds java support
+	optdepends = java-runtime: adds java support
 	optdepends = java-environment: 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 = qt6-base: for Qt6 desktop integration
 	provides = libreoffice
 	provides = libreoffice-en-US
 	conflicts = libreoffice-fresh
diff --git a/PKGBUILD b/PKGBUILD
index 3bbeaaf..7c64616 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,9 +10,9 @@ _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
 
 pkgbase=libreoffice-still
 pkgname=('libreoffice-still-sdk' 'libreoffice-still')
-_LOver=7.6.5.2
-pkgver=7.6.5
-pkgrel=2
+_LOver=7.6.6.3
+pkgver=7.6.6
+pkgrel=1
 arch=('x86_64')
 license=('MPL-2.0' 'LGPL-3.0-or-later')
 url="https://www.libreoffice.org/"
@@ -22,7 +22,7 @@ makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python' 'libwpd>=0.9.2' 'libwps'
     'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
     'libmspub' 'harfbuzz-icu' 'nss' 'hicolor-icon-theme'
     'gst-plugins-base-libs' 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'ant'
-    'gperf' 'gtk3' 'gtk4' 'qt5-base' 'plasma-framework5' 'qt6-base' 'cppunit' 'beanshell' 'clucene'
+    'gperf' 'gtk3' 'gtk4' 'qt5-base' 'qt5-x11extras' 'qt6-base' 'cppunit' 'beanshell' 'clucene'
     'junit' 'libmythes' 'libwpg'  'java-environment=11' 'postgresql-libs' 'mariadb-libs' 'libgl'
     'bluez-libs' 'gdb' 'doxygen'  'libatomic_ops'  'mdds'
     'ttf-liberation' 'ttf-dejavu' 'ttf-carlito' 'libxinerama' 'libpagemaker' 'glm'
@@ -84,11 +84,11 @@ noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
            f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
 )
 validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build@documentfoundation.org>
-sha256sums=('90e6b92f1b8d27bd998a03751c32b2add0afc19954da96ee3c0f4f8b6f5ccbcf'
+sha256sums=('41a83a7f09c539e22c873107d5d4088ac7cdf1a299ad9e9de15e30600fe521b6'
             'SKIP'
-            '1e4ca22647522952693375e319ebf390b493e1e590cad2d7695e74307153571a'
+            'fdc28a5108cc2709a1e77209935e42096f8e594e5ed29b9110a07ebc53a31007'
             'SKIP'
-            '074f01bf7f2adadffd37351f6fd26f9f2709d47d03036094c1efc6a969ee8767'
+            '30e212b3387377bdf48ded9674306f8d917aafd4485f72103923829679f607e8'
             'SKIP'
             '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
             '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
@@ -113,8 +113,8 @@ sha256sums=('90e6b92f1b8d27bd998a03751c32b2add0afc19954da96ee3c0f4f8b6f5ccbcf'
             '440c9af5f3d1213d8ed7177282380f25cbc981cabc8b590dcb777aaae84178e5'
             'd7b952a51e1e40d3faf2f465b68f46d56828d8c46948748fa82fe82a29af2599'
             'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
-            'b43ed267643fc5ced803dca010427b12b1f10db485173ccb19efb3395e60c82e'
-            '66f2cb5d2ff9909ee9633aea73d5306fc8c4ff358fa526f45d9994210d3e23ff')
+            '364af7c45bc4e41f9ebaa36944daefb9bf3aca823b7e0059307ef0cbb41bbf4c'
+            '060390bec7882072099c54508993fcfa7e3dd34d6e4b44996bd197d5e99cf0f6')
 
 prepare() {
 
@@ -185,8 +185,8 @@ build() {
         --enable-dbus \
         --enable-evolution2\
         --enable-gio\
-        --enable-gtk3-kde5 \
-        --enable-kf5 \
+        --disable-gtk3-kde5 \
+        --disable-kf5 \
         --enable-qt5 \
         --enable-qt6 \
         --enable-gtk3 \
@@ -328,7 +328,6 @@ package_libreoffice-still() {
         'coin-or-mp:       required by the Calc solver'
         'gtk3:             for GTK3 integration'
         'gtk4:             for GTK4 integration (experimental)'
-        'kio5:             for KF5 KDE desktop integration'
         'qt6-base:         for Qt6 desktop integration')
     backup=(etc/libreoffice/sofficerc
         etc/libreoffice/bootstraprc
diff --git a/libreoffice-still.csh b/libreoffice-still.csh
index a278dc4..e9c679c 100644
--- a/libreoffice-still.csh
+++ b/libreoffice-still.csh
@@ -1,8 +1,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 qt5
 #setenv SAL_USE_VCLPLUGIN qt6
 #setenv SAL_USE_VCLPLUGIN gtk3
diff --git a/libreoffice-still.sh b/libreoffice-still.sh
index 563cd7f..332ab6d 100644
--- a/libreoffice-still.sh
+++ b/libreoffice-still.sh
@@ -1,8 +1,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=qt5
 #export SAL_USE_VCLPLUGIN=qt6
 #export SAL_USE_VCLPLUGIN=gtk3