mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 22:48:55 +02:00
LibreOffice: re-enable kde5 backend
* Qt5 backend still has drawing issues * Use Elementary theme by default * Identify Haiku in about window * Show used vcl backend in about window
This commit is contained in:
Sergei Reznikov
@@ -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="15"
|
||||
srcGitRev="c0c293089af962661cf3809d5b207149ed4619ed"
|
||||
REVISION="16"
|
||||
srcGitRev="c134154de1d96f458c4502372c7d7e4d12a58fb3"
|
||||
SOURCE_URI="https://github.com/LibreOffice/core/archive/$srcGitRev.tar.gz"
|
||||
CHECKSUM_SHA256="77b11f73599714c869d80e274368bc134f2df9490c21bd1d3e5bb112cafa4293"
|
||||
CHECKSUM_SHA256="92c524e686cb2c51907b1cfa92c1bd52bb13440310fa6620edd393ca04c8660d"
|
||||
SOURCE_DIR="core-$srcGitRev"
|
||||
#srcGitRev_2="54cc0de67b3c948411cef3a0405c8992d80f34f3"
|
||||
#SOURCE_URI_2="https://github.com/LibreOffice/translations/archive/$srcGitRev_2.tar.gz"
|
||||
@@ -76,6 +76,13 @@ REQUIRES="
|
||||
lib:libicuuc$secondaryArchSuffix
|
||||
lib:libintl$secondaryArchSuffix
|
||||
lib:libjpeg$secondaryArchSuffix
|
||||
lib:libKF5ConfigCore$secondaryArchSuffix
|
||||
lib:libKF5CoreAddons$secondaryArchSuffix
|
||||
lib:libKF5I18n$secondaryArchSuffix
|
||||
lib:libKF5KIOCore$secondaryArchSuffix
|
||||
lib:libKF5KIOFileWidgets$secondaryArchSuffix
|
||||
lib:libKF5KIOWidgets$secondaryArchSuffix
|
||||
lib:libKF5WindowSystem$secondaryArchSuffix
|
||||
lib:liblangtag$secondaryArchSuffix
|
||||
lib:liblber_2.4$secondaryArchSuffix
|
||||
lib:liblcms2$secondaryArchSuffix
|
||||
@@ -97,6 +104,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
|
||||
@@ -165,6 +179,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
|
||||
@@ -211,6 +232,7 @@ BUILD_PREREQUIRES="
|
||||
cmd:git
|
||||
cmd:gperf
|
||||
cmd:grep
|
||||
cmd:kf5_config$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:libtool$secondaryArchSuffix
|
||||
cmd:make
|
||||
@@ -246,6 +268,7 @@ BUILD()
|
||||
#--with-lang=ALL
|
||||
runConfigure ./autogen.sh \
|
||||
--with-distro=LibreOfficeHaiku \
|
||||
--enable-kde5 \
|
||||
--enable-qt5 \
|
||||
--enable-release-build \
|
||||
--enable-readonly-installset \
|
||||
@@ -280,7 +303,6 @@ INSTALL()
|
||||
mkdir -p $appDir
|
||||
cp -r ../core/instdir/* $appDir
|
||||
mv $appDir/program/soffice.bin $appDir/program/LibreOffice
|
||||
mv $appDir/program/libvclplug_qt5lo.so $appDir/program/libvclplug_kde5lo.so
|
||||
|
||||
# make sure we do not copy default profile
|
||||
rm -rf $appDir/user
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 2ee2e97e974e5b6f272f9df2df0daa5695919f30 Mon Sep 17 00:00:00 2001
|
||||
From 985085d160192c5e5e4f0829447191a2bec2fc6f Mon Sep 17 00:00:00 2001
|
||||
From: Kacper Kasper <kacperkasper@gmail.com>
|
||||
Date: Sat, 1 Sep 2018 18:38:42 +0200
|
||||
Subject: Fix mysqlc build error
|
||||
@@ -20,3 +20,74 @@ index 3d9d915..30c2163 100644
|
||||
--
|
||||
2.16.4
|
||||
|
||||
|
||||
From 96fec0f2d2d17299c7769cfd943b57b019b56527 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Reznikov <diver@gelios.net>
|
||||
Date: Tue, 4 Sep 2018 22:52:53 +0300
|
||||
Subject: Make Elementary the default on Haiku
|
||||
|
||||
|
||||
diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx
|
||||
index c9da2d6..e8c88e3 100644
|
||||
--- a/vcl/source/app/IconThemeSelector.cxx
|
||||
+++ b/vcl/source/app/IconThemeSelector.cxx
|
||||
@@ -55,6 +55,8 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi
|
||||
#ifdef _WIN32
|
||||
r = "colibre";
|
||||
(void)desktopEnvironment;
|
||||
+#elif defined(__HAIKU__)
|
||||
+ r = "elementary";
|
||||
#else
|
||||
if ( desktopEnvironment.equalsIgnoreAsciiCase("kde4") ||
|
||||
desktopEnvironment.equalsIgnoreAsciiCase("kde5") ) {
|
||||
--
|
||||
2.16.4
|
||||
|
||||
|
||||
From b508076be864636ad80d9e476e00fee68dfc9fba Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Reznikov <diver@gelios.net>
|
||||
Date: Tue, 4 Sep 2018 22:53:57 +0300
|
||||
Subject: Show used vcl backend on Haiku
|
||||
|
||||
|
||||
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
|
||||
index 1bd65ba..c5363f2 100644
|
||||
--- a/vcl/source/app/svapp.cxx
|
||||
+++ b/vcl/source/app/svapp.cxx
|
||||
@@ -1154,8 +1154,8 @@ OUString Application::GetHWOSConfInfo()
|
||||
aDetails.append( VclResId(SV_APP_DEFAULT) );
|
||||
aDetails.append( "; " );
|
||||
|
||||
-#ifdef LINUX
|
||||
- // Only linux has different backends, so don't show blank for others.
|
||||
+#if defined(LINUX) || defined (__HAIKU__)
|
||||
+ // Only linux and Haiku have different backends, so don't show blank for others.
|
||||
aDetails.append( SV_APP_VCLBACKEND );
|
||||
aDetails.append( GetToolkitName() );
|
||||
aDetails.append( "; " );
|
||||
--
|
||||
2.16.4
|
||||
|
||||
|
||||
From e32d5118eb6e8f89ea4b8855b71fd5450b80b870 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Reznikov <diver@gelios.net>
|
||||
Date: Tue, 4 Sep 2018 22:54:37 +0300
|
||||
Subject: Identify Haiku in about window
|
||||
|
||||
|
||||
diff --git a/vcl/unx/generic/app/geninst.cxx b/vcl/unx/generic/app/geninst.cxx
|
||||
index a297ddc..085ddfe 100644
|
||||
--- a/vcl/unx/generic/app/geninst.cxx
|
||||
+++ b/vcl/unx/generic/app/geninst.cxx
|
||||
@@ -92,6 +92,8 @@ OUString SalGenericInstance::getOSVersion()
|
||||
}
|
||||
fclose( pVersion );
|
||||
}
|
||||
+#elif defined(__HAIKU__)
|
||||
+ aKernelVer = "Haiku";
|
||||
#endif
|
||||
return aKernelVer;
|
||||
}
|
||||
--
|
||||
2.16.4
|
||||
|
||||
|
||||
Reference in New Issue
Block a user