LibreOffice: sync with master

* upsteam 2/4 patches * more work on kde5 file picker by Katarina * fix transparent focus button text
2026-04-22 19:50:05 +02:00 · 2018-07-03 23:06:40 +03:00
parent e473b27aaa
commit e49d52658a
2 changed files with 5 additions and 153 deletions
--- a/app-office/libreoffice/libreoffice-6.2.0.0~git.recipe
+++ b/app-office/libreoffice/libreoffice-6.2.0.0~git.recipe
@@ -17,10 +17,10 @@ and Open Source office suite on the market:
 HOMEPAGE="https://www.libreoffice.org/"
 COPYRIGHT="2000-2018 LibreOffice contributors"
 LICENSE="MPL v2.0"
-REVISION="6"
-COMMIT="4dd64053fa3d5b9f3e8d55aa0d2b31768d3f8474"
+REVISION="7"
+COMMIT="63f0dbdd61df0bf390d201b4ea4215b0077a2f9d"
 SOURCE_URI="https://github.com/LibreOffice/core/archive/$COMMIT.tar.gz"
-CHECKSUM_SHA256="717b8594215a4b29d2261f072f2ae5083ab6f9e6afd71bc1ca69845808f53aa8"
+CHECKSUM_SHA256="cd5575c755e7e92cc50a12a8dec08d8c712f9f634ffd84d388769adad6ac0cf5"
 SOURCE_DIR="core-$COMMIT"
 PATCHES="libreoffice-$portVersion.patchset"
 ADDITIONAL_FILES="libreoffice.rdef.in"
@@ -142,6 +142,7 @@ BUILD_REQUIRES="
 	devel:libetonyek_0.1$secondaryArchSuffix
 	devel:libexpat$secondaryArchSuffix
 	devel:libfreehand_0.1$secondaryArchSuffix
+#	devel:libgcrypt$secondaryArchSuffix
 	devel:libglew$secondaryArchSuffix
 	devel:libgraphite2$secondaryArchSuffix
 	devel:libharfbuzz_icu$secondaryArchSuffix
@@ -201,6 +202,7 @@ BUILD_PREREQUIRES="
 	cmd:grep
 	cmd:kf5_config$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:libtool$secondaryArchSuffix
 	cmd:make
 	cmd:patch
 	cmd:perl
--- a/app-office/libreoffice/patches/libreoffice-6.2.0.0~git.patchset
+++ b/app-office/libreoffice/patches/libreoffice-6.2.0.0~git.patchset
@@ -62,153 +62,3 @@ index 315e5c8..5aff39b 100644
 2.16.4


