mirror of
https://abf.rosa.ru/djam/libreoffice.git
synced 2025-02-23 10:32:59 +00:00
Merge pull request #1 from import/libreoffice:rosa2019.1
Backports and update
This commit is contained in:
commit
3abc771768
12 changed files with 611 additions and 2406 deletions
33
.abf.yml
33
.abf.yml
|
|
@ -1,30 +1,25 @@
|
|||
sources:
|
||||
09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt: 42c9235d7f876645ea6553770e7572c1b0b8609a
|
||||
17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip: 7168b0f40aa5c72267899601c116d2348d2f56ec
|
||||
185d60944ea767075d27247c3162b3bc-unowinreg.dll: 0619ed3a89644bef318df67db12045b2b590585b
|
||||
1be202fbbbc13f10592a98f70a4a87fb-OOOP-templates-pack-2.9.0.0.zip: 1dd5bd9962e851b5e487b0c2033b5a8951aaefad
|
||||
1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt: 206a371b46a3d991722b059b5d6f3bb29f1fc48b
|
||||
27211596cf0ad97cab7321239406fde0-gdocs_3.0.1_modified.oxt: 6d400d83fa2080847ad9d7e2ca466a98ee2dbfa4
|
||||
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip: 1acea86fd399ed7817879d36370d3d1f8b109050
|
||||
472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt: d2b6a076b40d8d517075e52220ddd8f89f655c8f
|
||||
4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt: bf25bef71f72a4622089c85958bfd6c58d8516a6
|
||||
4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2: 1169780b4a0c515b23b96c913fd9bc52ceb7fb39
|
||||
53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt: 4fea33622d89c7ac62053e5ee3616cfe504e0f14
|
||||
62c0b97e94fe47d5e50ff605d2edf37a-hsqldb-2.3.3.zip: f5fce3d5eb21294f9ffba40c34e7c736ab64d6b9
|
||||
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip: 8a90669029e107b61953b90ba11545fef586c2ca
|
||||
884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf: d336802a36ed2c87dd243e7c2f1d0542dace5cca
|
||||
Mandriva-Rosa_Icons.tar.bz2: 53448c079fcb3008d1fdec7f95305fe392460c1f
|
||||
OpenCOLLADA-master-6509aa13af.tar.bz2: c4f5760a1d21213dc52e2cf3ad9c0b9112585f36
|
||||
a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt: d831314cf4c74f5afb3b37ee718dd58f981b97a8
|
||||
a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip: 2d49e11b0b711970f494294dc3698f05eb294853
|
||||
af9314c5972d95a5d6da23ffad818f68-OOOP-gallery-pack-2.8.0.0.zip: c71f095bf032e29ab0afc277fd2718e592ba6ba4
|
||||
apache-ant-1.8.1-bin.tar.bz2: 0e0359f04b3d84fed75b3a1ab02cbc415c8864a1
|
||||
b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt: 27847d6c320297905303ca7d2a45dbd0c492f705
|
||||
b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt: a476a199de32a32221132c8e77fad96c88616b08
|
||||
apache-ant-1.10.8-bin.tar.bz2: 6ea3bc28d2ad860bd460a1cc99e56f230bf0615f
|
||||
b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2: aa8faa4f9e6721eed9bc6878862d74d0cb23251c
|
||||
b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt: bdec3915c01cd60e20892376aa5e5a0d3980c389
|
||||
barcode_1.3.5.0.oxt: 3f7bc3483687f14040dfa6bea70aa38cdbe25897
|
||||
dtoa-20180411.tgz: 083509db5ad9d1680830be9add727d58b54ca0d3
|
||||
f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf: dd55efd721df8a013709e27836bdf26623e5320e
|
||||
libreoffice-7.1.0.1.tar.xz: c90d94b346640ef248e7c0fbe606ed1b40b69b02
|
||||
libreoffice-dictionaries-7.1.0.1.tar.xz: 4eebedf8e05f9268870774951bbac352f882433b
|
||||
libreoffice-help-7.1.0.1.tar.xz: 5303294af7e3309a1c67312f9e9026338e0e4b80
|
||||
libreoffice-translations-7.1.0.1.tar.xz: bd467250164ca50f2264db903aacef807389ccfe
|
||||
lxml-4.1.1.tgz: 154279bc5939d7099697887ea15c5ca921abeaeb
|
||||
pdfium-3794.tar.bz2: 41ff3c2291c99db71ddca1873115b7fc0bfb5065
|
||||
libreoffice-6.3.2.2.tar.xz: e2967958910cda16a218ad2832849a767be38a38
|
||||
libreoffice-dictionaries-6.3.2.2.tar.xz: bfd07359fc34b7ce6285fee5978185a3b08c4d58
|
||||
libreoffice-help-6.3.2.2.tar.xz: 0a8a8c2631f9c901639367bcd407192a672c9dfe
|
||||
libreoffice-translations-6.3.2.2.tar.xz: 0aac0e4a9fe88c09b000fa2c4b086cb5ed50974f
|
||||
|
||||
odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar: a2aaff3c6e19d7442295ca8a1c39e8c3a8b4081a
|
||||
pdfium-4306.tar.bz2: 54d08dff0044285fbdc82763f920987badee4a94
|
||||
skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz: 879ebbf154ec1a263506ca878ee337312ea6a39c
|
||||
smart_0.9.4_en_hu_corrected.oxt: b888d8b18d3252ec4b04bfb8913f5df356b9c053
|
||||
|
|
|
|||
24
0001-Force-icons-in-menus-in-GTK-3-VCLs.patch
Normal file
24
0001-Force-icons-in-menus-in-GTK-3-VCLs.patch
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
From a1c8189f02ee694f049b2e04b9baffab3fafea22 Mon Sep 17 00:00:00 2001
|
||||
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
||||
Date: Sun, 5 Apr 2020 20:53:46 +0300
|
||||
Subject: [PATCH] Force icons in menus in GTK+3 VCLs
|
||||
|
||||
By default both IsSystemIconsInMenus and ShowIconsInMenues are true,
|
||||
but IsSystemIconsInMenus being true forces taking GTK 3 default to not show icons.
|
||||
|
||||
I beleive that icons help people to use menus.
|
||||
Also, we are migrating users from libreoffice-kde4 to libreoffice-gtk3-kde5,
|
||||
kde4 did show icons, so we would better keep them on.
|
||||
|
||||
diff -urN libreoffice-6.4.4.2/officecfg/registry/schema/org/openoffice/Office/Common.xcs libreoffice-6.4.4.2-patched/officecfg/registry/schema/org/openoffice/Office/Common.xcs
|
||||
--- libreoffice-6.4.4.2/officecfg/registry/schema/org/openoffice/Office/Common.xcs 2020-05-13 14:19:20.000000000 +0300
|
||||
+++ libreoffice-6.4.4.2-patched/officecfg/registry/schema/org/openoffice/Office/Common.xcs 2020-06-03 11:29:32.879527737 +0300
|
||||
@@ -2875,7 +2875,7 @@
|
||||
<desc>Indicates whether icons in the office menus should
|
||||
shown/hidden by following the System theme.</desc>
|
||||
</info>
|
||||
- <value>true</value>
|
||||
+ <value>false</value>
|
||||
</prop>
|
||||
<prop oor:name="ShowIconsInMenues" oor:type="xs:boolean" oor:nillable="false">
|
||||
<!-- OldPath: General/View -->
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
|
||||
<html>
|
||||
<head>
|
||||
<title>T-Online Navigationshilfe</title>
|
||||
</head>
|
||||
<frameset rows="100%">
|
||||
<frame src="https://navigationshilfe.t-online.de/dnserror?url=hg.services.openoffice.org/"
|
||||
frameborder="0" noresize="noresize"/>
|
||||
<noframes>
|
||||
<body>
|
||||
<h1>Willkommen bei T-Online</h1>
|
||||
<p>
|
||||
<a href="https://navigationshilfe.t-online.de/dnserror?url=hg.services.openoffice.org/">
|
||||
weiter....</a>
|
||||
</p>
|
||||
</body>
|
||||
</noframes>
|
||||
</frameset>
|
||||
</html>
|
||||
22
gtk3_kde5-priority.patch
Normal file
22
gtk3_kde5-priority.patch
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
diff -urN libreoffice-6.4.4.2/vcl/source/app/salplug.cxx libreoffice-6.4.4.2-patched/vcl/source/app/salplug.cxx
|
||||
--- libreoffice-6.4.4.2/vcl/source/app/salplug.cxx 2020-05-13 14:19:20.000000000 +0300
|
||||
+++ libreoffice-6.4.4.2-patched/vcl/source/app/salplug.cxx 2020-06-03 11:24:42.069512831 +0300
|
||||
@@ -149,12 +149,15 @@
|
||||
{
|
||||
static const char* const pKDEFallbackList[] =
|
||||
{
|
||||
-#if ENABLE_KF5
|
||||
- "kf5",
|
||||
-#endif
|
||||
#if ENABLE_GTK3_KDE5
|
||||
+// prefer gtk3_kde5 over kde5 because of maturity of gtk3 rendering;
|
||||
+// based on kde4 vcl experience, I don't trust kde5 VCL,
|
||||
+// and other people wrote about problems in it //mikhailnov
|
||||
"gtk3_kde5",
|
||||
#endif
|
||||
+#if ENABLE_KF5
|
||||
+ "kf5",
|
||||
+#endif
|
||||
"gtk3", "gen", nullptr
|
||||
};
|
||||
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
diff -Naur libreoffice-4.2.5.2.orig/i18npool/source/breakiterator/data/char_in.txt libreoffice-4.2.5.2/i18npool/source/breakiterator/data/char_in.txt
|
||||
--- libreoffice-4.2.5.2.orig/i18npool/source/breakiterator/data/char_in.txt 2014-06-12 12:25:19.000000000 +0400
|
||||
+++ libreoffice-4.2.5.2/i18npool/source/breakiterator/data/char_in.txt 2014-06-20 11:55:03.763713998 +0400
|
||||
@@ -15,7 +15,6 @@
|
||||
$CR = [\p{Grapheme_Cluster_Break = CR}];
|
||||
$LF = [\p{Grapheme_Cluster_Break = LF}];
|
||||
$Control = [\p{Grapheme_Cluster_Break = Control}];
|
||||
-$Prepend = [\p{Grapheme_Cluster_Break = Prepend}];
|
||||
$Extend = [\p{Grapheme_Cluster_Break = Extend}];
|
||||
$SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
|
||||
$BengaliLetter = [\u0985-\u09B9 \u09CE \u09DC-\u09E1 \u09F0-\u09F1];
|
||||
@@ -73,7 +72,6 @@
|
||||
[^$Control $CR $LF] $Extend;
|
||||
|
||||
[^$Control $CR $LF] $SpacingMark;
|
||||
-$Prepend [^$Control $CR $LF];
|
||||
|
||||
|
||||
## -------------------------------------------------
|
||||
@@ -95,7 +93,6 @@
|
||||
|
||||
$Extend [^$Control $CR $LF];
|
||||
$SpacingMark [^$Control $CR $LF];
|
||||
-[^$Control $CR $LF] $Prepend;
|
||||
|
||||
|
||||
## -------------------------------------------------
|
||||
diff -Naur libreoffice-4.2.5.2.orig/i18npool/source/breakiterator/data/char.txt libreoffice-4.2.5.2/i18npool/source/breakiterator/data/char.txt
|
||||
--- libreoffice-4.2.5.2.orig/i18npool/source/breakiterator/data/char.txt 2014-06-12 12:25:19.000000000 +0400
|
||||
+++ libreoffice-4.2.5.2/i18npool/source/breakiterator/data/char.txt 2014-06-20 11:55:03.742713998 +0400
|
||||
@@ -16,7 +16,6 @@
|
||||
$CR = [\p{Grapheme_Cluster_Break = CR}];
|
||||
$LF = [\p{Grapheme_Cluster_Break = LF}];
|
||||
$Control = [\p{Grapheme_Cluster_Break = Control}];
|
||||
-$Prepend = [\p{Grapheme_Cluster_Break = Prepend}];
|
||||
$Extend = [\p{Grapheme_Cluster_Break = Extend}];
|
||||
$SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
|
||||
# True Indic wants to move by syllables. Break up SpacingMark. This based on Unicode 6.0 data
|
||||
203
libreoffice-6.4.4.2-kde4-detection.patch
Normal file
203
libreoffice-6.4.4.2-kde4-detection.patch
Normal file
|
|
@ -0,0 +1,203 @@
|
|||
diff -urN libreoffice-6.4.4.2/vcl/inc/unx/desktops.hxx libreoffice-6.4.4.2-patched/vcl/inc/unx/desktops.hxx
|
||||
--- libreoffice-6.4.4.2/vcl/inc/unx/desktops.hxx 2020-05-13 14:19:20.000000000 +0300
|
||||
+++ libreoffice-6.4.4.2-patched/vcl/inc/unx/desktops.hxx 2020-06-03 15:34:37.770413281 +0300
|
||||
@@ -31,6 +31,7 @@
|
||||
DESKTOP_UNITY,
|
||||
DESKTOP_XFCE,
|
||||
DESKTOP_MATE,
|
||||
+ DESKTOP_KDE4,
|
||||
DESKTOP_PLASMA5,
|
||||
DESKTOP_LXQT
|
||||
}; // keep in sync with desktop_strings[] in salplug.cxx
|
||||
diff -urN libreoffice-6.4.4.2/vcl/source/app/IconThemeSelector.cxx libreoffice-6.4.4.2-patched/vcl/source/app/IconThemeSelector.cxx
|
||||
--- libreoffice-6.4.4.2/vcl/source/app/IconThemeSelector.cxx 2020-05-13 14:19:20.000000000 +0300
|
||||
+++ libreoffice-6.4.4.2-patched/vcl/source/app/IconThemeSelector.cxx 2020-06-03 15:36:36.153752538 +0300
|
||||
@@ -60,7 +60,8 @@
|
||||
return "colibre";
|
||||
#else
|
||||
OUString r;
|
||||
- if ( desktopEnvironment.equalsIgnoreAsciiCase("plasma5") ||
|
||||
+ if ( desktopEnvironment.equalsIgnoreAsciiCase("kde4") ||
|
||||
+ desktopEnvironment.equalsIgnoreAsciiCase("plasma5") ||
|
||||
desktopEnvironment.equalsIgnoreAsciiCase("lxqt") ) {
|
||||
r = "breeze";
|
||||
}
|
||||
diff -urN libreoffice-6.4.4.2/vcl/source/app/salplug.cxx libreoffice-6.4.4.2-patched/vcl/source/app/salplug.cxx
|
||||
--- libreoffice-6.4.4.2/vcl/source/app/salplug.cxx 2020-05-13 14:19:20.000000000 +0300
|
||||
+++ libreoffice-6.4.4.2-patched/vcl/source/app/salplug.cxx 2020-06-03 15:34:37.783746616 +0300
|
||||
@@ -95,6 +95,8 @@
|
||||
* not access the 'gnome_accessibility_module_shutdown' anymore.
|
||||
* So make sure libgtk+ & co are still mapped into memory when
|
||||
* atk-bridge's atexit handler gets called.
|
||||
+ * * #i109007# KDE3 seems to have the same problem.
|
||||
+ * * And same applies for KDE4.
|
||||
*/
|
||||
if( aUsedModuleBase == "gtk3" || aUsedModuleBase == "gtk3_kde5" || aUsedModuleBase == "win" )
|
||||
{
|
||||
@@ -185,7 +187,9 @@
|
||||
desktop == DESKTOP_XFCE ||
|
||||
desktop == DESKTOP_MATE )
|
||||
pList = pStandardFallbackList;
|
||||
- else if (desktop == DESKTOP_PLASMA5 || desktop == DESKTOP_LXQT)
|
||||
+ else if (desktop == DESKTOP_KDE4 ||
|
||||
+ desktop == DESKTOP_PLASMA5 ||
|
||||
+ desktop == DESKTOP_LXQT)
|
||||
pList = pKDEFallbackList;
|
||||
|
||||
SalInstance* pInst = nullptr;
|
||||
@@ -317,7 +321,7 @@
|
||||
// Order to match desktops.hxx' DesktopType
|
||||
static const char * const desktop_strings[] = {
|
||||
"none", "unknown", "GNOME", "UNITY",
|
||||
- "XFCE", "MATE", "PLASMA5", "LXQT" };
|
||||
+ "XFCE", "MATE", "KDE4", "PLASMA5", "LXQT" };
|
||||
static OUString aDesktopEnvironment;
|
||||
if( aDesktopEnvironment.isEmpty())
|
||||
{
|
||||
diff -urN libreoffice-6.4.4.2/vcl/unx/generic/desktopdetect/desktopdetector.cxx libreoffice-6.4.4.2-patched/vcl/unx/generic/desktopdetect/desktopdetector.cxx
|
||||
--- libreoffice-6.4.4.2/vcl/unx/generic/desktopdetect/desktopdetector.cxx 2020-05-13 14:19:20.000000000 +0300
|
||||
+++ libreoffice-6.4.4.2-patched/vcl/unx/generic/desktopdetect/desktopdetector.cxx 2020-06-03 15:34:37.787079949 +0300
|
||||
@@ -110,6 +110,80 @@
|
||||
return ret;
|
||||
}
|
||||
|
||||
+static bool bWasXError = false;
|
||||
+
|
||||
+static bool WasXError()
|
||||
+{
|
||||
+ bool bRet = bWasXError;
|
||||
+ bWasXError = false;
|
||||
+ return bRet;
|
||||
+}
|
||||
+
|
||||
+extern "C"
|
||||
+{
|
||||
+ static int autodect_error_handler( Display*, XErrorEvent* )
|
||||
+ {
|
||||
+ bWasXError = true;
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
+ typedef int(* XErrorHandler)(Display*,XErrorEvent*);
|
||||
+}
|
||||
+
|
||||
+static int KDEVersion( Display* pDisplay )
|
||||
+{
|
||||
+ int nRet = 0;
|
||||
+
|
||||
+ Atom nFullSession = XInternAtom( pDisplay, "KDE_FULL_SESSION", True );
|
||||
+ Atom nKDEVersion = XInternAtom( pDisplay, "KDE_SESSION_VERSION", True );
|
||||
+
|
||||
+ if( nFullSession )
|
||||
+ {
|
||||
+ if( !nKDEVersion )
|
||||
+ return 3;
|
||||
+
|
||||
+ Atom aRealType = None;
|
||||
+ int nFormat = 8;
|
||||
+ unsigned long nItems = 0;
|
||||
+ unsigned long nBytesLeft = 0;
|
||||
+ unsigned char* pProperty = nullptr;
|
||||
+ XGetWindowProperty( pDisplay,
|
||||
+ DefaultRootWindow( pDisplay ),
|
||||
+ nKDEVersion,
|
||||
+ 0, 1,
|
||||
+ False,
|
||||
+ AnyPropertyType,
|
||||
+ &aRealType,
|
||||
+ &nFormat,
|
||||
+ &nItems,
|
||||
+ &nBytesLeft,
|
||||
+ &pProperty );
|
||||
+ if( !WasXError() && nItems != 0 && pProperty )
|
||||
+ {
|
||||
+ nRet = *reinterpret_cast< sal_Int32* >( pProperty );
|
||||
+ }
|
||||
+ if( pProperty )
|
||||
+ {
|
||||
+ XFree( pProperty );
|
||||
+ pProperty = nullptr;
|
||||
+ }
|
||||
+ }
|
||||
+ return nRet;
|
||||
+}
|
||||
+
|
||||
+static bool is_kde4_desktop( Display* pDisplay )
|
||||
+{
|
||||
+ static const char * pFullVersion = getenv( "KDE_FULL_SESSION" );
|
||||
+ static const char * pSessionVersion = getenv( "KDE_SESSION_VERSION" );
|
||||
+ if ( pFullVersion && pSessionVersion && strcmp(pSessionVersion, "4") == 0 )
|
||||
+ return true;
|
||||
+
|
||||
+ if ( KDEVersion( pDisplay ) == 4 )
|
||||
+ return true;
|
||||
+
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
static bool is_plasma5_desktop()
|
||||
{
|
||||
static const char* pFullVersion = getenv("KDE_FULL_SESSION");
|
||||
@@ -130,6 +204,8 @@
|
||||
|
||||
if ( aOver.equalsIgnoreAsciiCase( "lxqt" ) )
|
||||
return DESKTOP_LXQT;
|
||||
+ if ( aOver.equalsIgnoreAsciiCase( "kde4" ) )
|
||||
+ return DESKTOP_KDE4;
|
||||
if (aOver.equalsIgnoreAsciiCase("plasma5") || aOver.equalsIgnoreAsciiCase("plasma"))
|
||||
return DESKTOP_PLASMA5;
|
||||
if ( aOver.equalsIgnoreAsciiCase( "gnome" ) )
|
||||
@@ -238,10 +314,16 @@
|
||||
return DESKTOP_NONE;
|
||||
|
||||
DesktopType ret;
|
||||
- if ( is_gnome_desktop( pDisplay ) )
|
||||
- ret = DESKTOP_GNOME;
|
||||
- else
|
||||
- ret = DESKTOP_UNKNOWN;
|
||||
+ XErrorHandler pOldHdl = XSetErrorHandler( autodect_error_handler );
|
||||
+ if ( is_kde4_desktop( pDisplay ) )
|
||||
+ ret = DESKTOP_KDE4;
|
||||
+ else if ( is_gnome_desktop( pDisplay ) )
|
||||
+ ret = DESKTOP_GNOME;
|
||||
+ else
|
||||
+ ret = DESKTOP_UNKNOWN;
|
||||
+
|
||||
+ // set the default handler again
|
||||
+ XSetErrorHandler( pOldHdl );
|
||||
|
||||
XCloseDisplay( pDisplay );
|
||||
|
||||
diff -urN libreoffice-6.4.4.2/vcl/unx/gtk3_kde5/kde5_filepicker.cxx libreoffice-6.4.4.2-patched/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
|
||||
--- libreoffice-6.4.4.2/vcl/unx/gtk3_kde5/kde5_filepicker.cxx 2020-05-13 14:19:20.000000000 +0300
|
||||
+++ libreoffice-6.4.4.2-patched/vcl/unx/gtk3_kde5/kde5_filepicker.cxx 2020-06-03 15:34:37.787079949 +0300
|
||||
@@ -245,7 +245,7 @@
|
||||
// dialog there in order not to lose the custom controls and insert the custom
|
||||
// widget in the layout returned by QFileDialog::layout()
|
||||
// (which returns nullptr for native file dialogs)
|
||||
- if (Application::GetDesktopEnvironment() == "PLASMA5")
|
||||
+ if (Application::GetDesktopEnvironment() == "PLASMA5" || Application::GetDesktopEnvironment() == "KDE4")
|
||||
{
|
||||
qApp->installEventFilter(this);
|
||||
}
|
||||
diff -urN libreoffice-6.4.4.2/vcl/unx/kf5/KF5SalInstance.cxx libreoffice-6.4.4.2-patched/vcl/unx/kf5/KF5SalInstance.cxx
|
||||
--- libreoffice-6.4.4.2/vcl/unx/kf5/KF5SalInstance.cxx 2020-05-13 14:19:20.000000000 +0300
|
||||
+++ libreoffice-6.4.4.2-patched/vcl/unx/kf5/KF5SalInstance.cxx 2020-06-03 15:34:37.790413282 +0300
|
||||
@@ -52,7 +52,7 @@
|
||||
|
||||
bool KF5SalInstance::hasNativeFileSelection() const
|
||||
{
|
||||
- if (Application::GetDesktopEnvironment() == "PLASMA5")
|
||||
+ if (Application::GetDesktopEnvironment() == "PLASMA5" || Application::GetDesktopEnvironment() == "KDE4")
|
||||
return true;
|
||||
return Qt5Instance::hasNativeFileSelection();
|
||||
}
|
||||
@@ -73,7 +73,7 @@
|
||||
// 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")
|
||||
+ if (Application::GetDesktopEnvironment() == "PLASMA5" || Application::GetDesktopEnvironment() == "KDE4")
|
||||
return new KF5FilePicker(context, eMode);
|
||||
return Qt5Instance::createPicker(context, eMode);
|
||||
}
|
||||
24
libreoffice-7.1.0-find-qrcodegencpp.patch
Normal file
24
libreoffice-7.1.0-find-qrcodegencpp.patch
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
diff -up libreoffice-7.1.0/configure.ac.3~ libreoffice-7.1.0/configure.ac
|
||||
--- libreoffice-7.1.0/configure.ac.3~ 2020-11-13 22:21:50.007939953 +0100
|
||||
+++ libreoffice-7.1.0/configure.ac 2020-11-13 22:22:19.733325777 +0100
|
||||
@@ -10800,7 +10800,7 @@ else
|
||||
AC_MSG_RESULT([external])
|
||||
SYSTEM_QRCODEGEN=TRUE
|
||||
AC_LANG_PUSH([C++])
|
||||
- AC_CHECK_HEADER(qrcodegen/QrCode.hpp, [],
|
||||
+ AC_CHECK_HEADER(qrcodegencpp/QrCode.hpp, [],
|
||||
[AC_MSG_ERROR(qrcodegen headers not found.)], [#include <stdexcept>])
|
||||
AC_CHECK_LIB([qrcodegencpp], [main], [:],
|
||||
[ AC_MSG_ERROR(qrcodegen C++ library not found.) ], [])
|
||||
diff -up libreoffice-7.1.0/cui/source/dialogs/QrCodeGenDialog.cxx.3~ libreoffice-7.1.0/cui/source/dialogs/QrCodeGenDialog.cxx
|
||||
--- libreoffice-7.1.0/cui/source/dialogs/QrCodeGenDialog.cxx.3~ 2020-11-13 22:21:50.007939953 +0100
|
||||
+++ libreoffice-7.1.0/cui/source/dialogs/QrCodeGenDialog.cxx 2020-11-13 22:23:12.731014689 +0100
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
#if ENABLE_QRCODEGEN
|
||||
#if defined(SYSTEM_QRCODEGEN)
|
||||
-#include <qrcodegen/QrCode.hpp>
|
||||
+#include <qrcodegencpp/QrCode.hpp>
|
||||
#else
|
||||
#include <QrCode.hpp>
|
||||
#endif
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
#!/bin/sh
|
||||
l=`echo $1 |sed -e 's,-,_,g'`
|
||||
|
||||
case $1 in
|
||||
ar) ln="Arabic";;
|
||||
bg) ln="Bulgarian";;
|
||||
bn) ln="Bengali";;
|
||||
bs) ln="Bosnian";;
|
||||
ca) ln="Catalan";;
|
||||
cs) ln="Czech";;
|
||||
da) ln="Danish";;
|
||||
de) ln="German";;
|
||||
dz) ln="Dzongkha";;
|
||||
el) ln="Greek";;
|
||||
en-GB) ln="British English";;
|
||||
es) ln="Spanish";;
|
||||
et) ln="Estonian";;
|
||||
eu) ln="Basque";;
|
||||
fi) ln="Finnish";;
|
||||
fr) ln="French";;
|
||||
gl) ln="Galician";;
|
||||
gu) ln="Gujarati";;
|
||||
he) ln="Hebrew";;
|
||||
hi) ln="Hindi";;
|
||||
hr) ln="Croatian";;
|
||||
hu) ln="Hungarian";;
|
||||
it) ln="Italian";;
|
||||
lt) ln="Lithuanian";;
|
||||
lv) ln="Latvian";;
|
||||
ja) ln="Japanese";;
|
||||
ko) ln="Korean";;
|
||||
mk) ln="Macedonian";;
|
||||
nb) ln="Norwegian (Bokmal)";;
|
||||
nl) ln="Dutch";;
|
||||
nn) ln="Norwegian (Nynorsk)";;
|
||||
pl) ln="Polish";;
|
||||
pt) ln="Portuguese";;
|
||||
pt-BR) ln="Brazilian";;
|
||||
ro) ln="Romanian";;
|
||||
ru) ln="Russian";;
|
||||
si) ln="Sinhalese";;
|
||||
sk) ln="Slovak";;
|
||||
sl) ln="Slovenian";;
|
||||
sv) ln="Swedish";;
|
||||
ta) ln="Tamil";;
|
||||
tr) ln="Turkish";;
|
||||
uk) ln="Ukrainian";;
|
||||
zh-CN) ln="Simplified Chinese";;
|
||||
zh-TW) ln="Traditional Chinese";;
|
||||
en-US) ln="English";;
|
||||
*) ln="$l";;
|
||||
esac
|
||||
|
||||
cat <<EOF
|
||||
%package help-$l
|
||||
Summary: ${ln} help for LibreOffice
|
||||
Group: Office
|
||||
Provides: %{ooname}-help = %{EVRD}
|
||||
Provides: LibreOffice-help-${l} = %{EVRD}
|
||||
EOF
|
||||
[ "$l" != "en_US" ] && echo "Requires: %{ooname}-l10n-${l} = %{EVRD}"
|
||||
cat <<EOF
|
||||
%description help-${l}
|
||||
This package contains the localized help files of LibreOffice in
|
||||
${ln}
|
||||
EOF
|
||||
echo "%files help-$l -f file-lists/help_${l}_list.txt"
|
||||
|
|
@ -6,11 +6,4 @@ addFilter("E: zero-length")
|
|||
addFilter("E: incoherent-version-in-name")
|
||||
#false positive
|
||||
addFilter("E: no-dependency-on")
|
||||
addFilter("W: jar-not-indexed")
|
||||
addFilter("W: invalid-license")
|
||||
addFilter("W: devel-file-in-non-devel-package")
|
||||
# 2978 warnings
|
||||
addFilter("W: uncompressed-zip")
|
||||
addFilter("W: only-non-binary-in-usr-lib")
|
||||
addFilter("W: no-documentation")
|
||||
addFilter("W: file-not-in-%lang")
|
||||
addFilter("E: devel-file-in-non-devel-package")
|
||||
|
|
|
|||
2501
libreoffice.spec
2501
libreoffice.spec
File diff suppressed because it is too large
Load diff
71
locales.csv
Normal file
71
locales.csv
Normal file
|
|
@ -0,0 +1,71 @@
|
|||
af;Afrikaans
|
||||
ar;Arabic
|
||||
as;Assamese
|
||||
bg;Bulgarian
|
||||
bn;Bengali
|
||||
br;Breton
|
||||
bs;Bosnian
|
||||
ca;Catalan
|
||||
cs;Czech
|
||||
cy;Welsh
|
||||
da;Danish
|
||||
de;German
|
||||
dz;Dzongkha
|
||||
el;Greek
|
||||
en_GB;British English
|
||||
en_US;American English
|
||||
es;Spanish
|
||||
et;Estonian
|
||||
eu;Basque
|
||||
fa;Farsi
|
||||
fi;Finnish
|
||||
fr;French
|
||||
ga;Irish
|
||||
gl;Galician
|
||||
gu;Gujarati
|
||||
he;Hebrew
|
||||
hi;Hindi
|
||||
hr;Croatian
|
||||
hu;Hungarian
|
||||
it;Italian
|
||||
ja;Japanese
|
||||
kn;Kannada
|
||||
ko;Korean
|
||||
lt;Lithuanian
|
||||
lv;Latvian
|
||||
mai;Maithili
|
||||
ml;Malayalam
|
||||
mk;Macedonian
|
||||
mr;Marathi
|
||||
nb;Norwegian Bokmal
|
||||
nl;Dutch
|
||||
nn;Norwegian Nynorsk
|
||||
nr;Ndebele
|
||||
nso;Northern Shoto
|
||||
or;Oriya
|
||||
pa_IN;Punjabi
|
||||
pl;Polish
|
||||
pt;Portuguese
|
||||
pt_BR;Portuguese Brazilian
|
||||
ro;Romanian
|
||||
ru;Russian
|
||||
shs;Secwepemctsin
|
||||
si;Sinhalese
|
||||
sk;Slovak
|
||||
sl;Slovenian
|
||||
sr;Serbian
|
||||
st;Sotho
|
||||
ss;Swati
|
||||
sv;Swedish
|
||||
ta;Tamil
|
||||
te;Telugu
|
||||
th;Thai
|
||||
tn;Tswana
|
||||
tr;Turkish
|
||||
ts;Tsonga
|
||||
uk;Ukrainian
|
||||
ve;Venda
|
||||
xh;Xhosa
|
||||
zh_CN;Chinese Simplified
|
||||
zh_TW;Chinese Traditional
|
||||
zu;Zulu
|
||||
|
5
loffice-libcxx-wrapper.sh
Normal file
5
loffice-libcxx-wrapper.sh
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
#!/bin/sh
|
||||
|
||||
linker_flags="$(echo "$@" | tr ' ' '\n' | grep '^\-l' | tr '\n' ' ')"
|
||||
|
||||
/usr/bin/clang++ "$@" $LIBCCX_LIBS $linker_flags
|
||||
Loading…
Add table
Reference in a new issue