From af3286453b8da84e8cfd61493718e566bdd78616 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Fri, 8 Jun 2018 13:55:12 +0300 Subject: [PATCH] LibreOffice: enable KDE5 backend --- .../libreoffice-6.2.0.0~git.recipe | 25 +++++- .../patches/libreoffice-6.2.0.0~git.patchset | 87 +++++++++++++++---- 2 files changed, 92 insertions(+), 20 deletions(-) diff --git a/app-office/libreoffice/libreoffice-6.2.0.0~git.recipe b/app-office/libreoffice/libreoffice-6.2.0.0~git.recipe index 0e0982a1c..3a660a866 100644 --- 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="3" -COMMIT="100b6a229e0ab9888578c138cd38424d16dec608" +REVISION="4" +COMMIT="e110ef21224398b68719658340bcfd31fdcbe859" SOURCE_URI="https://github.com/LibreOffice/core/archive/$COMMIT.tar.gz" -CHECKSUM_SHA256="21639e6388bdda4d4aca82e3957e44d6fe1b20fb36e32ec9d64394be84b552c6" +CHECKSUM_SHA256="d5795baf6e495a8bc2b66c0139f9dad99f915bd7a82ae77a268ad8e5cb0222e7" SOURCE_DIR="core-$COMMIT" PATCHES="libreoffice-$portVersion.patchset" ADDITIONAL_FILES="libreoffice.rdef.in" @@ -89,6 +89,13 @@ REQUIRES=" lib:libplds4$secondaryArchSuffix lib:libpng16$secondaryArchSuffix lib:libpoppler$secondaryArchSuffix + lib:libKF5ConfigCore$secondaryArchSuffix + lib:libKF5CoreAddons$secondaryArchSuffix + lib:libKF5I18n$secondaryArchSuffix + lib:libKF5KIOCore$secondaryArchSuffix + lib:libKF5KIOFileWidgets$secondaryArchSuffix + lib:libKF5KIOWidgets$secondaryArchSuffix + lib:libKF5WindowSystem$secondaryArchSuffix lib:libQt5Core$secondaryArchSuffix lib:libQt5Gui$secondaryArchSuffix lib:libQt5Network$secondaryArchSuffix @@ -141,6 +148,13 @@ BUILD_REQUIRES=" devel:libhyphen$secondaryArchSuffix devel:libicuuc$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix + devel:libKF5ConfigCore$secondaryArchSuffix + devel:libKF5CoreAddons$secondaryArchSuffix + devel:libKF5I18n$secondaryArchSuffix + devel:libKF5KIOCore$secondaryArchSuffix + devel:libKF5KIOFileWidgets$secondaryArchSuffix + devel:libKF5KIOWidgets$secondaryArchSuffix + devel:libKF5WindowSystem$secondaryArchSuffix devel:liblangtag$secondaryArchSuffix devel:liblcms2$secondaryArchSuffix devel:libldap$secondaryArchSuffix @@ -153,6 +167,7 @@ BUILD_REQUIRES=" devel:liborcus_0.13$secondaryArchSuffix devel:libpagemaker_0.0$secondaryArchSuffix devel:libpoppler$secondaryArchSuffix + devel:libpthread_stubs$secondaryArchSuffix devel:libqxp_0.0$secondaryArchSuffix devel:libraptor2$secondaryArchSuffix devel:librdf$secondaryArchSuffix @@ -164,6 +179,7 @@ BUILD_REQUIRES=" devel:libwpd_0.10$secondaryArchSuffix devel:libwpg_0.3$secondaryArchSuffix devel:libwps_0.4$secondaryArchSuffix + devel:libxcb$secondaryArchSuffix devel:libxslt$secondaryArchSuffix devel:libz$secondaryArchSuffix devel:libzmf_0.0$secondaryArchSuffix @@ -182,6 +198,7 @@ BUILD_PREREQUIRES=" cmd:git cmd:gperf cmd:grep + cmd:kf5_config$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make cmd:patch @@ -287,7 +304,7 @@ INSTALL() # workaround for missing lib cd $appsDir/LibreOffice/program - mv libvclplug_qt5lo.so libvclplug_kde4lo.so + libvclplug_kde5lo.so libvclplug_kdelo.so # make sure we do not copy default profile rm -rf ../user diff --git a/app-office/libreoffice/patches/libreoffice-6.2.0.0~git.patchset b/app-office/libreoffice/patches/libreoffice-6.2.0.0~git.patchset index afdb9d795..e4c6a4212 100644 --- 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 b30edb5ff2e4c7cfc90eadc19f648cacc1e19d32 Mon Sep 17 00:00:00 2001 +From 4336840626aa7af75bda44108a81c7c739219485 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov 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 3f701063bf123a1cfbf898fbd88ed6a03dac990a Mon Sep 17 00:00:00 2001 +From 61cc51a2cc2fb7909102bc54cf13b8b784a6728e Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Mon, 4 Jun 2018 11:55:30 +0300 Subject: Fix profile dir location on Haiku @@ -62,25 +62,80 @@ index 315e5c8..5aff39b 100644 2.16.4 -From 3a81037043fa0208c4469e273d78303390e27521 Mon Sep 17 00:00:00 2001 +From 18135fe77f568108d89fab44c4ad52e28d7b6a99 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov -Date: Mon, 4 Jun 2018 11:58:32 +0300 -Subject: Fix invisible text on Haiku +Date: Thu, 7 Jun 2018 15:04:27 +0300 +Subject: Enable KDE5 backend on Haiku -diff --git a/vcl/inc/qt5/Qt5Tools.hxx b/vcl/inc/qt5/Qt5Tools.hxx -index a714f19..fcb5055 100644 ---- a/vcl/inc/qt5/Qt5Tools.hxx -+++ b/vcl/inc/qt5/Qt5Tools.hxx -@@ -58,7 +58,7 @@ inline Size toSize(const QSize& rSize) { return Size(rSize.width(), rSize.height +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 - inline QColor toQColor(const Color& rColor) - { -- return QColor(rColor.GetRed(), rColor.GetGreen(), rColor.GetBlue(), rColor.GetTransparency()); -+ return QColor(rColor.GetRed(), rColor.GetGreen(), rColor.GetBlue(), 255 - rColor.GetTransparency()); - } +diff --git a/configure.ac b/configure.ac +index 0453502..292e72b 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 - static constexpr QImage::Format Qt5_DefaultFormat32 = QImage::Format_ARGB32; + 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 \ + \( "$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 -n "$supports_multilib"; then + kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel" + fi +diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk +index a739d59..8585580 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 \ + Library_vclplug_qt5 \ + )) + endif +@@ -118,7 +119,9 @@ endif + ifeq ($(OS),HAIKU) + ifneq ($(ENABLE_QT5),) + $(eval $(call gb_Module_add_targets,vcl,\ ++ CustomTarget_kde5_moc \ + CustomTarget_qt5_moc \ ++ Library_vclplug_kde5 \ + Library_vclplug_qt5 \ + )) + endif -- 2.16.4