import libreoffice-7.1.7.2-3.el9
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
parent
59fa187bd2
commit
d7ab19a268
6
.gitignore
vendored
6
.gitignore
vendored
@ -4,6 +4,6 @@ SOURCES/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
|
|||||||
SOURCES/dtoa-20180411.tgz
|
SOURCES/dtoa-20180411.tgz
|
||||||
SOURCES/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
|
SOURCES/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
|
||||||
SOURCES/gpgkey-C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3.gpg.asc
|
SOURCES/gpgkey-C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3.gpg.asc
|
||||||
SOURCES/libreoffice-7.1.5.2.tar.xz
|
SOURCES/libreoffice-7.1.7.2.tar.xz
|
||||||
SOURCES/libreoffice-help-7.1.5.2.tar.xz
|
SOURCES/libreoffice-help-7.1.7.2.tar.xz
|
||||||
SOURCES/libreoffice-translations-7.1.5.2.tar.xz
|
SOURCES/libreoffice-translations-7.1.7.2.tar.xz
|
||||||
|
|||||||
@ -4,6 +4,6 @@
|
|||||||
083509db5ad9d1680830be9add727d58b54ca0d3 SOURCES/dtoa-20180411.tgz
|
083509db5ad9d1680830be9add727d58b54ca0d3 SOURCES/dtoa-20180411.tgz
|
||||||
dd55efd721df8a013709e27836bdf26623e5320e SOURCES/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
|
dd55efd721df8a013709e27836bdf26623e5320e SOURCES/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
|
||||||
7b5fd93d787fbc6d9c2d4025d543730ee8dc4559 SOURCES/gpgkey-C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3.gpg.asc
|
7b5fd93d787fbc6d9c2d4025d543730ee8dc4559 SOURCES/gpgkey-C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3.gpg.asc
|
||||||
712834480f3e1537edaf95a9512f8889e05242e2 SOURCES/libreoffice-7.1.5.2.tar.xz
|
f78cb0b9fe9d264ccab701bd310c6b5cafc5310d SOURCES/libreoffice-7.1.7.2.tar.xz
|
||||||
6d8f78f168f6cf1bbe21c96abf073cc8c7001509 SOURCES/libreoffice-help-7.1.5.2.tar.xz
|
1fbdfbc179ffece0b018d41ae4ba9a85abbfae42 SOURCES/libreoffice-help-7.1.7.2.tar.xz
|
||||||
881371920c0bfad2dcb8bb697bd7a0d14b8f93e3 SOURCES/libreoffice-translations-7.1.5.2.tar.xz
|
6b3b281e626680fca62f2bddbe1c19cc8eb8225e SOURCES/libreoffice-translations-7.1.7.2.tar.xz
|
||||||
|
|||||||
@ -1,36 +0,0 @@
|
|||||||
From a344462ccb324b14dbf17391146f78d84307cbec Mon Sep 17 00:00:00 2001
|
|
||||||
From: Stephan Bergmann <sbergman@redhat.com>
|
|
||||||
Date: Tue, 22 Jun 2021 14:14:34 +0200
|
|
||||||
Subject: [PATCH] Remove unused DOCTYPE from odk/examples xcu file
|
|
||||||
|
|
||||||
The declared entities have apparently never been referenced ever since the
|
|
||||||
file's introduction in 9fa09d43d0dc0ec0ac71bad31b85ce7fc302ee90 "INTEGRATION:
|
|
||||||
CWS sdkinspector2". (And at least xmlreader skips and ignores the content of
|
|
||||||
such document type declarations anyway.)
|
|
||||||
|
|
||||||
Change-Id: I8263200f52bb5f1692090995574619f9c0ec478f
|
|
||||||
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117658
|
|
||||||
Tested-by: Jenkins
|
|
||||||
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
|
||||||
---
|
|
||||||
odk/examples/java/Inspector/ObjectInspector.xcu | 4 ----
|
|
||||||
1 file changed, 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/odk/examples/java/Inspector/ObjectInspector.xcu b/odk/examples/java/Inspector/ObjectInspector.xcu
|
|
||||||
index b7696086629c..d6fb08a0f8ce 100644
|
|
||||||
--- a/odk/examples/java/Inspector/ObjectInspector.xcu
|
|
||||||
+++ b/odk/examples/java/Inspector/ObjectInspector.xcu
|
|
||||||
@@ -16,10 +16,6 @@
|
|
||||||
* except in compliance with the License. You may obtain a copy of
|
|
||||||
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
||||||
-->
|
|
||||||
-<!DOCTYPE local [
|
|
||||||
- <!ENTITY ProductName "Object Inspector">
|
|
||||||
- <!ENTITY ProductVersion "0.8">
|
|
||||||
-]>
|
|
||||||
<oor:component-data
|
|
||||||
xmlns:oor="http://openoffice.org/2001/registry"
|
|
||||||
xmlns:xs="http://www.w3.org/2001/XMLSchema"
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
||||||
@ -0,0 +1,123 @@
|
|||||||
|
From 197efb35e6f9661ecbeac2897d36a25bc2f6433e Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||||
|
Date: Sun, 14 Nov 2021 14:59:38 +0000
|
||||||
|
Subject: [PATCH] Resolves: tdf#140250 don't share adjustments between
|
||||||
|
differerent spinbuttons
|
||||||
|
|
||||||
|
Change-Id: Ib684c746ff3176cf45ea9364efc12f2d6dde1f70
|
||||||
|
---
|
||||||
|
cui/uiconfig/ui/breaknumberoption.ui | 18 ++++++++++++++++--
|
||||||
|
cui/uiconfig/ui/calloutpage.ui | 14 ++++++++++++--
|
||||||
|
svx/uiconfig/ui/sidebareffect.ui | 7 ++++++-
|
||||||
|
3 files changed, 34 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/cui/uiconfig/ui/breaknumberoption.ui b/cui/uiconfig/ui/breaknumberoption.ui
|
||||||
|
index 2641babeeb5d..23fe294ec702 100644
|
||||||
|
--- a/cui/uiconfig/ui/breaknumberoption.ui
|
||||||
|
+++ b/cui/uiconfig/ui/breaknumberoption.ui
|
||||||
|
@@ -9,6 +9,20 @@
|
||||||
|
<property name="step_increment">1</property>
|
||||||
|
<property name="page_increment">10</property>
|
||||||
|
</object>
|
||||||
|
+ <object class="GtkAdjustment" id="adjustment2">
|
||||||
|
+ <property name="lower">2</property>
|
||||||
|
+ <property name="upper">9</property>
|
||||||
|
+ <property name="value">1</property>
|
||||||
|
+ <property name="step_increment">1</property>
|
||||||
|
+ <property name="page_increment">10</property>
|
||||||
|
+ </object>
|
||||||
|
+ <object class="GtkAdjustment" id="adjustment3">
|
||||||
|
+ <property name="lower">2</property>
|
||||||
|
+ <property name="upper">9</property>
|
||||||
|
+ <property name="value">1</property>
|
||||||
|
+ <property name="step_increment">1</property>
|
||||||
|
+ <property name="page_increment">10</property>
|
||||||
|
+ </object>
|
||||||
|
<object class="GtkDialog" id="BreakNumberOption">
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="border_width">6</property>
|
||||||
|
@@ -134,7 +148,7 @@
|
||||||
|
<property name="can_focus">True</property>
|
||||||
|
<property name="halign">start</property>
|
||||||
|
<property name="activates_default">True</property>
|
||||||
|
- <property name="adjustment">adjustment1</property>
|
||||||
|
+ <property name="adjustment">adjustment2</property>
|
||||||
|
<property name="truncate-multiline">True</property>
|
||||||
|
<child internal-child="accessible">
|
||||||
|
<object class="AtkObject" id="afterbreak-atkobject">
|
||||||
|
@@ -179,7 +193,7 @@
|
||||||
|
<property name="can_focus">True</property>
|
||||||
|
<property name="halign">start</property>
|
||||||
|
<property name="activates_default">True</property>
|
||||||
|
- <property name="adjustment">adjustment1</property>
|
||||||
|
+ <property name="adjustment">adjustment3</property>
|
||||||
|
<property name="truncate-multiline">True</property>
|
||||||
|
<child internal-child="accessible">
|
||||||
|
<object class="AtkObject" id="wordlength-atkobject">
|
||||||
|
diff --git a/cui/uiconfig/ui/calloutpage.ui b/cui/uiconfig/ui/calloutpage.ui
|
||||||
|
index 87d4eff64eb4..00898dc3390c 100644
|
||||||
|
--- a/cui/uiconfig/ui/calloutpage.ui
|
||||||
|
+++ b/cui/uiconfig/ui/calloutpage.ui
|
||||||
|
@@ -7,6 +7,16 @@
|
||||||
|
<property name="step_increment">0.5</property>
|
||||||
|
<property name="page_increment">10</property>
|
||||||
|
</object>
|
||||||
|
+ <object class="GtkAdjustment" id="adjustment2">
|
||||||
|
+ <property name="upper">2400</property>
|
||||||
|
+ <property name="step_increment">0.5</property>
|
||||||
|
+ <property name="page_increment">10</property>
|
||||||
|
+ </object>
|
||||||
|
+ <object class="GtkAdjustment" id="adjustment3">
|
||||||
|
+ <property name="upper">2400</property>
|
||||||
|
+ <property name="step_increment">0.5</property>
|
||||||
|
+ <property name="page_increment">10</property>
|
||||||
|
+ </object>
|
||||||
|
<object class="GtkBox" id="CalloutPage">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
@@ -231,7 +241,7 @@
|
||||||
|
<property name="can_focus">True</property>
|
||||||
|
<property name="activates_default">True</property>
|
||||||
|
<property name="text">0.00</property>
|
||||||
|
- <property name="adjustment">adjustment1</property>
|
||||||
|
+ <property name="adjustment">adjustment2</property>
|
||||||
|
<property name="digits">2</property>
|
||||||
|
<property name="truncate-multiline">True</property>
|
||||||
|
<child internal-child="accessible">
|
||||||
|
@@ -277,7 +287,7 @@
|
||||||
|
<property name="can_focus">True</property>
|
||||||
|
<property name="activates_default">True</property>
|
||||||
|
<property name="text">0.00</property>
|
||||||
|
- <property name="adjustment">adjustment1</property>
|
||||||
|
+ <property name="adjustment">adjustment3</property>
|
||||||
|
<property name="digits">2</property>
|
||||||
|
<property name="truncate-multiline">True</property>
|
||||||
|
<child internal-child="accessible">
|
||||||
|
diff --git a/svx/uiconfig/ui/sidebareffect.ui b/svx/uiconfig/ui/sidebareffect.ui
|
||||||
|
index 0e633242cd5c..1e041a2a8726 100644
|
||||||
|
--- a/svx/uiconfig/ui/sidebareffect.ui
|
||||||
|
+++ b/svx/uiconfig/ui/sidebareffect.ui
|
||||||
|
@@ -12,6 +12,11 @@
|
||||||
|
<property name="step_increment">1</property>
|
||||||
|
<property name="page_increment">10</property>
|
||||||
|
</object>
|
||||||
|
+ <object class="GtkAdjustment" id="adjustment3">
|
||||||
|
+ <property name="upper">150</property>
|
||||||
|
+ <property name="step_increment">1</property>
|
||||||
|
+ <property name="page_increment">10</property>
|
||||||
|
+ </object>
|
||||||
|
<!-- n-columns=1 n-rows=1 -->
|
||||||
|
<object class="GtkGrid" id="EffectPropertyPanel">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
@@ -195,7 +200,7 @@
|
||||||
|
<property name="can_focus">True</property>
|
||||||
|
<property name="hexpand">True</property>
|
||||||
|
<property name="truncate-multiline">True</property>
|
||||||
|
- <property name="adjustment">adjustment1</property>
|
||||||
|
+ <property name="adjustment">adjustment3</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">1</property>
|
||||||
|
--
|
||||||
|
2.33.1
|
||||||
|
|
||||||
@ -0,0 +1,63 @@
|
|||||||
|
From ea6cfca48017b76bfeb8898e6d9e47b3011a3add Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||||
|
Date: Sat, 6 Nov 2021 21:32:21 +0000
|
||||||
|
Subject: [PATCH] Resolves: tdf#145567 restore focus to the usual frame focus
|
||||||
|
widget
|
||||||
|
|
||||||
|
when tearing down the start center. Don't leave the focus in an
|
||||||
|
arbitrary widget.
|
||||||
|
|
||||||
|
Change-Id: I82c30c94121dc43b2ea1b4fbc66a0a3e79f7e664
|
||||||
|
---
|
||||||
|
vcl/unx/gtk3/gtk3gtkinst.cxx | 28 ++++++++++++++++++++++++++++
|
||||||
|
1 file changed, 28 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
|
||||||
|
index a5d233e2f95e..0fddb27aaa2d 100644
|
||||||
|
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
|
||||||
|
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
|
||||||
|
@@ -1899,6 +1899,26 @@ GdkDragAction VclToGdk(sal_Int8 dragOperation)
|
||||||
|
return eRet;
|
||||||
|
}
|
||||||
|
|
||||||
|
+GtkWindow* get_active_window()
|
||||||
|
+{
|
||||||
|
+ GtkWindow* pFocus = nullptr;
|
||||||
|
+
|
||||||
|
+ GList* pList = gtk_window_list_toplevels();
|
||||||
|
+
|
||||||
|
+ for (GList* pEntry = pList; pEntry; pEntry = pEntry->next)
|
||||||
|
+ {
|
||||||
|
+ if (gtk_window_has_toplevel_focus(GTK_WINDOW(pEntry->data)))
|
||||||
|
+ {
|
||||||
|
+ pFocus = GTK_WINDOW(pEntry->data);
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ g_list_free(pList);
|
||||||
|
+
|
||||||
|
+ return pFocus;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
class GtkInstanceWidget : public virtual weld::Widget
|
||||||
|
{
|
||||||
|
protected:
|
||||||
|
@@ -16635,6 +16655,14 @@ private:
|
||||||
|
// rehook handler and let vcl cycle its own way through this widget's
|
||||||
|
// children
|
||||||
|
pFrame->AllowCycleFocusOut();
|
||||||
|
+
|
||||||
|
+ // tdf#145567 if the focus is in this hierarchy then, now that we are tearing down,
|
||||||
|
+ // move focus to the usual focus candidate for the frame
|
||||||
|
+ GtkWindow* pFocusWin = get_active_window();
|
||||||
|
+ GtkWidget* pFocus = pFocusWin ? gtk_window_get_focus(pFocusWin) : nullptr;
|
||||||
|
+ bool bHasFocus = pFocus && gtk_widget_is_ancestor(pFocus, pTopLevel);
|
||||||
|
+ if (bHasFocus)
|
||||||
|
+ pFrame->GrabFocus();
|
||||||
|
}
|
||||||
|
|
||||||
|
static void signalUnmap(GtkWidget*, gpointer user_data)
|
||||||
|
--
|
||||||
|
2.33.1
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,45 @@
|
|||||||
|
From ce37356f6bcaaef62a80814d7d54d3aa6d53167d Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||||
|
Date: Tue, 12 Oct 2021 09:52:53 +0100
|
||||||
|
Subject: [PATCH] document-new shouldn't get prefixed to become
|
||||||
|
libreoffice-document-new
|
||||||
|
|
||||||
|
seen by rpminspect as .desktop "references icon libreoffice-document-new
|
||||||
|
but no subpackages contain libreoffice-document-new"
|
||||||
|
|
||||||
|
introduced by:
|
||||||
|
|
||||||
|
commit f767d5e2b017c0d0cfd23ff3318cb30901847722
|
||||||
|
Date: Sun Sep 1 11:30:12 2019 +0200
|
||||||
|
|
||||||
|
Add icons to New Document desktop file actions
|
||||||
|
|
||||||
|
in the [Desktop Action NewDocument] section
|
||||||
|
|
||||||
|
Change-Id: I64ce5e2dbaca32083b2f76e960c33a815f8a3773
|
||||||
|
---
|
||||||
|
sysui/desktop/share/brand.pl | 8 +++++---
|
||||||
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/sysui/desktop/share/brand.pl b/sysui/desktop/share/brand.pl
|
||||||
|
index 9d73e619c495..b17a7374fd62 100644
|
||||||
|
--- a/sysui/desktop/share/brand.pl
|
||||||
|
+++ b/sysui/desktop/share/brand.pl
|
||||||
|
@@ -81,9 +81,11 @@ while ($arg = shift) {
|
||||||
|
# remove possible Windows line-ends
|
||||||
|
chomp;
|
||||||
|
|
||||||
|
- # patch all occurrences of openoffice in ICON line with
|
||||||
|
- # $prefix
|
||||||
|
- s/Icon=/Icon=$iconprefix/;
|
||||||
|
+ # patch all icons in ICON line with $prefix
|
||||||
|
+ if (! /Icon=document-new/ ) { # except for Icon=document-new which
|
||||||
|
+ # is a stock icon, not one of ours
|
||||||
|
+ s/Icon=/Icon=$iconprefix/;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
# patch all occurrences of openoffice in icon_filename
|
||||||
|
# line with $prefix
|
||||||
|
--
|
||||||
|
2.32.0
|
||||||
|
|
||||||
40
SOURCES/0001-fix-comparison-when-searching-cache.patch
Normal file
40
SOURCES/0001-fix-comparison-when-searching-cache.patch
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
From a94b58277c7aeaa83ce14347cd0b8f7137969d03 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@collabora.com>
|
||||||
|
Date: Fri, 29 Oct 2021 14:20:57 +0200
|
||||||
|
Subject: [PATCH] fix comparison when searching cache
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
This made the cache always fail and re-cache, making CJK text layout
|
||||||
|
slower over time. A mistake from ef513fd4b049b214a03fbe6e that
|
||||||
|
converted !strcmp() to != instead of ==.
|
||||||
|
|
||||||
|
Change-Id: Ib70579cd36d7b1df062e4d067e03f5c65e34b142
|
||||||
|
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124432
|
||||||
|
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
||||||
|
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
|
||||||
|
Tested-by: Luboš Luňák <l.lunak@collabora.com>
|
||||||
|
(cherry picked from commit 5b38b5744af1e896892df708c16b83e1b551d2c7)
|
||||||
|
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124206
|
||||||
|
Tested-by: Jenkins
|
||||||
|
---
|
||||||
|
i18npool/source/breakiterator/xdictionary.cxx | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/i18npool/source/breakiterator/xdictionary.cxx b/i18npool/source/breakiterator/xdictionary.cxx
|
||||||
|
index 947a23c5073b..6b57433370c7 100644
|
||||||
|
--- a/i18npool/source/breakiterator/xdictionary.cxx
|
||||||
|
+++ b/i18npool/source/breakiterator/xdictionary.cxx
|
||||||
|
@@ -152,7 +152,7 @@ void xdictionary::initDictionaryData(const char *pLang)
|
||||||
|
osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() );
|
||||||
|
for(const datacache & i : aLoadedCache)
|
||||||
|
{
|
||||||
|
- if( i.maLang != pLang )
|
||||||
|
+ if( i.maLang == pLang )
|
||||||
|
{
|
||||||
|
data = i.maData;
|
||||||
|
return;
|
||||||
|
--
|
||||||
|
2.33.1
|
||||||
|
|
||||||
@ -0,0 +1,111 @@
|
|||||||
|
From 748a9fd3a8e90e52a126190dbe0d97da6e0941ff Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||||
|
Date: Wed, 11 Aug 2021 20:55:14 +0100
|
||||||
|
Subject: [PATCH] make --with-idlc-cpp=cpp work for gcc cpp as a ucpp
|
||||||
|
replacement
|
||||||
|
|
||||||
|
e.g. the example of
|
||||||
|
https://bugs.launchpad.net/ubuntu/+source/libreoffice/+bug/1524638
|
||||||
|
has the same output .urd using cpp with these flags as ucpp created
|
||||||
|
|
||||||
|
Change-Id: Iadfd2deba7d365c66c3260fd6736c031987e107c
|
||||||
|
---
|
||||||
|
config_host.mk.in | 1 +
|
||||||
|
configure.ac | 14 ++++++++++++++
|
||||||
|
idlc/Executable_idlc.mk | 8 ++++++++
|
||||||
|
idlc/source/idlccompile.cxx | 8 ++++++++
|
||||||
|
4 files changed, 31 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/config_host.mk.in b/config_host.mk.in
|
||||||
|
index 58ca1d1c14fb..6810660067b0 100644
|
||||||
|
--- a/config_host.mk.in
|
||||||
|
+++ b/config_host.mk.in
|
||||||
|
@@ -635,6 +635,7 @@ export SYSTEM_RHINO=@SYSTEM_RHINO@
|
||||||
|
export SYSTEM_SERF=@SYSTEM_SERF@
|
||||||
|
export SYSTEM_STAROFFICE=@SYSTEM_STAROFFICE@
|
||||||
|
export SYSTEM_UCPP=@SYSTEM_UCPP@
|
||||||
|
+export SYSTEM_UCPP_IS_GCC=@SYSTEM_UCPP_IS_GCC@
|
||||||
|
export SYSTEM_VISIO=@SYSTEM_VISIO@
|
||||||
|
export SYSTEM_WPD=@SYSTEM_WPD@
|
||||||
|
export SYSTEM_WPG=@SYSTEM_WPG@
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 3d2bf7e24555..ac226fd46ace 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -8807,9 +8807,22 @@ dnl ===================================================================
|
||||||
|
dnl Check for C preprocessor to use
|
||||||
|
dnl ===================================================================
|
||||||
|
AC_MSG_CHECKING([which C preprocessor to use in idlc])
|
||||||
|
+SYSTEM_UCPP_IS_GCC=
|
||||||
|
if test -n "$with_idlc_cpp"; then
|
||||||
|
AC_MSG_RESULT([$with_idlc_cpp])
|
||||||
|
AC_PATH_PROG(SYSTEM_UCPP, $with_idlc_cpp)
|
||||||
|
+ AC_MSG_CHECKING([if $with_idlc_cpp is GCC CPP])
|
||||||
|
+ # ucpp will accept -v (to output version), warn about the others as unknown
|
||||||
|
+ # and return 1 (due to -v)
|
||||||
|
+ # gcc will accept -v (as verbose), --version (to output version) and -nostdinc
|
||||||
|
+ # and return 0 (due to --version ) if all options are supported
|
||||||
|
+ $SYSTEM_UCPP -v --version -nostdinc >/dev/null 2>/dev/null
|
||||||
|
+ if test $? -eq 0; then
|
||||||
|
+ SYSTEM_UCPP_IS_GCC=TRUE
|
||||||
|
+ AC_MSG_RESULT([yes])
|
||||||
|
+ else
|
||||||
|
+ AC_MSG_RESULT([no])
|
||||||
|
+ fi
|
||||||
|
else
|
||||||
|
AC_MSG_RESULT([ucpp])
|
||||||
|
AC_MSG_CHECKING([which ucpp tp use])
|
||||||
|
@@ -8822,6 +8835,7 @@ else
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
AC_SUBST(SYSTEM_UCPP)
|
||||||
|
+AC_SUBST(SYSTEM_UCPP_IS_GCC)
|
||||||
|
|
||||||
|
dnl ===================================================================
|
||||||
|
dnl Check for epm (not needed for Windows)
|
||||||
|
diff --git a/idlc/Executable_idlc.mk b/idlc/Executable_idlc.mk
|
||||||
|
index e194e9049c77..f2f79dcb8911 100644
|
||||||
|
--- a/idlc/Executable_idlc.mk
|
||||||
|
+++ b/idlc/Executable_idlc.mk
|
||||||
|
@@ -35,10 +35,18 @@ $(eval $(call gb_Executable_add_scanners,idlc,\
|
||||||
|
))
|
||||||
|
|
||||||
|
ifneq (,$(SYSTEM_UCPP))
|
||||||
|
+
|
||||||
|
$(eval $(call gb_Executable_add_defs,idlc,\
|
||||||
|
-DSYSTEM_UCPP \
|
||||||
|
-DUCPP=\"file://$(SYSTEM_UCPP)\" \
|
||||||
|
))
|
||||||
|
+
|
||||||
|
+ifneq ($(SYSTEM_UCPP_IS_GCC),)
|
||||||
|
+$(eval $(call gb_Executable_add_defs,idlc,\
|
||||||
|
+ -DSYSTEM_UCPP_IS_GCC \
|
||||||
|
+))
|
||||||
|
+endif
|
||||||
|
+
|
||||||
|
endif
|
||||||
|
|
||||||
|
$(eval $(call gb_Executable_add_exception_objects,idlc,\
|
||||||
|
diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx
|
||||||
|
index bf3325d6821a..1902d63e0cad 100644
|
||||||
|
--- a/idlc/source/idlccompile.cxx
|
||||||
|
+++ b/idlc/source/idlccompile.cxx
|
||||||
|
@@ -237,7 +237,15 @@ sal_Int32 compileFile(const OString * pathname)
|
||||||
|
::std::vector< OUString> lCppArgs;
|
||||||
|
lCppArgs.emplace_back("-DIDL");
|
||||||
|
lCppArgs.emplace_back("-C");
|
||||||
|
+#ifdef SYSTEM_UCPP_IS_GCC
|
||||||
|
+ // -nostdinc Do not search the standard system directories for header files
|
||||||
|
+ lCppArgs.emplace_back("-nostdinc");
|
||||||
|
+ // with gcc cpp, even when not explicitly including anything, /usr/include/stdc-predef.h
|
||||||
|
+ // gets inserted without -nostdinc
|
||||||
|
+#else
|
||||||
|
+ // -zI Do not use the standard (compile-time) include path.
|
||||||
|
lCppArgs.emplace_back("-zI");
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
Options* pOptions = idlc()->getOptions();
|
||||||
|
|
||||||
|
--
|
||||||
|
2.31.1
|
||||||
|
|
||||||
@ -0,0 +1,72 @@
|
|||||||
|
From bced744fea67d50242701ed55271d40e803ac14e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michael Stahl <michael.stahl@allotropia.de>
|
||||||
|
Date: Mon, 15 Nov 2021 17:29:59 +0100
|
||||||
|
Subject: [PATCH] tdf#121546 sw: don't use undo array's m_pOutlineNodes
|
||||||
|
|
||||||
|
It's pointless.
|
||||||
|
|
||||||
|
Change-Id: I304c123bffc16e6133d2953bc9a4f7a3afad14ef
|
||||||
|
---
|
||||||
|
sw/source/core/docnode/ndnum.cxx | 2 ++
|
||||||
|
sw/source/core/docnode/nodes.cxx | 18 ++++++++++++------
|
||||||
|
2 files changed, 14 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/sw/source/core/docnode/ndnum.cxx b/sw/source/core/docnode/ndnum.cxx
|
||||||
|
index b3d66affa66e..a7b898ee5f0a 100644
|
||||||
|
--- a/sw/source/core/docnode/ndnum.cxx
|
||||||
|
+++ b/sw/source/core/docnode/ndnum.cxx
|
||||||
|
@@ -38,6 +38,8 @@ bool SwOutlineNodes::Seek_Entry(SwNode* rP, size_type* pnPos) const
|
||||||
|
|
||||||
|
void SwNodes::UpdateOutlineNode(SwNode & rNd)
|
||||||
|
{
|
||||||
|
+ assert(IsDocNodes()); // no point in m_pOutlineNodes for undo nodes
|
||||||
|
+
|
||||||
|
SwTextNode * pTextNd = rNd.GetTextNode();
|
||||||
|
|
||||||
|
if (!(pTextNd && pTextNd->IsOutlineStateChanged()))
|
||||||
|
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
|
||||||
|
index a7a2078b2091..ab3eb62ac9f2 100644
|
||||||
|
--- a/sw/source/core/docnode/nodes.cxx
|
||||||
|
+++ b/sw/source/core/docnode/nodes.cxx
|
||||||
|
@@ -109,6 +109,16 @@ SwNodes::~SwNodes()
|
||||||
|
m_pEndOfContent.reset();
|
||||||
|
}
|
||||||
|
|
||||||
|
+static bool IsInsertOutline(SwNodes const& rNodes, sal_uLong const nIndex)
|
||||||
|
+{
|
||||||
|
+ if (!rNodes.IsDocNodes())
|
||||||
|
+ {
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+ return nIndex < rNodes.GetEndOfRedlines().StartOfSectionNode()->GetIndex()
|
||||||
|
+ || rNodes.GetEndOfRedlines().GetIndex() < nIndex;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void SwNodes::ChgNode( SwNodeIndex const & rDelPos, sal_uLong nSz,
|
||||||
|
SwNodeIndex& rInsPos, bool bNewFrames )
|
||||||
|
{
|
||||||
|
@@ -124,9 +134,7 @@ void SwNodes::ChgNode( SwNodeIndex const & rDelPos, sal_uLong nSz,
|
||||||
|
|
||||||
|
// NEVER include nodes from the RedLineArea
|
||||||
|
sal_uLong nNd = rInsPos.GetIndex();
|
||||||
|
- bool bInsOutlineIdx = (
|
||||||
|
- rNds.GetEndOfRedlines().StartOfSectionNode()->GetIndex() >= nNd ||
|
||||||
|
- nNd >= rNds.GetEndOfRedlines().GetIndex() );
|
||||||
|
+ bool const bInsOutlineIdx = IsInsertOutline(rNds, nNd);
|
||||||
|
|
||||||
|
if( &rNds == this ) // if in the same node array -> move
|
||||||
|
{
|
||||||
|
@@ -478,9 +486,7 @@ bool SwNodes::MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
|
||||||
|
|
||||||
|
// NEVER include nodes from the RedLineArea
|
||||||
|
sal_uLong nNd = aIdx.GetIndex();
|
||||||
|
- bool bInsOutlineIdx = ( rNodes.GetEndOfRedlines().
|
||||||
|
- StartOfSectionNode()->GetIndex() >= nNd ||
|
||||||
|
- nNd >= rNodes.GetEndOfRedlines().GetIndex() );
|
||||||
|
+ bool const bInsOutlineIdx = IsInsertOutline(rNodes, nNd);
|
||||||
|
|
||||||
|
if( bNewFrames )
|
||||||
|
// delete all frames
|
||||||
|
--
|
||||||
|
2.33.1
|
||||||
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmDx/XsACgkQ9DSh76/u
|
|
||||||
rqNmoA//dMLWq+KgYcBsG24UfAsoHC3yqA1TYT0sbEMpgtFe7uavMJtphv9waPfA
|
|
||||||
9GmKZbHdDXD5BWQ6Bv8BlsCukpWEytw1NsDEhEZFURqp8fdO84Gcp7CFn3uI0ovO
|
|
||||||
yEznp3zAR60ut3tuCZyOB11h+BSldA/W73Z5xRR2ORfUDj4GuHi2+4/IKr5JtF+6
|
|
||||||
YAj4AaHqgxp3MwxE5t/UdfVZLXP6SUvxLU7eoLhcnMLOd5oJAwfhABd5d85yzWZr
|
|
||||||
ZubXD239mYaMKJD1DGERlpqqfRSaMQOzJogIJVCiXr2fmFIsu0IKJVntb99pL/X4
|
|
||||||
DleQsYMiFHS8XHDZpTduhI4GxAwy2YZ/HBm/iUxvbqICuII2UbVVzQJNNqogN4eD
|
|
||||||
pLybFxwdQwpuZn6M6GttmiOR6z6+USX4hzpMXPjNyDmGxlcw56uiF6Q4dmPG5/I7
|
|
||||||
yyobJZWlpJ1WNJ9Qifv25Z8qkTdvfpSBCJxLxeN0SHkAHzYtbcCB9Uq/den0YY5v
|
|
||||||
QgaRRU5CPP0cC8X+zGkdgKI7wngj2NrvSpmG/lat1Rwqh8KlkPTc/yYXlIKoYnoU
|
|
||||||
Hc0EmHxvUxTiE0iKg2WboNG/bGufp0hBisbME10VPLmp5QVwkm4uxfGAjY3kiXol
|
|
||||||
E8G2jebIP6FCcYpC9rdNnQFGTAlRAf4dUoC2CwMLqlRdOy+7+A0=
|
|
||||||
=20Eu
|
|
||||||
-----END PGP SIGNATURE-----
|
|
||||||
16
SOURCES/libreoffice-7.1.7.2.tar.xz.asc
Normal file
16
SOURCES/libreoffice-7.1.7.2.tar.xz.asc
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmF5MyoACgkQ9DSh76/u
|
||||||
|
rqNIlxAAl22pTJr3sHrwuyp9mshPRjn8IY4iTsJilYzBPvn5HArIWXA+AHlSNFO3
|
||||||
|
l8z/+GsR/+5LU/Fa1UeVC76gx8ZH3dAr8QqNRfdQ+d9Lb89WVj5P40bcYQgm2Mo6
|
||||||
|
XSLyZqpieSL7/Z1CFaoQp5kz3wtk4F8XphGiKFjPbND/DPZAWMZLLvRWYUUJ8qUA
|
||||||
|
sq7LiXo+rPqOUR+svMz8EcrpBxPBYK/cEu9Fcrj/ruCznIR8DmVH+TLaOWYwBy53
|
||||||
|
QgcHZ/TTMbTWvJLH0pL6Ha7c12Yxq64EmeNNRi8uP26Cnj3Wo28RSVOxXmvcwQ7y
|
||||||
|
WDOd/e3CyVkNLyHKccrWnhaesvmlInQpjF3u7ZmCNuWI2Tj2LDBKy60HSOn/K7l9
|
||||||
|
hhkGUHYFP4zuyepnxE+3F3elWL2lKnYgOl5cyaiO1+5JeADb2sULXpf7wtSS95P6
|
||||||
|
F6BvILJ3Di1XTTOV7y9OcMp7xRrxEFuLxwz3J3u5g3KagtXcNMaU4aahCX1VbtFg
|
||||||
|
tgemeADXAQZqEHdUgXzRUAy8n85jgyJpRNeFw1dnQ2d8NCbPUuy94H8iHJ77jhD8
|
||||||
|
wplVhlY4andmwz2If+SulzLzmn/fKCtnrd1Q8z7sA6N7wbbQANO6/qQQs0k2Tr6W
|
||||||
|
N/uKfCZKfLBXONG3ybdsd/le86ZPKnvaR3r0QnQlUbFXQAn3ark=
|
||||||
|
=Za4s
|
||||||
|
-----END PGP SIGNATURE-----
|
||||||
@ -1,16 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmDx/YQACgkQ9DSh76/u
|
|
||||||
rqPJ6g/9GLHnDRA48oPHKaXpZCZ0J7pzNlRFMrSuEpAyyRlkYX5/XRrWQKRUbalJ
|
|
||||||
qFCybU2nTiNRb8N3xiWb7y24+aNpPUZkx7rnU7Vm69TNe19WR9xKxkBhdWBkQLrD
|
|
||||||
tEv/mR0xOBHLdc+Q7cNCVzrQ3UWZIRChfmeNAgIl+DzVX1qMi60v8oANfuGJJxAa
|
|
||||||
l6Yj8lYm+04qfX8dPk4XZM9kTgJQMlLZMSbbPFwuoaJjuIsBi3Wu33Ppxvf37LpS
|
|
||||||
H6418wROajZ74Owa0htB2aAjQwIZjS/90noqY2SxGPBNf9gMNRmRTCX/mudAFUgZ
|
|
||||||
smkqRjoBZm+ZCDq2Oz8k4oEHsj1TUtIs5QhZI8VqToIA/y53SBn3bq42yME+0P/V
|
|
||||||
2V4pe6Qy0hv9u/YXsBAbLbXXVbr0LOaBe3BNK0dbdGBu1NWt8WLP1FBYpcKNl2Xw
|
|
||||||
0Ee/mS6JHoT1EGmKKaghml29zvqoQhqx1fUHN/l6zuxwvaTr18Ob8KRHsksXUde8
|
|
||||||
4ULdO/O7QLTcNnI8CaPD3giIcihBEWvoMHtWUWHG1b39EUEfUs+djzyzK7jQZ3Ux
|
|
||||||
btUMDUUDth2sY8HVVdg3p4HUbehiRooEDRJCg/XxLsasA3d6siwPy2/vEciadmEi
|
|
||||||
iMTTyFxv5mQd1Bcg+lCPJRQ8ohL0GUeaFeMpSp3BF8uI3zq9NdM=
|
|
||||||
=Ej8U
|
|
||||||
-----END PGP SIGNATURE-----
|
|
||||||
16
SOURCES/libreoffice-help-7.1.7.2.tar.xz.asc
Normal file
16
SOURCES/libreoffice-help-7.1.7.2.tar.xz.asc
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmF5MzAACgkQ9DSh76/u
|
||||||
|
rqPVvRAAtejhoQH4VXVAGvuCC9BRxBqmEhHUEdW2vxNZ42sX6OggTIgK5q58Uwa7
|
||||||
|
2glVf0x+c/RxDFF68BfhiXoy4amIoJ6rFe2dLQzwfI0WmjFfSFaMCcthUnQa9giz
|
||||||
|
5U9p72apoYk2lUQEqarLthY1903DNB83bR1lUgB80mx13+xoRRCsEJ4cgltPE17c
|
||||||
|
0Ntb+sA6eETeKe8PvAK4SIApIJn/J26hZ6Qhoc74rcNpSiEtIKKChaLLB7rzmMQR
|
||||||
|
LZ6jDBMC7PmK+S/ppG8dWu0v4W+jirZhVKTDXFb90itVEAywlSUy+QgANFS8zEot
|
||||||
|
8yxH2n7Hv4ZnBCeP2nLK888al+e2V3i+H/2Jm+9NRvF8aWTDMjMmWas4VGhrkDXM
|
||||||
|
NYl37twVDY7Wq9jbw7YAht/LV7N8z0fnzaX/M5hUFnxS82+sf1/9UF8eKp4m4mCF
|
||||||
|
ir7nIQiwmtZHx1tMJhtooZA7/3C72T2ePY7i5i0Q5bWwWTOczSMfbeq4344h5Kyg
|
||||||
|
m7EaZJ4sDcAC/XCIokz3WzHQeHkYQHykCZGBFqF27vAIC1AqQqYcYg41hZE7ntMB
|
||||||
|
CHdscxlFAxcRFIBHozdCIMzi4hHnFWNjXPrMS9xhROne/EI4zTE0PPXumVlRH8ri
|
||||||
|
0yQ9egcSoyUMQ1Vgvkhhey+Dp6nLhwdVOIo8RbI4SdFE3245s7U=
|
||||||
|
=pb2q
|
||||||
|
-----END PGP SIGNATURE-----
|
||||||
@ -1,16 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmDx/YUACgkQ9DSh76/u
|
|
||||||
rqN76g//Z2aFAo46O/8ODbH4tIF6Cvc9JgI3Sy6DP6nlDHontrAfeENUpe2y3eRv
|
|
||||||
xJe2Ksu9P7HqGSndCDWdjZkD8ClBKG/CT9kj3+mn2ehzopZU+pBFhvhqanR48LXZ
|
|
||||||
S8wbntPHhUvi+xN0qapMx4dGAXNNCZfSMyrAkC8g1e8Bbc3PViwSjwZaBl2dPMm3
|
|
||||||
mZpnobviWS34LYcCgvRdnoJxvNLwem2eOV7WNkKJvmhEZ9NrzYIxorIrTxQBm0Ri
|
|
||||||
/qli+4p1KTyTn8cRnCsaspmi124y62f1z4ml9Sji0hQwFVRI0pCWce7OeqR1VgH6
|
|
||||||
LjJVhq8yea5UFVvXq1h/5txlW6+49tX/ot9vOrFfp+Z1zgf52YA0Bdz6lsxiCw1S
|
|
||||||
kzb36UWFJ2Ydj3J+JJnnLri4psuH1EazOcEmK9iAGV6FwbtmI9StrDLuYg+Ag6mr
|
|
||||||
036kGJd/Bl0bvXiZkQudPuF1CTAhSg1lPej08AC2KRn9IFvr+5yJVfrR7zWQXyF4
|
|
||||||
4N3hWNDBuPcYLaWpwtak1IjMtNlIRr+C7BiZdPXJB2NKJcBwBqcRVRNU8LEVSpVY
|
|
||||||
YLXnGKlzXtCRrtIE2bcUa64/RHx/mCaiCJkTXdwvNxy/e2PiWy7oPWMQzH0QodZs
|
|
||||||
R6h0hcXz+hC8m59e9/ecQH+oso8ct9PCmkq50J78Dx7gsu35X3o=
|
|
||||||
=FjrM
|
|
||||||
-----END PGP SIGNATURE-----
|
|
||||||
16
SOURCES/libreoffice-translations-7.1.7.2.tar.xz.asc
Normal file
16
SOURCES/libreoffice-translations-7.1.7.2.tar.xz.asc
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmF5MzEACgkQ9DSh76/u
|
||||||
|
rqPg8A//b0GQhbJ7HvvN1tqg9arFk+sKELpwSdP3qsCHn89jNzSvGg62TL10sYhu
|
||||||
|
7CSBa7cqwdSMUDIEFjukZ+iUCClfLTilEo1i9Vtc4QXCgy1msFAdsxBAtMdHbRiN
|
||||||
|
u0AWII370BlXjsM7RAj/Qcn+z+TFLsMEM8KrKWFb0XBAxKdDUXyfhFFZxvEUNWDh
|
||||||
|
g5lK6ojyCT47WdEx1dQFBPKqld1MA6bcOf5hY+L0oo6MSVGGuB6uXQOUp7oKE1cQ
|
||||||
|
TscaeB0X6/dBlQXyHDRfIGYuys42NWPpsXo8e2r6USJnTsCSjYFI8MtS1Z5YCEjk
|
||||||
|
EOrQyrS0SnqjvoYmsTzb8bcwR5ydcqmGk07JV/1qLiYcEGuk28jEkRgOm4zi6d3N
|
||||||
|
hz/zU0XwUBrffFw3jzuzL14CcdC+8xGn5kN4mwHSO1YUVCgxgXYE/Gpv0EzX0Es8
|
||||||
|
5RlpQcM4f+Vgo3L62ZFfZLqD1RfKNGZ2iq1N/SxEbWOJYNWO5aUWEZmEi5QZMgqH
|
||||||
|
9v0zZuZ5tIDrOW5kw9lImZmvY21sEzLBsfboc8oxmJFbzsAkaFxZs6R/IZJbdUIp
|
||||||
|
qDkUpgIiNaE9XJl2600xD2jC3f5nH4F+qmKrPFxFpkqc+FdVzNRHa2n83WG7D13F
|
||||||
|
+DDhochyKpHfq36wo93GTjHeAXEHP8G4E3kZ4MyH1VFze6o5olQ=
|
||||||
|
=tYyX
|
||||||
|
-----END PGP SIGNATURE-----
|
||||||
@ -1,5 +1,5 @@
|
|||||||
# download path contains version without the last (fourth) digit
|
# download path contains version without the last (fourth) digit
|
||||||
%global libo_version 7.1.5
|
%global libo_version 7.1.7
|
||||||
# Should contain .alphaX / .betaX, if this is pre-release (actually
|
# Should contain .alphaX / .betaX, if this is pre-release (actually
|
||||||
# pre-RC) version. The pre-release string is part of tarball file names,
|
# pre-RC) version. The pre-release string is part of tarball file names,
|
||||||
# so we need a way to define it easily at one place.
|
# so we need a way to define it easily at one place.
|
||||||
@ -50,7 +50,7 @@ Summary: Free Software Productivity Suite
|
|||||||
Name: libreoffice
|
Name: libreoffice
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: %{libo_version}.2
|
Version: %{libo_version}.2
|
||||||
Release: 4%{?libo_prerelease}%{?dist}
|
Release: 3%{?libo_prerelease}%{?dist}
|
||||||
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
|
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
|
||||||
URL: http://www.libreoffice.org/
|
URL: http://www.libreoffice.org/
|
||||||
|
|
||||||
@ -116,7 +116,6 @@ BuildRequires: perl(base)
|
|||||||
BuildRequires: glibc-all-langpacks
|
BuildRequires: glibc-all-langpacks
|
||||||
BuildRequires: libappstream-glib
|
BuildRequires: libappstream-glib
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: ucpp
|
|
||||||
BuildRequires: zip
|
BuildRequires: zip
|
||||||
|
|
||||||
# libs / headers - common
|
# libs / headers - common
|
||||||
@ -255,9 +254,15 @@ Patch5: 0001-Get-rid-of-apache-commons-logging.patch
|
|||||||
Patch6: 0001-gtk3-workaround-missing-gdk_threads_enter-calls-in-e.patch
|
Patch6: 0001-gtk3-workaround-missing-gdk_threads_enter-calls-in-e.patch
|
||||||
Patch7: 0001-Replace-inet_ntoa-with-inet_ntop.patch
|
Patch7: 0001-Replace-inet_ntoa-with-inet_ntop.patch
|
||||||
Patch8: 0001-Simplify-construction-of-a-hardcoded-IPv4-address.patch
|
Patch8: 0001-Simplify-construction-of-a-hardcoded-IPv4-address.patch
|
||||||
Patch9: 0001-Remove-unused-DOCTYPE-from-odk-examples-xcu-file.patch
|
Patch9: 0001-math.desktop-include-Spreadsheet-category.patch
|
||||||
Patch10: 0001-math.desktop-include-Spreadsheet-category.patch
|
Patch10: 0001-rhbz-1980800-allow-convert-to-csv-to-write-each-shee.patch
|
||||||
Patch11: 0001-rhbz-1980800-allow-convert-to-csv-to-write-each-shee.patch
|
Patch11: 0001-make-with-idlc-cpp-cpp-work-for-gcc-cpp-as-a-ucpp-re.patch
|
||||||
|
Patch12: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch
|
||||||
|
Patch13: 0001-document-new-shouldn-t-get-prefixed-to-become-libreo.patch
|
||||||
|
Patch14: 0001-Resolves-tdf-145567-restore-focus-to-the-usual-frame.patch
|
||||||
|
Patch15: 0001-Resolves-tdf-140250-don-t-share-adjustments-between-.patch
|
||||||
|
Patch16: 0001-fix-comparison-when-searching-cache.patch
|
||||||
|
Patch17: 0001-tdf-121546-sw-don-t-use-undo-array-s-m_pOutlineNodes.patch
|
||||||
|
|
||||||
# not upstreamed
|
# not upstreamed
|
||||||
Patch500: 0001-disable-libe-book-support.patch
|
Patch500: 0001-disable-libe-book-support.patch
|
||||||
@ -1111,7 +1116,7 @@ touch autogen.lastrun
|
|||||||
--with-gdrive-client-secret="GYWrDtzyZQZ0_g5YoBCC6F0I" \
|
--with-gdrive-client-secret="GYWrDtzyZQZ0_g5YoBCC6F0I" \
|
||||||
--with-gdrive-client-id="457862564325.apps.googleusercontent.com" \
|
--with-gdrive-client-id="457862564325.apps.googleusercontent.com" \
|
||||||
--enable-python=system \
|
--enable-python=system \
|
||||||
--with-system-ucpp \
|
--with-idlc-cpp=cpp \
|
||||||
%{distrooptions} \
|
%{distrooptions} \
|
||||||
%{?bundling_options} \
|
%{?bundling_options} \
|
||||||
%{?archoptions} \
|
%{?archoptions} \
|
||||||
@ -1497,7 +1502,7 @@ install -m 0755 -d %{buildroot}%{_javadir}/%{name}
|
|||||||
for jar in %{buildroot}%{baseinstdir}/program/classes/*.jar; do
|
for jar in %{buildroot}%{baseinstdir}/program/classes/*.jar; do
|
||||||
j=`basename $jar`
|
j=`basename $jar`
|
||||||
case ${j%.jar} in
|
case ${j%.jar} in
|
||||||
juh|jurt|ridl|unoloader|unoil|officebean)
|
juh|jurt|libreoffice|ridl|unoloader|unoil|officebean)
|
||||||
mv $jar %{buildroot}%{_javadir}/%{name}
|
mv $jar %{buildroot}%{_javadir}/%{name}
|
||||||
ln -sr %{buildroot}%{_javadir}/%{name}/$j $jar
|
ln -sr %{buildroot}%{_javadir}/%{name}/$j $jar
|
||||||
;;
|
;;
|
||||||
@ -2133,6 +2138,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
|
|||||||
%dir %{_javadir}/%{name}
|
%dir %{_javadir}/%{name}
|
||||||
%{_javadir}/%{name}/juh.jar
|
%{_javadir}/%{name}/juh.jar
|
||||||
%{_javadir}/%{name}/jurt.jar
|
%{_javadir}/%{name}/jurt.jar
|
||||||
|
%{_javadir}/%{name}/libreoffice.jar
|
||||||
%{_javadir}/%{name}/ridl.jar
|
%{_javadir}/%{name}/ridl.jar
|
||||||
%{_javadir}/%{name}/unoloader.jar
|
%{_javadir}/%{name}/unoloader.jar
|
||||||
%license instdir/LICENSE
|
%license instdir/LICENSE
|
||||||
@ -2243,7 +2249,23 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
|
|||||||
%{_includedir}/LibreOfficeKit
|
%{_includedir}/LibreOfficeKit
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com>
|
* Mon Nov 22 2021 Caolán McNamara <caolanm@redhat.com> - 1:7.1.7.2-3
|
||||||
|
- Resolves: rhbz2023185 merge in fedora 34 changes
|
||||||
|
|
||||||
|
* Mon Nov 08 2021 Caolán McNamara <caolanm@redhat.com> - 1:7.1.7.2-2
|
||||||
|
- Resolves: tdf#145567 restore start center focus to the right widget
|
||||||
|
|
||||||
|
* Fri Oct 29 2021 Caolán McNamara <caolanm@redhat.com> - 1:7.1.7.2-1
|
||||||
|
- Resolves: rhbz#2014990 upgrade to 7.1.7
|
||||||
|
|
||||||
|
* Mon Oct 11 2021 Caolán McNamara <caolanm@redhat.com> - 1:7.1.6.2-2
|
||||||
|
- Resolves: rhbz#2001452 upgrade to 7.1.6
|
||||||
|
|
||||||
|
* Thu Aug 12 2021 Caolán McNamara <caolanm@redhat.com> - 1:7.1.5.2-5
|
||||||
|
- replace use of ucpp with gcc cpp
|
||||||
|
- Resolves: tdf#132739 two html style tags where there should be just one
|
||||||
|
|
||||||
|
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:7.1.5.2-4
|
||||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||||
Related: rhbz#1991688
|
Related: rhbz#1991688
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user