diff options
| -rw-r--r-- | app-office/libreoffice/Manifest | 4 | ||||
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-7.6.6.1-detect-plasma6.patch | 153 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-7.6.6.3.ebuild (renamed from app-office/libreoffice/libreoffice-7.6.6.1.ebuild) | 3 |
3 files changed, 2 insertions, 158 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 20840c185dfb..6bb546e82c94 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -22,12 +22,12 @@ DIST frozen-1.1.1.tar.gz 186589 BLAKE2B 5f103311c49777d0d284cabe026fae55f09bd24b DIST libreoffice-24.2.2.1.tar.xz 280628072 BLAKE2B f9b22b25bdd58278de020fa67ec6ab3d7a3986c75d7931ea82b69dc5d330876be1aaf4cd3ef7cde6e9eb2554ee7d156c04bb8729e13a5e622e8e68b4e28cba08 SHA512 62840468733eabb4a4b9784802e1710e2a697ebe6fa3d6246bcc9d08b97a8af189b259fe8af6f2add4d1cf706df40431fc26d92be318dd9b547f05de992368d5 DIST libreoffice-7.6.4.1.tar.xz 281547116 BLAKE2B 55712cf41e38373476dbc3d6a6f244dc0ba9222caf587c5d8a56c5f952e064e815d752a786d6770891775dc2a43739ae05fb94935006c005b41b3aeca229a866 SHA512 dbfc0cc8aa68e26c89da12156046ccf18201759c0e67757ce259a1150934ad7e2d914837701731fbe00aeab9a2f8c996619eb0892b7907de8012fdd7421da0f6 DIST libreoffice-7.6.5.2.tar.xz 281916516 BLAKE2B b0e21dbc9a1c76027065862ca7ea24eba21ffe5dc1862ff50941644f291122396fbf94141cdbed84c54b0251f3c4452db1e4714ec30c35e416a6450a6caf7f2f SHA512 b6289b1c9b7d363a04f8f63b16994a1820468cb4b270a639279046965b8b773cd9aec40eca57528b17990679a6e8a29a17c5e643b50fe5a5c971928904472602 -DIST libreoffice-7.6.6.1.tar.xz 282150652 BLAKE2B 5327e945aeb05d793c647a21fe96cabdb5116617ba4c18423a57fe4ea8f62bab681b6da77f52e16493f6b4ab3e2555f5205f7bf2102320503c07821c9ac7c913 SHA512 26e51eb3d9124be4cf88eeb838f83d3341826b96382bc70b8e4737399410da5da770493f08c33ca3667b6bffb69097ceea79170e3785f9fdf0b27db21d134690 +DIST libreoffice-7.6.6.3.tar.xz 282144120 BLAKE2B 8d6f39046c9793c8dc5e2667e684c32f61b475b83787c75eeacf441a636c7244b032ae2cd7dac75c3077de63c68382e63bb834f69986ef788d78542df087b19b SHA512 822584e1a191aac08f3141ba2dc2b91b0cbd50635a8506e9f3d00e224c997e1ec83957dd8a7dbede28a0ba28e1a8658d7e0b526bf796db286210393a326e6ca3 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f DIST libreoffice-help-24.2.2.1.tar.xz 167069480 BLAKE2B ca1c551a38b2c4250e2c39216e476fab67d72df4adcf5f3ced2e83b0b2ec6f3ae0596a9c7eeb8bfca27e360bfb2b2d32c90e6c1216f0204bc971fe9ba2277446 SHA512 51daafb453d5bfb296a4985a51cb69c1bc0e8559546061440713c3cb6a8021ff54989c02f9d34bd00734e4d4b32d9533d9cffb80f4bcd3fffbed1b6c48a19cb3 DIST libreoffice-help-7.6.4.1.tar.xz 166959028 BLAKE2B fadcd32c50af1d4607ecd20ef7640cfbd1912361a792c324540dee1b5ee78c5f622b8363a5b96a1afb8256618573a0bb6f919a144de98fe88a1331d9241612f0 SHA512 0f72cd933ab7b897ec36f7b29bc5e568be289ea50ae0844e6083ff4957eab3cd313b39ffbda2e58f59de7962a05b371d8d61043d80323bb474e5436d23d3a859 DIST libreoffice-help-7.6.5.2.tar.xz 166958152 BLAKE2B 440a268b8a5ea13abc553a0154f56c39eaec88024e268b1a40f016fb53f368df7610b0e53cbf3a6b9ca87ca7c753d086ad1944b48bab11d1861862c1b345e61c SHA512 f7b2a068f0bfcb35f3ad521c3c41ce26dd0f1abcc2c002e654ea951131b60451b81af964bf8c870615d14c8330bcd1c6d0b941caba390aa86ec6fb53dfe200c3 -DIST libreoffice-help-7.6.6.1.tar.xz 166956308 BLAKE2B 26ec36b28f7e6725817c88668d9156fa3acd7e247a6fe21affad6fc08c6b0e71c952d07576a37bfb548030d40bb45cb6079acf7f5da669c85e96f33564afc595 SHA512 aa427fc1e053138bd5a54da99846dee5b454bd328253226e2925b36f3869881e1e3ae8ca501157bb4d8c325071df1caa587654142f22c616f6939979347e3271 +DIST libreoffice-help-7.6.6.3.tar.xz 166956596 BLAKE2B 217b32cf9d1882b2a60e436bb6319be5c60807bd7bb8ce373a6a2ecbd8d6f2537bd2a13d58ea14f47532a5a780df1815457adc473e2b0107e5e510db144d90a4 SHA512 07ed22d2161770a39e618075aadc5b42f8f5c436938a0aa29351628e61572e6e1d03642d45541dcfebf57dfdd1e558b23a8d596025fb45a1771652ad2860583f DIST skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz 10693272 BLAKE2B 67f2bd33d58c58c59f1ee5fb693a6a7e6a1ace52f269ae0fa6617027e93131031b0af9d44c36e371fe5a38c5b7519a61f9bcf4286a13ef5b06ea7e7eb5cb0a0f SHA512 58d50fdd19cc5df640244e0c765aec6addc3e552701b201772584e8bea7cda12047e4a6af41452c6669aadfc026de29a4a4e7c6b31c7dfff30e29e50ed46fe3d DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B ce8247de4cd6939b0593adf1c3dc6b78cdf4220fbcd2dfb2b9cf6d80d42f9c49f4d93fbe3cff68d079f04cc5801daf20999b288f7fdc85b58e32035151a3616a SHA512 6c10785ed9ab8cdf3385ebd3f3d13a64b850df9cc7a12e513326a84c7a3e6f6235f9f4dbce128eac2e43a2707fe6a6011716de5985adf4742d55879210bf32e9 DIST zxcvbn-c-2.5.tar.gz 1404434 BLAKE2B f0f22fc8643f785e8f9ed42033d6654c2e67aa4e258bbc4fecf533efcf8b86b6d7e67f9042326247c311c42a4e2b24b844e0bae65cdb2e46ea043a2974ffd857 SHA512 d7199b3cc36cd0e401bd8f857132425908307aefcdb1bb635ee81c34cf71ccbcdf0fe36a336a55da1281692b508881b54773afa41379a448863095f4abd5c0e8 diff --git a/app-office/libreoffice/files/libreoffice-7.6.6.1-detect-plasma6.patch b/app-office/libreoffice/files/libreoffice-7.6.6.1-detect-plasma6.patch deleted file mode 100644 index 9a4553db3447..000000000000 --- a/app-office/libreoffice/files/libreoffice-7.6.6.1-detect-plasma6.patch +++ /dev/null @@ -1,153 +0,0 @@ -From 4c836645eb0556a496c80e4604b63b47085020dd Mon Sep 17 00:00:00 2001 -From: Michael Weghorn <m.weghorn@posteo.de> -Date: Thu, 22 Jun 2023 08:40:56 +0200 -Subject: [PATCH] Detect Plasma 6 desktop - -Add detection for Plasma 6, which is currently in development stage. -With the following plasma-workspace commit [1] in place, -KDE_SESSION_VERSION is set to 6, so use that to detect it: - - commit 4c2242d7dfafac161baec3ec316af24d7b48ef8b - Author: Michael Weghorn <m.weghorn@posteo.de> - Date: Thu Jun 22 07:47:31 2023 +0200 - - Set KDE_SESSION_VERSION to 6 - - Since the master branch is based on Qt6/KF6 and will - become Plasma 6, set KDE_SESSION_VERSION to "6". - - This will allow other applications to detect they're - running in a (preview of a) Plasma 6 session and react - accordingly. - (E.g. LibreOffice can use this to choose to - use its upcoming kf6 integration by default instead of the - kf5 one.) - -[1] https://invent.kde.org/plasma/plasma-workspace/-/commit/4c2242d7dfafac161baec3ec316af24d7b48ef8b - -Change-Id: I5a15ad1fb177721fbfa016139c56a08b228f2e1f -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153437 -Tested-by: Jenkins -Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> -(cherry picked from commit 8b0e1f2a914d672182d585d8cb2d4a815e88977e) -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164700 -Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> ---- - vcl/inc/unx/desktops.hxx | 1 + - vcl/source/app/IconThemeSelector.cxx | 1 + - vcl/source/app/salplug.cxx | 4 ++-- - vcl/unx/generic/desktopdetect/desktopdetector.cxx | 11 +++++++++++ - vcl/unx/kf5/KF5SalInstance.cxx | 8 +++++--- - 5 files changed, 20 insertions(+), 5 deletions(-) - -diff --git a/vcl/inc/unx/desktops.hxx b/vcl/inc/unx/desktops.hxx -index 0abb6aa71339..2056c2c37928 100644 ---- a/vcl/inc/unx/desktops.hxx -+++ b/vcl/inc/unx/desktops.hxx -@@ -33,6 +33,7 @@ enum SAL_DLLPUBLIC_RTTI DesktopType - DESKTOP_XFCE, - DESKTOP_MATE, - DESKTOP_PLASMA5, -+ DESKTOP_PLASMA6, - DESKTOP_LXQT - }; // keep in sync with desktop_strings[] in salplug.cxx - -diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx -index 6b8dfc0f42c7..15eb4b7768fc 100644 ---- a/vcl/source/app/IconThemeSelector.cxx -+++ b/vcl/source/app/IconThemeSelector.cxx -@@ -70,6 +70,7 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi - #else - OUString r; - if ( desktopEnvironment.equalsIgnoreAsciiCase("plasma5") || -+ desktopEnvironment.equalsIgnoreAsciiCase("plasma6") || - desktopEnvironment.equalsIgnoreAsciiCase("lxqt") ) { - if (!bPreferDarkIconTheme) - r = "breeze"; -diff --git a/vcl/source/app/salplug.cxx b/vcl/source/app/salplug.cxx -index e51375b94ae5..fee5b7e33e6d 100644 ---- a/vcl/source/app/salplug.cxx -+++ b/vcl/source/app/salplug.cxx -@@ -249,7 +249,7 @@ const char* const* autodetect_plugin_list() - desktop == DESKTOP_XFCE || - desktop == DESKTOP_MATE ) - pList = pStandardFallbackList; -- else if (desktop == DESKTOP_PLASMA5 || desktop == DESKTOP_LXQT) -+ else if (desktop == DESKTOP_PLASMA5 || desktop == DESKTOP_PLASMA6 || desktop == DESKTOP_LXQT) - pList = pKDEFallbackList; - - return pList; -@@ -426,7 +426,7 @@ const OUString& SalGetDesktopEnvironment() - // Order to match desktops.hxx' DesktopType - static const char * const desktop_strings[] = { - "none", "unknown", "GNOME", "UNITY", -- "XFCE", "MATE", "PLASMA5", "LXQT" }; -+ "XFCE", "MATE", "PLASMA5", "PLASMA6", "LXQT" }; - static OUString aDesktopEnvironment; - if( aDesktopEnvironment.isEmpty()) - { -diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx -index bad134fbdafd..8baeb303feed 100644 ---- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx -+++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx -@@ -117,6 +117,13 @@ static bool is_plasma5_desktop() - return pFullVersion && pSessionVersion && (0 == strcmp(pSessionVersion, "5")); - } - -+static bool is_plasma6_desktop() -+{ -+ static const char* pFullVersion = getenv("KDE_FULL_SESSION"); -+ static const char* pSessionVersion = getenv("KDE_SESSION_VERSION"); -+ return pFullVersion && pSessionVersion && (0 == strcmp(pSessionVersion, "6")); -+} -+ - extern "C" - { - -@@ -132,6 +139,8 @@ DESKTOP_DETECTOR_PUBLIC DesktopType get_desktop_environment() - return DESKTOP_LXQT; - if (aOver.equalsIgnoreAsciiCase("plasma5") || aOver.equalsIgnoreAsciiCase("plasma")) - return DESKTOP_PLASMA5; -+ if (aOver.equalsIgnoreAsciiCase("plasma6")) -+ return DESKTOP_PLASMA6; - if ( aOver.equalsIgnoreAsciiCase( "gnome" ) ) - return DESKTOP_GNOME; - if ( aOver.equalsIgnoreAsciiCase( "gnome-wayland" ) ) -@@ -190,6 +199,8 @@ DESKTOP_DETECTOR_PUBLIC DesktopType get_desktop_environment() - - if (is_plasma5_desktop()) - return DESKTOP_PLASMA5; -+ if (is_plasma6_desktop()) -+ return DESKTOP_PLASMA6; - - // tdf#121275 if we still can't tell, and WAYLAND_DISPLAY - // is set, default to gtk3 -diff --git a/vcl/unx/kf5/KF5SalInstance.cxx b/vcl/unx/kf5/KF5SalInstance.cxx -index df5108e147a1..05f555f356f5 100644 ---- a/vcl/unx/kf5/KF5SalInstance.cxx -+++ b/vcl/unx/kf5/KF5SalInstance.cxx -@@ -41,7 +41,8 @@ KF5SalInstance::KF5SalInstance(std::unique_ptr<QApplication>& pQApp, bool bUseCa - - bool KF5SalInstance::hasNativeFileSelection() const - { -- if (Application::GetDesktopEnvironment() == "PLASMA5") -+ const OUString sDesktop = Application::GetDesktopEnvironment(); -+ if (sDesktop == "PLASMA5" || sDesktop == "PLASMA6") - return true; - return QtInstance::hasNativeFileSelection(); - } -@@ -61,8 +62,9 @@ KF5SalInstance::createPicker(css::uno::Reference<css::uno::XComponentContext> co - - // In order to insert custom controls, KF5FilePicker currently relies on KFileWidget - // being used in the native file picker, which is only the case for KDE Plasma. -- // Therefore, return the plain qt5 one in order to not lose custom controls. -- if (Application::GetDesktopEnvironment() == "PLASMA5") -+ // Therefore, return the plain qt5/qt6 one in order to not lose custom controls otherwise. -+ const OUString sDesktop = Application::GetDesktopEnvironment(); -+ if (sDesktop == "PLASMA5" || sDesktop == "PLASMA6") - return new KF5FilePicker(context, eMode); - return QtInstance::createPicker(context, eMode); - } --- -2.44.0 - diff --git a/app-office/libreoffice/libreoffice-7.6.6.1.ebuild b/app-office/libreoffice/libreoffice-7.6.6.3.ebuild index 0876e72c14a8..d329808a9508 100644 --- a/app-office/libreoffice/libreoffice-7.6.6.1.ebuild +++ b/app-office/libreoffice/libreoffice-7.6.6.3.ebuild @@ -296,9 +296,6 @@ PATCHES=( "${FILESDIR}/${PN}-6.1-nomancompress.patch" "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch" - # 7.6 branch: - "${FILESDIR}/${PN}-7.6.6.1-detect-plasma6.patch" # bug 926227 - # maybe upstreamable "${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch" ) |