LibreOffice: another build fix attempt

2026-04-21 19:20:08 +02:00 · 2018-06-13 22:18:15 +03:00
parent a71d09ea49
commit 8faafd2c57
2 changed files with 110 additions and 40 deletions
--- a/app-office/libreoffice/libreoffice-6.2.0.0~git.recipe
+++ b/app-office/libreoffice/libreoffice-6.2.0.0~git.recipe
@@ -18,9 +18,9 @@ HOMEPAGE="https://www.libreoffice.org/"
 COPYRIGHT="2000-2018 LibreOffice contributors"
 LICENSE="MPL v2.0"
 REVISION="5"
-COMMIT="e110ef21224398b68719658340bcfd31fdcbe859"
+COMMIT="4dd64053fa3d5b9f3e8d55aa0d2b31768d3f8474"
 SOURCE_URI="https://github.com/LibreOffice/core/archive/$COMMIT.tar.gz"
-CHECKSUM_SHA256="d5795baf6e495a8bc2b66c0139f9dad99f915bd7a82ae77a268ad8e5cb0222e7"
+CHECKSUM_SHA256="717b8594215a4b29d2261f072f2ae5083ab6f9e6afd71bc1ca69845808f53aa8"
 SOURCE_DIR="core-$COMMIT"
 PATCHES="libreoffice-$portVersion.patchset"
 ADDITIONAL_FILES="libreoffice.rdef.in"
@@ -220,6 +220,7 @@ BUILD()

 	runConfigure ./autogen.sh \
 		--with-distro=LibreOfficeHaiku \
+		--enable-kde5 \
 		--enable-qt5 \
 		--enable-release-build \
 		--enable-readonly-installset \
@@ -302,10 +303,6 @@ INSTALL()
 	cd $appsDir/LibreOffice/program
 	mv soffice.bin LibreOffice

-	# workaround for missing lib
-	cd $appsDir/LibreOffice/program
-	mv libvclplug_kde5lo.so libvclplug_kdelo.so
-
 	# make sure we do not copy default profile
 	rm -rf ../user

--- a/app-office/libreoffice/patches/libreoffice-6.2.0.0~git.patchset
+++ b/app-office/libreoffice/patches/libreoffice-6.2.0.0~git.patchset
@@ -1,4 +1,4 @@
-From 141390aa4dc9e2c6e0c79bbba22ebf27dad5454f Mon Sep 17 00:00:00 2001
+From bfe48ff76c7e05ada61e7f1e0b03ebaeb715a97c Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Fri, 1 Jun 2018 15:23:47 +0300
 Subject: Fix make distro-pack-install on Haiku
@@ -39,7 +39,7 @@ index 2a66608..e26f8e1 100644
 2.16.4


-From 18c8332722a099b07d8815f789d35a619bbbb714 Mon Sep 17 00:00:00 2001
+From 7b73ecd7f14b66474c9ec18b6beb94250530d3f4 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Mon, 4 Jun 2018 11:55:30 +0300
 Subject: Fix profile dir location on Haiku
@@ -62,11 +62,12 @@ index 315e5c8..5aff39b 100644
 2.16.4


-From 166260bf3b04bf3f9c74cb1ad812ed713002b4bc Mon Sep 17 00:00:00 2001
-From: Sergei Reznikov <diver@gelios.net>
-Date: Thu, 7 Jun 2018 15:04:27 +0300
-Subject: Enable KDE5 backend on Haiku
+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
@@ -81,7 +82,7 @@ index e26f8e1..297fa56 100644
 endif
 
 diff --git a/configure.ac b/configure.ac
-index 0453502..292e72b 100644
+index 0453502..3909144 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -4646,6 +4646,7 @@ fi
@@ -92,50 +93,122 @@ index 0453502..292e72b 100644
 fi
 
 dnl ===================================================================
-@@ -11054,8 +11055,8 @@ if test \( "$test_kde5" = "yes" -a "$ENABLE_KDE5" = "TRUE" \) -o \
-         \( "$test_qt5" = "yes" -a "$ENABLE_QT5" = "TRUE" \) -o \
-         \( "$test_gtk3_kde5" = "yes" -a "$ENABLE_GTK3_KDE5" = "TRUE" \)
- then
-    qt5_incdirs="$QT5INC /usr/include/qt5 /usr/include $x_includes"
-    qt5_libdirs="$QT5LIB /usr/lib/qt5 /usr/lib $x_libraries"
-+    qt5_incdirs="$QT5INC /usr/include/qt5 /usr/include /system/develop/headers $x_includes"
-+    qt5_libdirs="$QT5LIB /usr/lib/qt5 /usr/lib /system/develop/lib $x_libraries"
- 
-     if test -n "$supports_multilib"; then
-         qt5_libdirs="$qt5_libdirs /usr/lib64/qt5 /usr/lib64/qt /usr/lib64"
-@@ -11150,8 +11151,8 @@ if test \( "$test_kde5" = "yes" -a "$ENABLE_KDE5" = "TRUE" \) -o \
+@@ -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"
-+    kf5_incdirs="$KF5INC /usr/include/ /system/develop/headers $x_includes"
-+    kf5_libdirs="$KF5LIB /usr/lib /usr/lib/kf5 /usr/lib/kf5/devel /system/develop/lib $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..8585580 100644
+index a739d59..95d3f2a 100644
 --- a/vcl/Module_vcl.mk
 +++ b/vcl/Module_vcl.mk
-@@ -91,6 +91,7 @@ endif
- ifneq ($(ENABLE_QT5),)
- $(eval $(call gb_Module_add_targets,vcl,\
-     CustomTarget_qt5_moc \
-+    Library_vclplug_kde5 \
+@@ -122,6 +122,12 @@ $(eval $(call gb_Module_add_targets,vcl,\
     Library_vclplug_qt5 \
 ))
 endif
-@@ -118,7 +119,9 @@ endif
- ifeq ($(OS),HAIKU)
- ifneq ($(ENABLE_QT5),)
- $(eval $(call gb_Module_add_targets,vcl,\
+ifneq ($(ENABLE_KDE5),)
+$(eval $(call gb_Module_add_targets,vcl,\
 +    CustomTarget_kde5_moc \
-     CustomTarget_qt5_moc \
 +    Library_vclplug_kde5 \
-     Library_vclplug_qt5 \
- ))
+))
+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