- Remove no longer needed mergelib patch
* libreoffice-mergedlibs-circular-deps.patch - Add patch for plasma5 UI selector support * libreoffice-4.3-plasma5-ui-decisions.patch - Version bump to 4.3.3: * Various upstream fixes included in maintenance branch * fixes bnc#900218 and bnc#900214 CVE-2014-3693 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=201
This commit is contained in:
Tomáš Chvátal
Git OBS Bridge
parent
dd6e926614
commit
1d8f0c55de
59
libreoffice-4.3-plasma5-ui-decisions.patch
Normal file
59
libreoffice-4.3-plasma5-ui-decisions.patch
Normal file
@ -0,0 +1,59 @@
|
||||
From e04b8afe7aef5db535311630834bc25316433dae Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal@gmail.com>
|
||||
Date: Mon, 3 Nov 2014 10:01:52 +0100
|
||||
Subject: Detect KDE5 and fallback to KDE4UI there
|
||||
|
||||
Change-Id: I8da53d7b81d28b0051be96c0c4ee0a29d8ed8360
|
||||
Reviewed-on: https://gerrit.libreoffice.org/12209
|
||||
Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
|
||||
Tested-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
|
||||
|
||||
diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
|
||||
index 163d48e..e1f253d 100644
|
||||
--- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx
|
||||
+++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
|
||||
@@ -272,6 +272,23 @@ static bool is_kde4_desktop( Display* pDisplay )
|
||||
return false;
|
||||
}
|
||||
|
||||
+static bool is_kde5_desktop( Display* pDisplay )
|
||||
+{
|
||||
+ if ( NULL != getenv( "KDE_FULL_SESSION" ) )
|
||||
+ {
|
||||
+ OUString aVer( "5" );
|
||||
+
|
||||
+ const char *pVer = getenv( "KDE_SESSION_VERSION" );
|
||||
+ if ( pVer && aVer.equalsIgnoreAsciiCaseAscii( pVer ) )
|
||||
+ return true;
|
||||
+ }
|
||||
+
|
||||
+ if ( KDEVersion( pDisplay ) == 5 )
|
||||
+ return true;
|
||||
+
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
extern "C"
|
||||
{
|
||||
|
||||
@@ -285,6 +302,8 @@ DESKTOP_DETECTOR_PUBLIC DesktopType get_desktop_environment()
|
||||
|
||||
if ( aOver.equalsIgnoreAsciiCase( "tde" ) )
|
||||
return DESKTOP_TDE;
|
||||
+ if ( aOver.equalsIgnoreAsciiCase( "kde5" ) )
|
||||
+ return DESKTOP_KDE4;
|
||||
if ( aOver.equalsIgnoreAsciiCase( "kde4" ) )
|
||||
return DESKTOP_KDE4;
|
||||
if ( aOver.equalsIgnoreAsciiCase( "gnome" ) )
|
||||
@@ -371,6 +390,8 @@ DESKTOP_DETECTOR_PUBLIC DesktopType get_desktop_environment()
|
||||
|
||||
// these guys can be slower, with X property fetches,
|
||||
// round-trips etc. and so are done later.
|
||||
+ else if ( is_kde5_desktop( pDisplay ) )
|
||||
+ ret = DESKTOP_KDE4;
|
||||
else if ( is_kde4_desktop( pDisplay ) )
|
||||
ret = DESKTOP_KDE4;
|
||||
else if ( is_gnome_desktop( pDisplay ) )
|
||||
--
|
||||
cgit v0.10.2
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e93d603a87d7feb04c1216ae988ea24618d88bd177ab3a3b2ad45b320749ffdc
|
||||
size 152355836
|
||||
3
libreoffice-4.3.3.2.tar.xz
Normal file
3
libreoffice-4.3.3.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:60adfbae048e160fa4bef4bc67c7586e77ca72b437e0de52dc4b731e91cd7529
|
||||
size 152744424
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3ff58a2daa91a6a51317c73869250697c0820dd6db6474893fd563d6599bb82e
|
||||
size 1851688
|
||||
3
libreoffice-help-4.3.3.2.tar.xz
Normal file
3
libreoffice-help-4.3.3.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5f1fbe1959ba67a5a9e99af50b10567b09e42541d7519760a7b21f8f6db3a46d
|
||||
size 1855116
|
||||
@ -1,24 +0,0 @@
|
||||
From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
|
||||
Date: Tue, 23 Sep 2014 13:52:37 +0200
|
||||
Subject: [PATCH] remove circular deps on mergedlibs
|
||||
|
||||
- add dbtools to mergedlibs
|
||||
|
||||
---
|
||||
solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
|
||||
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
|
||||
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
|
||||
@@ -112,6 +112,7 @@ gb_MERGEDLIBS := \
|
||||
canvastools \
|
||||
configmgr \
|
||||
cppcanvas \
|
||||
+ $(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \
|
||||
deployment \
|
||||
deploymentmisc \
|
||||
$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:519c2545e1c06d3e6df524489840ae9c8e281379c71f6cc6c7c7d62af182be40
|
||||
size 126301100
|
||||
3
libreoffice-translations-4.3.3.2.tar.xz
Normal file
3
libreoffice-translations-4.3.3.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:596ef679093f2b3b56f662aea039e99b4202c654fb36914568312e17ce9af34a
|
||||
size 127002208
|
||||
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 3 12:48:16 UTC 2014 - tchvatal@suse.com
|
||||
|
||||
- Remove no longer needed mergelib patch
|
||||
* libreoffice-mergedlibs-circular-deps.patch
|
||||
- Add patch for plasma5 UI selector support
|
||||
* libreoffice-4.3-plasma5-ui-decisions.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 31 12:01:24 UTC 2014 - tchvatal@suse.com
|
||||
|
||||
- Version bump to 4.3.3:
|
||||
* Various upstream fixes included in maintenance branch
|
||||
* fixes bnc#900218 and bnc#900214 CVE-2014-3693
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 17 08:55:21 UTC 2014 - olaf@aepfle.de
|
||||
|
||||
|
||||
@ -29,10 +29,10 @@
|
||||
%define numbertext_version 0.9.5
|
||||
# Urls
|
||||
%define external_url http://dev-www.libreoffice.org/src/
|
||||
%define tarball_url http://download.documentfoundation.org/libreoffice/src/4.3.2/
|
||||
%define tarball_url http://download.documentfoundation.org/libreoffice/src/4.3.3/
|
||||
# This is used due to the need for beta releases
|
||||
Name: libreoffice
|
||||
Version: 4.3.2.2
|
||||
Version: 4.3.3.2
|
||||
Release: 0
|
||||
Summary: A Free Office Suite (Framework)
|
||||
License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C
|
||||
@ -88,8 +88,8 @@ Patch12: mediawiki-no-broken-help.diff
|
||||
# LO never worked well with it
|
||||
Patch13: jvmfwk-disable-gcj.diff
|
||||
Patch14: libreoffice-4.3.0.3-themes-symlinks.patch
|
||||
# Mergedlibs are broken as they circdep on each other
|
||||
Patch15: libreoffice-mergedlibs-circular-deps.patch
|
||||
# PATCH-FIX-UPSTREAM: detect properly kde5 and allow kde4 ui there; will be in 4.4 series
|
||||
Patch16: libreoffice-4.3-plasma5-ui-decisions.patch
|
||||
# try to save space by using hardlinks
|
||||
Patch990: install-with-hardlinks.diff
|
||||
BuildRequires: ImageMagick
|
||||
@ -865,7 +865,7 @@ Provides additional %{langname} translations and resources for %{project}. \
|
||||
%patch12
|
||||
%patch13 -p1
|
||||
%patch14 -p1
|
||||
%patch15 -p1
|
||||
%patch16 -p1
|
||||
%patch990 -p1
|
||||
# 256x256 icons
|
||||
tar -xjf %{SOURCE20}
|
||||
@ -963,7 +963,6 @@ export NOCONFIGURE=yes
|
||||
--enable-cairo-canvas \
|
||||
--enable-graphite \
|
||||
--enable-largefile \
|
||||
--enable-mergelibs \
|
||||
--enable-python=system \
|
||||
--enable-randr \
|
||||
--enable-randr-link \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user