Hello community,
here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2014-05-09 06:57:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-05-05 21:12:38.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2014-05-09 06:57:54.000000000 +0200
@@ -1,0 +2,21 @@
+Tue May 6 19:58:50 UTC 2014 - tchvatal@suse.com
+
+- Version bump to 4.2.4.2:
+ * another bugfix release fixing more than dozen of issues.
+- Add explicit dep over libxslt
+- Remove patch applied upstream:
+ * bluez5-support-for-impress-remote.diff
+
+-------------------------------------------------------------------
+Mon May 5 13:35:28 UTC 2014 - tchvatal@suse.com
+
+- Generate autocorr content for various language mutations properly
+ (shamelessly stolen from Fedora).
+
+-------------------------------------------------------------------
+Mon May 5 13:24:33 UTC 2014 - tchvatal@suse.com
+
+- Use patch from upstream to handle the mutexes way better.
+ Updated patch kde4-4.2.3.3-timer-mutex.patch.
+
+-------------------------------------------------------------------
Old:
----
bluez5-support-for-impress-remote.diff
libreoffice-4.2.3.3.tar.xz
libreoffice-help-4.2.3.3.tar.xz
libreoffice-translations-4.2.3.3.tar.xz
New:
----
libreoffice-4.2.4.2.tar.xz
libreoffice-help-4.2.4.2.tar.xz
libreoffice-translations-4.2.4.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libreoffice.spec ++++++
--- /var/tmp/diff_new_pack.XiyjPV/_old 2014-05-09 06:58:02.000000000 +0200
+++ /var/tmp/diff_new_pack.XiyjPV/_new 2014-05-09 06:58:02.000000000 +0200
@@ -29,9 +29,9 @@
%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.2.3/
+%define tarball_url http://download.documentfoundation.org/libreoffice/src/4.2.4/
Name: libreoffice
-Version: 4.2.3.3
+Version: 4.2.4.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
@@ -87,8 +87,6 @@
Patch13: jvmfwk-disable-gcj.diff
# Fix running wizzards in py2 as the utf is not htere
Patch16: wizards-create-temlates-with-python-2.6.diff
-# Fix fdo#74697 add Bluez 5 support for impress remote.
-Patch17: bluez5-support-for-impress-remote.diff
# PATCH-FIX-UPSTREAM: fix kde hanging in 4.2.3.3
Patch18: kde4-4.2.3.3-timer-mutex.patch
# try to save space by using hardlinks
@@ -171,6 +169,7 @@
BuildRequires: libwpg-devel
BuildRequires: libwps-devel
BuildRequires: libxml2-devel
+BuildRequires: libxslt-devel
BuildRequires: lpsolve-devel
BuildRequires: make
BuildRequires: mdds-devel >= 0.8.0
@@ -627,6 +626,15 @@
- MediaWiki Publisher
+# Symlink autocorr files for various conversion items
+%define make_autocorr_aliases(l:) \
+%{?-l: \
+for lang in %{*}; do \
+ ln -sf acor_%{-l*}.dat %{buildroot}%{_libdir}/%{name}/share/autocorr/acor_$lang.dat \
+done \
+} \
+%{!?-l:%{error:-l must be present}}
+
# Symlinking macro for /usr/lib64 and /usr/share packing
# As argument takes name of the package
%define _link_noarch_files() \
@@ -841,8 +849,7 @@
%patch12
%patch13 -p1
%patch16 -p1
-%patch17 -p1
-%patch18 -p1 -R
+%patch18 -p1
%patch990 -p1
# 256x256 icons
tar -xjf %{SOURCE20}
@@ -1090,12 +1097,26 @@
echo "%{_datadir}/%{name}/program/$file" >> file-lists/branding_upstream.txt
done
-################
-# FIXME: fast hack to solve a customer issue, n#364523
-# we need a more generic solution
-# FIXME: can be done better, see how fedora does it and imitate
-ln -sf acor_fr-FR.dat %{buildroot}%{_libdir}/%{name}/share/autocorr/acor_fr-CA.dat
-echo "%{_libdir}/%{name}/share/autocorr/acor_fr-CA.dat" >>file-lists/common_list.txt
+# Fix autocorr names for various language mutations
+%make_autocorr_aliases -l en-GB en-AG en-AU en-BS en-BW en-BZ en-CA en-DK en-GH en-HK en-IE en-IN en-JM en-NG en-NZ en-SG en-TT
+%make_autocorr_aliases -l en-US en-PH
+%make_autocorr_aliases -l en-ZA en-NA en-ZW
+%make_autocorr_aliases -l af-ZA af-NA
+%make_autocorr_aliases -l de-DE de-AT de-BE de-CH de-LI de-LU
+%make_autocorr_aliases -l es-ES es-AR es-BO es-CL es-CO es-CR es-CU es-DO es-EC es-GT es-HN es-MX es-NI es-PA es-PE es-PR es-PY es-SV es-US es-UY es-VE
+%make_autocorr_aliases -l fr-FR fr-BE fr-CA fr-CH fr-LU fr-MC
+%make_autocorr_aliases -l it-IT it-CH
+%make_autocorr_aliases -l nl-NL nl-AW
+%make_autocorr_aliases -l sv-SE sv-FI
+pushd %{buildroot}%{_libdir}/%{name}/share/autocorr
+files=""
+for file in acor*.dat; do
+ files="$files $file"
+done
+popd
+for file in $files; do
+ echo "%{_libdir}/%{name}/share/autocorr/$file" >> file-lists/common_list.txt
+done
# Symlink uno.py and unohelper.py so that python can find them
mkdir -p %{buildroot}%{python_sitelib}
++++++ kde4-4.2.3.3-timer-mutex.patch ++++++
--- /var/tmp/diff_new_pack.XiyjPV/_old 2014-05-09 06:58:03.000000000 +0200
+++ /var/tmp/diff_new_pack.XiyjPV/_new 2014-05-09 06:58:03.000000000 +0200
@@ -1,46 +1,71 @@
-From 7dba6e0a71d090f06a6a1a39e87572674593b48a Mon Sep 17 00:00:00 2001
-From: Jan-Marek Glogowski
-Date: Mon, 10 Mar 2014 14:44:05 +0000
-Subject: fdo#73115: Always run timeouts as events
+From 71f2aff7a56cef4e133abad3c2e447c76c5ee1fe Mon Sep 17 00:00:00 2001
+From: Luboš Luňák
+Date: Tue, 25 Mar 2014 11:20:16 +0000
+Subject: prevent KDE/Qt from interfering with the session manager
-Right-click popup menus run click events throught the LO main loop.
-In case of KDE4 the LO main loop is run by a timer in the main thread,
-with Qt::DirectConnection execution.
+I occassionally get lockups in IceProcessMessages() called from QtCore,
+I'm actually not exactly sure why, as theoretically two connections
+from one app shouldn't be a problem, but since LO does its own
+session handling, there's no need to the KDE/Qt code to be involved,
+so prevent it from connecting to the session manager altogether.
-If the timeout actually starts a nested event loop for a new dialog,
-the timer is blocked, the nested mainloop detects it was started
-from the timeout and drops the blocked timout from polling, which
-blocks any further LibreOffice event loop processing.
-
-This changes the timers to Qt::QueuedConnection, so they always
-generate an event and are processed by the Qt event loop.
-
-Change-Id: Ie626b22be3d8f9b8934bcc5e9e0e67a365549cfc
-(cherry picked from commit aeda478a02523cec146f6af69710f0391061db56)
-Reviewed-on: https://gerrit.libreoffice.org/8514
-Reviewed-by: Caolán McNamara
-Tested-by: Caolán McNamara
+Change-Id: Iebe20d4cb5403e5fea8bd5d8c1f69b62d1c2907b
---
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
-index b4be6d6..4a9b70b 100644
+index 820d39a..e4900a7 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
-@@ -67,9 +67,13 @@ KDEXLib::KDEXLib() :
- eventLoopType( LibreOfficeEventLoop ),
- m_bYieldFrozen( false )
+@@ -166,8 +166,23 @@ void KDEXLib::Init()
+
+ KCmdLineArgs::init( m_nFakeCmdLineArgs, m_pAppCmdLineArgs, kAboutData );
+
++ // LO does its own session management, so prevent KDE/Qt from interfering
++ // (QApplication::disableSessionManagement(false) wouldn't quite do,
++ // since that still actually connects to the session manager, it just
++ // won't save the application data on session shutdown).
++ char* session_manager = NULL;
++ if( getenv( "SESSION_MANAGER" ) != NULL )
++ {
++ session_manager = strdup( getenv( "SESSION_MANAGER" ));
++ unsetenv( "SESSION_MANAGER" );
++ }
+ m_pApplication = new VCLKDEApplication();
+- kapp->disableSessionManagement();
++ if( session_manager != NULL )
++ {
++ setenv( "SESSION_MANAGER", session_manager, 1 );
++ free( session_manager );
++ }
++
+ KApplication::setQuitOnLastWindowClosed(false);
+
+ #if KDE_HAVE_GLIB
+diff --git a/vcl/unx/kde4/VCLKDEApplication.hxx b/vcl/unx/kde4/VCLKDEApplication.hxx
+index 412ee34..4ce0b2c 100644
+--- a/vcl/unx/kde4/VCLKDEApplication.hxx
++++ b/vcl/unx/kde4/VCLKDEApplication.hxx
+@@ -21,22 +21,14 @@
+
+ #define Region QtXRegion
+
+-#include <QSessionManager>
+-
+ #include
+
+ #undef Region
+
+-/* #i59042# override KApplications method for session management
+- * since it will interfere badly with our own.
+- */
+ class VCLKDEApplication : public KApplication
{
-- // the timers created here means they belong to the main thread
-- connect( &timeoutTimer, SIGNAL( timeout()), this, SLOT( timeoutActivated()));
-- connect( &userEventTimer, SIGNAL( timeout()), this, SLOT( userEventActivated()));
-+ // the timers created here means they belong to the main thread.
-+ // As the timeoutTimer runs the LO event queue, which may block on a dialog,
-+ // the timer has to use a Qt::QueuedConnection, otherwise the nested event
-+ // loop will detect the blocking timer and drop it from the polling
-+ // freezing LO X11 processing.
-+ connect( &timeoutTimer, SIGNAL( timeout()), this, SLOT( timeoutActivated()), Qt::QueuedConnection );
-+ connect( &userEventTimer, SIGNAL( timeout()), this, SLOT( userEventActivated()), Qt::QueuedConnection );
+ public:
+ VCLKDEApplication();
+-
+- virtual void commitData(QSessionManager&) {};
+-
+ virtual bool x11EventFilter(XEvent* event);
+ };
- // QTimer::start() can be called only in its (here main) thread, so this will
- // forward between threads if needed
--
cgit v0.9.0.2-2-gbebe
++++++ libreoffice-4.2.3.3.tar.xz -> libreoffice-4.2.4.2.tar.xz ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-4.2.3.3.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-4.2.4.2.tar.xz differ: char 26, line 1
++++++ libreoffice-help-4.2.3.3.tar.xz -> libreoffice-help-4.2.4.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-4.2.3.3/ChangeLog-helpcontent2 new/libreoffice-4.2.4.2/ChangeLog-helpcontent2
--- old/libreoffice-4.2.3.3/ChangeLog-helpcontent2 2014-04-08 14:08:18.000000000 +0200
+++ new/libreoffice-4.2.4.2/ChangeLog-helpcontent2 2014-04-30 22:21:48.000000000 +0200
@@ -1,20 +1,14 @@
-2014-04-08 Christian Lohmaier [5f76c17aafe732c43ca6bd9f30569775092ea688]
+2014-04-30 Christian Lohmaier [ac2b86be850316ef89ccb5ead31385a12eee9968]
-Version 4.2.3.3, tag libreoffice-4.2.3.3-hotfix1
+Version 4.2.4.2, tag libreoffice-4.2.4.2
-Change-Id: If40fd7882e1f4d4ef7c0248c76442f78b854b356
+Change-Id: I26451ec33f07548a8951ea0e085340e3a3645e20
-2014-04-03 Christian Lohmaier [0f3b6e0a4438e835d10d5efec0c46afd92825d7a]
+2014-04-15 Christian Lohmaier [8ae05953f699a9545ffae358ff1b81e4df3e466e]
-Version 4.2.3.3, tag libreoffice-4.2.3.3
+Branch libreoffice-4-2-4
-Change-Id: I5a8673a0a1af24a7892bf97a7f01ad3adbf2d6c2
-
-2014-03-12 Christian Lohmaier [9ae4bdbb7b22a33f02b9c876290b51ce623bcbda]
-
-Branch libreoffice-4-2-3
-
-This is 'libreoffice-4-2-3' - the stable branch for the 4.2.3 release.
+This is 'libreoffice-4-2-4' - the stable branch for the 4.2.4 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 4.2.x release,
@@ -22,7 +16,7 @@
If you want to build something cool, unstable, and risky, use master.
-Change-Id: I5c3b7c5243d0e08e5b772cb4f9e61ee8ea9df108
+Change-Id: I8aa12bfac915e23cd0e1ac098cbe6354a6fca47c
2014-01-11 Zolnai Tamás [7d73db5cf05eb0cd0c01536667fc021367b0aa92]
++++++ libreoffice-translations-4.2.3.3.tar.xz -> libreoffice-translations-4.2.4.2.tar.xz ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-4.2.3.3.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-translations-4.2.4.2.tar.xz differ: char 26, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org