[arch-commits] Commit in libreoffice-still/trunk (2 files)

[Andreas Radke]

    Date: Thursday, March 10, 2022 @ 18:05:59
  Author: andyrtr
Revision: 439396

upgpkg: libreoffice-still 7.2.6-1: upstream update 7.2.6

Modified:
  libreoffice-still/trunk/PKGBUILD
Deleted:
  libreoffice-still/trunk/0002_update_kf5_include_lib_check.patch

-----------------------------------------+
 0002_update_kf5_include_lib_check.patch |   56 ------------------------------
 PKGBUILD                                |   18 +++------
 2 files changed, 6 insertions(+), 68 deletions(-)

Deleted: 0002_update_kf5_include_lib_check.patch
===================================================================
--- 0002_update_kf5_include_lib_check.patch	2022-03-10 18:05:20 UTC (rev 439395)
+++ 0002_update_kf5_include_lib_check.patch	2022-03-10 18:05:59 UTC (rev 439396)
@@ -1,56 +0,0 @@
-From 5fd5e42bf28a7910321c6b6d76257e7386839fbc Mon Sep 17 00:00:00 2001
-From: Michael Weghorn <m.weghorn at posteo.de>
-Date: Wed, 16 Feb 2022 13:38:47 +0100
-Subject: configure.ac: Update kf5 include/lib check to work with KF5 >= 5.91
-
-The 'kcoreaddons_version.h' header was moved to the 'KCoreAddons'
-subdirectory in kcoreaddons commit
-
-    commit d971ba9bb27a3e8f18a116692fdf98c1729ac244
-    Author: Ahmad Samir <a.samirh78 at gmail.com>
-    Date:   Sat Jan 15 14:14:13 2022 +0200
-
-        Install kcoreaddons_version.h in /usr/include/KF5/KCoreAddons/
-
-        Instead of /usr/include/KF5/kcoreaddons_version.h.
-
-        For more details see:
-        https://invent.kde.org/frameworks/kservice/-/merge_requests/79
-
-        GIT_SILENT
-
-Adapt the KF5 check to check for the 'KFileWidget' header and
-the 'libKF5KIOFileWidgets.so' library instead.
-This is more exact anyway, since we require KIOFileWidgets,
-and the previous check didn't ensure that.
-(So in case only KF5CoreAddons but not KIOFileWidgets was installed,
-configure would previously pass, but the build fail.)
-
-[1] https://invent.kde.org/frameworks/kcoreaddons/-/commit/d971ba9bb27a3e8f18a116692fdf98c1729ac244
-
-Change-Id: I7ecf7f29dce85e1a6e6b0d4f2519fa37ab04ca84
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129996
-Tested-by: Jenkins
-Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6acb3107cea3..4e84f9a33980 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -13017,8 +13017,8 @@ then
-         kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel"
-     fi
- 
--    kf5_test_include="KF5/kcoreaddons_version.h"
--    kf5_test_library="libKF5CoreAddons.so"
-+    kf5_test_include="KF5/KIOFileWidgets/KFileWidget"
-+    kf5_test_library="libKF5KIOFileWidgets.so"
-     kf5_libdirs="$qt5_libdir $kf5_libdirs"
- 
-     dnl kf5 KDE4 support compatibility installed
--- 
-cgit v1.2.1
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-10 18:05:20 UTC (rev 439395)
+++ PKGBUILD	2022-03-10 18:05:59 UTC (rev 439396)
@@ -10,9 +10,9 @@
 
 pkgbase=libreoffice-still
 pkgname=('libreoffice-still-sdk' 'libreoffice-still')
-_LOver=7.2.5.2
-pkgver=7.2.5
-pkgrel=5
+_LOver=7.2.6.2
+pkgver=7.2.6
+pkgrel=1
 arch=('x86_64')
 license=('LGPL3')
 url="https://www.libreoffice.org/"
@@ -63,7 +63,6 @@
 	make-pyuno-work-with-system-wide-module-install.diff
 	mdds-2.0-and-orcus-0.17.diff
 	0001_drop_the_SolarMutex_before_QApplication.patch
-	0002_update_kf5_include_lib_check.patch
 	soffice-template.desktop.in
 	libreoffice-still.sh libreoffice-still.csh)
 noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@@ -87,11 +86,11 @@
            185d60944ea767075d27247c3162b3bc-unowinreg.dll
 )
 validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build at documentfoundation.org>
-sha256sums=('67c1bfb059d433286b0252a915627b33af63bb5f4b6ec9509d13b9dd475512a7'
+sha256sums=('483765a98b92d90e8c8c735e08d33c2a34b5fe1fbc8e7f6b1f9c74ad1a141e31'
             'SKIP'
-            'eaf1112d68747e441c491902dfb7f0d8706ac55b5bafd90f1213b25978ccadf3'
+            '4e3020cfbc95ef2e5536b12e4f678496434667387a279f13d530b7bb6029da8e'
             'SKIP'
-            'f6b9ee4627ec117ed101476c5fa555c3fc504ba759792dd16ca9e80b7f6e31df'
+            '7d465f966ac28b898e6ba8994e6f8af48bd14e54a3708e14278128c8afc71dc9'
             'SKIP'
             '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
             '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
@@ -116,7 +115,6 @@
             'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
             'fd73edaa09a48e2b2c4f4f32af68f1ef01cc181d49a5dfc1f65a5ad4883d7db8'
             '81a8551aaea0ab1750d36fb8bfbd04340a43eaab349a43c1384d21ef6504ab47'
-            '1cc5aeac9b8e91786701727d97b58039afc3db3dbc7977a3651d3263240798b3'
             'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
             'cd1b25ff390e436c6bffa65c6e12382236e3ccbf8d3aae51b1b59bcaed79fd8a'
             'de20f36d45f0fecc2d94176dd3ec7226ab07fa8ffb9b0bc73c200349a9273de1')
@@ -148,10 +146,6 @@
 	# fix crash on start - FS#73471
 	patch -Np1 -i "${srcdir}"/0001_drop_the_SolarMutex_before_QApplication.patch
 
-	# fix kf5 chances
-	# https://cgit.freedesktop.org/libreoffice/core/commit/?id=5fd5e42bf28a7910321c6b6d76257e7386839fbc
-	patch -Np1 -i "${srcdir}"/0002_update_kf5_include_lib_check.patch
-
 	#use the CFLAGS but remove the LibO overridden ones
 	for i in $CFLAGS; do
 		case "$i" in