Hello community,
here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2014-11-06 16:49:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libreoffice (Old)
and /work/SRC/openSUSE:Factory/.libreoffice.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2014-10-19 19:27:41.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2014-11-06 16:50:13.000000000 +0100
@@ -1,0 +2,15 @@
+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
+
+-------------------------------------------------------------------
Old:
----
libreoffice-4.3.2.2.tar.xz
libreoffice-help-4.3.2.2.tar.xz
libreoffice-mergedlibs-circular-deps.patch
libreoffice-translations-4.3.2.2.tar.xz
New:
----
libreoffice-4.3-plasma5-ui-decisions.patch
libreoffice-4.3.3.2.tar.xz
libreoffice-help-4.3.3.2.tar.xz
libreoffice-translations-4.3.3.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libreoffice.spec ++++++
--- /var/tmp/diff_new_pack.6RCyMU/_old 2014-11-06 16:50:19.000000000 +0100
+++ /var/tmp/diff_new_pack.6RCyMU/_new 2014-11-06 16:50:19.000000000 +0100
@@ -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 @@
# 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 @@
%patch12
%patch13 -p1
%patch14 -p1
-%patch15 -p1
+%patch16 -p1
%patch990 -p1
# 256x256 icons
tar -xjf %{SOURCE20}
@@ -963,7 +963,6 @@
--enable-cairo-canvas \
--enable-graphite \
--enable-largefile \
- --enable-mergelibs \
--enable-python=system \
--enable-randr \
--enable-randr-link \
++++++ libreoffice-4.3-plasma5-ui-decisions.patch ++++++
From e04b8afe7aef5db535311630834bc25316433dae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?=
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
Tested-by: Samuel Mehrbrodt
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
++++++ libreoffice-4.3.2.2.tar.xz -> libreoffice-4.3.3.2.tar.xz ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-4.3.2.2.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-4.3.3.2.tar.xz differ: char 25, line 1
++++++ libreoffice-help-4.3.2.2.tar.xz -> libreoffice-help-4.3.3.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-4.3.2.2/ChangeLog-helpcontent2 new/libreoffice-4.3.3.2/ChangeLog-helpcontent2
--- old/libreoffice-4.3.2.2/ChangeLog-helpcontent2 2014-09-16 22:56:37.000000000 +0200
+++ new/libreoffice-4.3.3.2/ChangeLog-helpcontent2 2014-10-23 13:46:37.000000000 +0200
@@ -1,19 +1,22 @@
-2014-09-16 Robinson Tryon [4f159d6438b2a67b702cea222fa1da53ac8c9a0f]
+2014-10-23 Christian Lohmaier [e3dda30e0aeeebed63be2190fabbb50696992c56]
-Version\ 4.3.2.2\,\ tag\ libreoffice-4.3.2.2
+Version 4.3.3.2, tag libreoffice-4.3.3.2
+Change-Id: I206bae0e796a784358ef6d3da64846af5d7a04c6
-2014-09-16 Robinson Tryon [061e0eb475af1399d026d9886e5a320de6123805]
+2014-10-09 Christian Lohmaier [fa4406435262b0927129c50679d72b56692d7a9c]
- Branch libreoffice-4-3-2
+Branch libreoffice-4-3-3
- This is 'libreoffice-4-3-2' - the stable branch for the 4.3.2 release.
- Only very safe changes, reviewed by three people are allowed.
+This is 'libreoffice-4-3-3' - the stable branch for the 4.3.3 release.
+Only very safe changes, reviewed by three people are allowed.
- If you want to commit more complicated fix for the next 4.3.x release,
- please use the 'libreoffice-4-3' branch.
+If you want to commit more complicated fix for the next 4.3.x release,
+please use the 'libreoffice-4-3' branch.
- If you want to build something cool, unstable, and risky, use master.
+If you want to build something cool, unstable, and risky, use master.
+
+Change-Id: I5726a9808fa2d9ed8c70350e3cba303323905acd
2014-08-21 Andras Timar [888531eda1e60931d7bf6923710cea396de9166d]
++++++ libreoffice-translations-4.3.2.2.tar.xz -> libreoffice-translations-4.3.3.2.tar.xz ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-4.3.2.2.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-translations-4.3.3.2.tar.xz differ: char 25, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org