-From e6b0de2937281d446456cbae74593a9fdc340ada Mon Sep 17 00:00:00 2001
-From: Kacper Kasper <kacperkasper@gmail.com>
-Date: Sun, 10 Jun 2018 03:51:57 +0200
-Subject: Allow building KDE5 backend on Haiku
-
-Change-Id: I3138d26596af4c615fe2caaa2b160a76d8d2a352
-
-diff --git a/Repository.mk b/Repository.mk
-index e26f8e1..297fa56 100644
--- a/Repository.mk
-+++ b/Repository.mk
-@@ -312,6 +312,7 @@ endif
- ifeq ($(OS),HAIKU)
- $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,haiku, \
-     $(if $(ENABLE_QT5),vclplug_qt5) \
-+    $(if $(ENABLE_KDE5),vclplug_kde5) \
- ))
- endif
- 
-diff --git a/configure.ac b/configure.ac
-index 0453502..3909144 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -4646,6 +4646,7 @@ fi
- if test "$OS" = "HAIKU"; then
-     enable_cairo_canvas=yes
-     test_qt5=yes
-+    test_kde5=yes
- fi
- 
- dnl ===================================================================
-@@ -11150,8 +11151,14 @@ if test \( "$test_kde5" = "yes" -a "$ENABLE_KDE5" = "TRUE" \) -o \
-         \( "$test_kf5" = "yes" -a "$ENABLE_KF5" = "TRUE" \) -o \
-         \( "$test_gtk3_kde5" = "yes" -a "$ENABLE_GTK3_KDE5" = "TRUE" \)
- then
-    kf5_incdirs="$KF5INC /usr/include/ $x_includes"
-    kf5_libdirs="$KF5LIB /usr/lib /usr/lib/kf5 /usr/lib/kf5/devel $x_libraries"
-+    if test "$OS" = "HAIKU"; then
-+        haiku_arch="`echo $RTL_ARCH | tr X x`"
-+        kf5_haiku_incdirs="`findpaths -c ' ' -a $haiku_arch B_FIND_PATH_HEADERS_DIRECTORY`"
-+        kf5_haiku_libdirs="`findpaths -c ' ' -a $haiku_arch B_FIND_PATH_DEVELOP_LIB_DIRECTORY`"
-+    fi
-+
-+    kf5_incdirs="$KF5INC /usr/include/ $kf5_haiku_incdirs $x_includes"
-+    kf5_libdirs="$KF5LIB /usr/lib /usr/lib/kf5 /usr/lib/kf5/devel $kf5_haiku_libdirs $x_libraries"
-     if test -n "$supports_multilib"; then
-         kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel"
-     fi
-diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
-index fd99be2..dc59267 100644
--- a/vcl/Library_vcl.mk
-+++ b/vcl/Library_vcl.mk
-@@ -672,11 +672,9 @@ $(eval $(call gb_Library_add_libs,vcl,\
-     -lbe \
- ))
- 
-ifeq ($(ENABLE_QT5),TRUE)
-$(eval $(call gb_Library_add_exception_objects,vcl,\
-    vcl/unx/generic/plugadapt/salplug \
-+$(eval $(call gb_Library_add_exception_objects,vcl, \
-+    $(if $(or $(ENABLE_QT5),$(ENABLE_KDE5)),vcl/unx/generic/plugadapt/salplug) \
- ))
-endif
- 
- $(eval $(call gb_Library_use_externals,vcl,\
-     cairo \
-diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
-index a739d59..95d3f2a 100644
--- a/vcl/Module_vcl.mk
-+++ b/vcl/Module_vcl.mk
-@@ -122,6 +122,12 @@ $(eval $(call gb_Module_add_targets,vcl,\
-     Library_vclplug_qt5 \
- ))
- endif
-+ifneq ($(ENABLE_KDE5),)
-+$(eval $(call gb_Module_add_targets,vcl,\
-+    CustomTarget_kde5_moc \
-+    Library_vclplug_kde5 \
-+))
-+endif
- endif
- 
- ifneq ($(ENABLE_FUZZERS),)
-- 
-2.16.4
-
-
-From 7a705af4cb9a9f27344647f8631dd6ad3b352615 Mon Sep 17 00:00:00 2001
-From: Abhyudaya Sharma <sharmaabhyudaya@gmail.com>
-Date: Wed, 13 Jun 2018 16:19:40 +0530
-Subject: Add autodetection for KDE5 VCL Plugin
-
-Change-Id: I91f8a780d53e5a36b8c67706aeb58f57a4b6ea18
-
-diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
-index b7ed29a..14a627c 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
-+++ b/vcl/unx/generic/plugadapt/salplug.cxx
-@@ -99,7 +99,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = fals
-                  * #i109007# KDE3 seems to have the same problem.
-                  * And same applies for KDE4.
-                  */
-                if( rModuleBase == "gtk" || rModuleBase == "gtk3" || rModuleBase == "kde4" || rModuleBase == "gtk3_kde5")
-+                if( rModuleBase == "gtk" || rModuleBase == "gtk3" || rModuleBase == "kde4" || rModuleBase == "gtk3_kde5" || rModuleBase == "kde5")
-                 {
-                     pCloseModule = nullptr;
-                 }
-@@ -163,12 +163,16 @@ static SalInstance* autodetect_plugin()
- {
-     static const char* const pKDEFallbackList[] =
-     {
-+#if ENABLE_KDE5
-+       "kde5"
-+#endif
- #if ENABLE_GTK3_KDE5
-         "gtk3_kde5",
- #endif
- #if ENABLE_KDE4
-         "kde4",
- #endif
-+
-         "gtk3", "gtk", "gen", nullptr
-     };
- 
-@@ -207,9 +211,12 @@ static SalInstance* autodetect_plugin()
-         SAL_INFO_IF(
-             pInst, "vcl.plugadapt",
-             "plugin autodetection: " << pList[nListEntry]);
-+        if (!pInst)
-+        {
-+            break;
-+        }
-         nListEntry++;
-     }
-
-     return pInst;
- }
- 
-@@ -233,7 +240,7 @@ SalInstance *CreateSalInstance()
- 
-     // fallback, try everything
-     static const char* const pPlugin[] = {
-        "gtk3", "gtk", "kde4", "kde", "tde", "gen" };
-+        "kde5", "gtk3", "gtk", "kde4", "kde", "tde", "gen" };
- 
-     for ( int i = 0; !pInst && i != SAL_N_ELEMENTS(pPlugin); ++i )
-         pInst = tryInstance( OUString::createFromAscii( pPlugin[ i ] ) );
-- 
-2.16.4
-