diff --git a/.gitignore b/.gitignore index b2dce2a..2ca4dcc 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,6 @@ /libreoffice-4.4.2.2.tar.xz /libreoffice-help-4.4.2.2.tar.xz /libreoffice-translations-4.4.2.2.tar.xz +/libreoffice-4.4.3.2.tar.xz +/libreoffice-help-4.4.3.2.tar.xz +/libreoffice-translations-4.4.3.2.tar.xz diff --git a/0001-Resolves-rhbz-1204244-group-sdb-windows-together-as-.patch b/0001-Resolves-rhbz-1204244-group-sdb-windows-together-as-.patch deleted file mode 100644 index ea2244a..0000000 --- a/0001-Resolves-rhbz-1204244-group-sdb-windows-together-as-.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 71c00b3e96fb639e0ff0815608827936219adac5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Mon, 23 Mar 2015 10:41:21 +0000 -Subject: [PATCH] Resolves: rhbz#1204244 group sdb windows together as 'base' - -Change-Id: Ie0d17e562b24a8108d79d13592fff3bf2b9a6713 ---- - framework/source/helper/titlebarupdate.cxx | 20 ++++++-------------- - 1 file changed, 6 insertions(+), 14 deletions(-) - -diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx -index 7626309..b79b5b2 100644 ---- a/framework/source/helper/titlebarupdate.cxx -+++ b/framework/source/helper/titlebarupdate.cxx -@@ -139,25 +139,17 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr - - OUString sDesktopName; - OUString aModuleId = xModuleManager->identify(xFrame); -- if ( aModuleId == "com.sun.star.text.TextDocument" || -- aModuleId == "com.sun.star.text.GlobalDocument" || -- aModuleId == "com.sun.star.text.WebDocument" || -- aModuleId == "com.sun.star.xforms.XMLFormDocument" ) -+ if ( aModuleId.startsWith("com.sun.star.text.") || aModuleId.startsWith("com.sun.star.xforms.") ) - sDesktopName = "Writer"; -- else if ( aModuleId == "com.sun.star.sheet.SpreadsheetDocument" ) -+ else if ( aModuleId.startsWith("com.sun.star.sheet.") ) - sDesktopName = "Calc"; -- else if ( aModuleId == "com.sun.star.presentation.PresentationDocument" ) -+ else if ( aModuleId.startsWith("com.sun.star.presentation.") ) - sDesktopName = "Impress"; -- else if ( aModuleId == "com.sun.star.drawing.DrawingDocument" ) -+ else if ( aModuleId.startsWith("com.sun.star.drawing." ) ) - sDesktopName = "Draw"; -- else if ( aModuleId == "com.sun.star.formula.FormulaProperties" ) -+ else if ( aModuleId.startsWith("com.sun.star.formula." ) ) - sDesktopName = "Math"; -- else if ( aModuleId == "com.sun.star.sdb.DatabaseDocument" || -- aModuleId == "com.sun.star.sdb.OfficeDatabaseDocument" || -- aModuleId == "com.sun.star.sdb.RelationDesign" || -- aModuleId == "com.sun.star.sdb.QueryDesign" || -- aModuleId == "com.sun.star.sdb.TableDesign" || -- aModuleId == "com.sun.star.sdb.DataSourceBrowser" ) -+ else if ( aModuleId.startsWith("com.sun.star.sdb.") ) - sDesktopName = "Base"; - else - sDesktopName = "Startcenter"; --- -1.9.3 - diff --git a/0001-Resolves-tdf-90256-repair-invalid-docking-positions.patch b/0001-Resolves-tdf-90256-repair-invalid-docking-positions.patch deleted file mode 100644 index 4856428..0000000 --- a/0001-Resolves-tdf-90256-repair-invalid-docking-positions.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3c22024f41029dd4c1dca6b265d1fd0f14fc2f95 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Thu, 26 Mar 2015 13:37:10 +0000 -Subject: [PATCH] Resolves: tdf#90256 repair invalid docking positions - -Change-Id: If144a867dc4be6975c08cd1eea9ebb540975aafc ---- - framework/source/layoutmanager/layoutmanager.cxx | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx -index d4e4eee..94e99ff 100644 ---- a/framework/source/layoutmanager/layoutmanager.cxx -+++ b/framework/source/layoutmanager/layoutmanager.cxx -@@ -531,8 +531,15 @@ bool LayoutManager::readWindowStateData( const OUString& aName, UIElement& rElem - else if ( aWindowState[n].Name == WINDOWSTATE_PROPERTY_DOCKPOS ) - { - awt::Point aPoint; -- if ( aWindowState[n].Value >>= aPoint ) -+ if (aWindowState[n].Value >>= aPoint) -+ { -+ //tdf#90256 repair these broken Docking positions -+ if (aPoint.X < 0) -+ aPoint.X = SAL_MAX_INT32; -+ if (aPoint.Y < 0) -+ aPoint.Y = SAL_MAX_INT32; - rElementData.m_aDockedData.m_aPos = aPoint; -+ } - } - else if ( aWindowState[n].Name == WINDOWSTATE_PROPERTY_POS ) - { --- -1.9.3 - diff --git a/0001-disable-failing-while-libmwaw-fix-pending.patch b/0001-disable-failing-while-libmwaw-fix-pending.patch deleted file mode 100644 index 421f5e7..0000000 --- a/0001-disable-failing-while-libmwaw-fix-pending.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2965b3d99a59db87e65ed4c21a09e33ee5408867 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Thu, 20 Nov 2014 10:14:34 +0000 -Subject: [PATCH] disable test - -Change-Id: Iafc258eeb648e4f172277f7b20bf8b035e7fa52f ---- - writerperfect/Module_writerperfect.mk | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk -index 9c30697..81f6887 100644 ---- a/writerperfect/Module_writerperfect.mk -+++ b/writerperfect/Module_writerperfect.mk -@@ -33,7 +33,6 @@ $(eval $(call gb_Module_add_check_targets,writerperfect,\ - - $(eval $(call gb_Module_add_slowcheck_targets,writerperfect,\ - CppunitTest_writerperfect_calc \ -- CppunitTest_writerperfect_draw \ - CppunitTest_writerperfect_impress \ - CppunitTest_writerperfect_writer \ - StaticLibrary_writerperfect_importtestbase \ --- -1.9.3 - diff --git a/0001-gdk-pixbuf-xlib-2.0-gdk-pixbuf-2.0.patch b/0001-gdk-pixbuf-xlib-2.0-gdk-pixbuf-2.0.patch deleted file mode 100644 index 9e0fdc8..0000000 --- a/0001-gdk-pixbuf-xlib-2.0-gdk-pixbuf-2.0.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 642b908049decaa2da5064a9b09afbf2589bd881 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Fri, 20 Mar 2015 16:48:57 +0000 -Subject: [PATCH] gdk-pixbuf-xlib-2.0->gdk-pixbuf-2.0 - -(cherry picked from commit 7fff01817f61a2eb53a5da7248163630a7fb1555) - -Conflicts: - configure.ac - -Change-Id: Ib58578fd9e093d912294d861094e19151a097534 ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index fd9a74b..ac7e78e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -10056,7 +10056,7 @@ ENABLE_SYSTRAY_GTK="" - if test "$test_gtk" = "yes"; then - - if test "$ENABLE_GTK" = "TRUE"; then -- PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 ,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages])) -+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4 gdk-pixbuf-2.0 >= 2.2 ,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages])) - GTK_CFLAGS=$(printf '%s' "$GTK_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") - PKG_CHECK_MODULES(GTHREAD, gthread-2.0,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages])) - BUILD_TYPE="$BUILD_TYPE GTK" --- -1.9.3 - diff --git a/0001-rhbz-1134285-Access-dav-davs-URLs-via-GVFS.patch b/0001-rhbz-1134285-Access-dav-davs-URLs-via-GVFS.patch deleted file mode 100644 index b8e7a94..0000000 --- a/0001-rhbz-1134285-Access-dav-davs-URLs-via-GVFS.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 51e0d789c344547956764c3b5f0ef5a304f4e0aa Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann -Date: Mon, 13 Apr 2015 18:27:33 +0200 -Subject: [PATCH] rhbz#1134285: Access dav, davs URLs via GVFS - -...so that LO shares the credentials with Nautilus once the connection has been -set up in Nautilus. - -The reason the (non-standard) dav, davs URLs used by GNOME's old GnomeVFS and -successor GVFS/GIO were handled via LO's webdav UCP rather than the GNOME- -specific gnomevfs resp. gio UCP since b07a5fcc600ad564315d36fbd18495184fdf69cf -"INTEGRATION: CWS tkr10: i84676 neon and gnome-vfs2" is discussed at - "mixing neon and the hidden -embedded contents old [sic] another neon inside libhttp.so of gnome-vfs2 is -unreliable" and only pertains to the legacy gnomevfs UCP, not the new gio one. -So keep handling dav, davs URLs via LO's internal webdav UCP under legacy ---enable-gnome-vfs, but handle them via the GNOME-specific gio UCP under the -default --enable-gio. - -Change-Id: Ib132168701a7ae0a7dcabdead6a299eda0cd4594 ---- - officecfg/Configuration_officecfg.mk | 1 + - officecfg/registry/data/org/openoffice/ucb/Configuration.xcu | 6 ++++-- - postprocess/CustomTarget_registry.mk | 3 +++ - 3 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk -index 7e2af03..af992b9 100644 ---- a/officecfg/Configuration_officecfg.mk -+++ b/officecfg/Configuration_officecfg.mk -@@ -121,6 +121,7 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat - org/openoffice/TypeDetection/UISort-math.xcu \ - org/openoffice/ucb/Configuration-gio.xcu \ - org/openoffice/ucb/Configuration-neon.xcu \ -+ org/openoffice/ucb/Configuration-neon_gnomevfs.xcu \ - org/openoffice/ucb/Configuration-win.xcu \ - )) - -diff --git a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu -index e9704d3..9cb2a1a 100644 ---- a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu -+++ b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu -@@ -89,7 +89,8 @@ - - - -- -+ - - com.sun.star.ucb.WebDAVContentProvider - -@@ -155,7 +156,8 @@ - - - -- -+ - - com.sun.star.ucb.WebDAVContentProvider - -diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk -index a568832..e12640f 100644 ---- a/postprocess/CustomTarget_registry.mk -+++ b/postprocess/CustomTarget_registry.mk -@@ -328,6 +328,9 @@ postprocess_DRIVERS += ado - endif - ifneq ($(WITH_WEBDAV),) - postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-neon.xcu -+ifeq ($(ENABLE_GNOMEVFS),TRUE) -+postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-neon_gnomevfs.xcu -+endif - endif - ifeq ($(ENABLE_EVOAB2),TRUE) - postprocess_FILES_main += $(call gb_XcuModuleTarget_get_target,connectivity/registry/evoab2)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu --- -2.1.0 - diff --git a/0001-rhbz-1197614-Fix-calculation-of-m_bHasActive-when-re.patch b/0001-rhbz-1197614-Fix-calculation-of-m_bHasActive-when-re.patch deleted file mode 100644 index bcff6ae..0000000 --- a/0001-rhbz-1197614-Fix-calculation-of-m_bHasActive-when-re.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 97d4c1a8100c63091401736c93d6bbbb371d5b37 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann -Date: Fri, 10 Apr 2015 15:06:53 +0200 -Subject: [PATCH] rhbz#1197614: Fix calculation of m_bHasActive when removing - active element - -Assume m_vEntries.size() == 2; assume first element (nPos == 0) is m_bActive, -gets removed, so m_nActive would have stayed at 0 and m_bHasActive at true; then -assume second element (again nPos == 0, due to the removed element) is m_bNew, -so nPos <= m_nActive is true and m_nActive gets updated to 1 (and m_bHasActive -remains true); then selectEntry(nNewPos) (nNewPos == 0) would have tried to -reset m_vEntries[1]->m_bActive but now m_vEntries.size() == 1. - -Change-Id: I31d3bbe97ca99f880aa99bdea015f7c0457f8331 ---- - desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 21 ++++++++++++++------- - 1 file changed, 14 insertions(+), 7 deletions(-) - -diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx -index 260100f..b9500a1 100644 ---- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx -+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx -@@ -1035,7 +1035,6 @@ long ExtensionBox_Impl::addEntry( const uno::Reference< deployment::XPackage > & - //access to m_nActive must be guarded - if ( !m_bInCheckMode && m_bHasActive && ( m_nActive >= nPos ) ) - m_nActive += 1; -- - guard.clear(); - - if ( IsReallyVisible() ) -@@ -1172,6 +1171,7 @@ void ExtensionBox_Impl::prepareChecking() - void ExtensionBox_Impl::checkEntries() - { - long nNewPos = -1; -+ long nChangedActivePos = -1; - long nPos = 0; - bool bNeedsUpdate = false; - -@@ -1195,15 +1195,19 @@ void ExtensionBox_Impl::checkEntries() - } - else - { // remove entry from list -+ if (nPos < nNewPos) { -+ --nNewPos; -+ } -+ if (nPos < nChangedActivePos) { -+ --nChangedActivePos; -+ } - if ( nPos < m_nActive ) - m_nActive -= 1; -- else if ( ( nPos == m_nActive ) && ( nPos == (long) m_vEntries.size() - 1 ) ) -+ else if ( nPos == m_nActive ) - { -- m_nActive -= 1; -- if (m_nActive == -1) -- { -- m_bHasActive = false; -- } -+ nChangedActivePos = nPos; -+ m_nActive = -1; -+ m_bHasActive = false; - } - m_vRemovedEntries.push_back( *iIndex ); - m_vEntries.erase( iIndex ); -@@ -1219,6 +1223,9 @@ void ExtensionBox_Impl::checkEntries() - - if ( nNewPos != - 1) - selectEntry( nNewPos ); -+ else if (nChangedActivePos != -1) { -+ selectEntry(nChangedActivePos); -+ } - - if ( bNeedsUpdate ) - { --- -2.1.0 - diff --git a/libreoffice.spec b/libreoffice.spec index f63a688..46a68a2 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,5 +1,5 @@ # download path contains version without the last (fourth) digit -%define libo_version 4.4.2 +%define libo_version 4.4.3 # Should contain .alphaX / .betaX, if this is pre-release (actually # 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. @@ -48,7 +48,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 5%{?libo_prerelease}%{?dist} +Release: 1%{?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 Artistic and MPLv2.0 and CC0 Group: Applications/Productivity URL: http://www.libreoffice.org/ @@ -315,16 +315,11 @@ Patch20: 0001-Use-the-same-advanced-Ellipse-and-Rectangle-shapes-i.patch Patch21: 0001-add-accel.-to-switch-monitors-to-pres.-console.patch Patch22: 0001-build-libetonyek-with-no-strict-aliasing.patch Patch23: 0002-propagate-user-set-CFLAGS-to-build.patch -Patch24: 0001-gdk-pixbuf-xlib-2.0-gdk-pixbuf-2.0.patch -Patch25: 0001-Resolves-rhbz-1204244-group-sdb-windows-together-as-.patch -Patch26: 0001-Resolves-tdf-90256-repair-invalid-docking-positions.patch -Patch27: 0001-gnome-745909-grab-ungrab-keyboard-for-menus.patch -Patch28: 0001-negative-after-text-indents-ignored-by-msword-for-ap.patch -Patch29: 0001-rhbz-1197614-Fix-calculation-of-m_bHasActive-when-re.patch -Patch30: 0001-rhbz-1134285-Access-dav-davs-URLs-via-GVFS.patch -Patch31: 0001-Resolves-tdf-73211-gtk-checkboxes-need-erase-afer-to.patch -Patch32: 0001-on-using-add-color-button-don-t-frighten-with-an-err.patch -Patch33: 0001-the-Edit-button-is-a-color-picker-rename-and-move.patch +Patch24: 0001-gnome-745909-grab-ungrab-keyboard-for-menus.patch +Patch25: 0001-negative-after-text-indents-ignored-by-msword-for-ap.patch +Patch26: 0001-Resolves-tdf-73211-gtk-checkboxes-need-erase-afer-to.patch +Patch27: 0001-on-using-add-color-button-don-t-frighten-with-an-err.patch +Patch28: 0001-the-Edit-button-is-a-color-picker-rename-and-move.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -2366,7 +2361,8 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog -* Wed Apr 29 2015 Caolán McNamara - 1:4.4.2.2-5-UNBUILT +* Wed Apr 29 2015 David Tardon - 1:4.4.3.2-1 +- update to 4.4.3 - on using add color button don't frighten with an error message - the 'Edit' button is a color picker, rename and move diff --git a/sources b/sources index 9996063..1ce9730 100644 --- a/sources +++ b/sources @@ -7,6 +7,6 @@ a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2. 0168229624cfac409e766913506961a8 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz 12fb8b5b0d5132726e57b9b9fc7e22c4 libreoffice-multiliblauncher.sh 4b87018f7fff1d054939d19920b751a0 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 -5971b3feefec99f819d8b6c6260eb845 libreoffice-4.4.2.2.tar.xz -a6cf287374c39a488dc8e77e062aa7b7 libreoffice-help-4.4.2.2.tar.xz -538f8b3b9514cdc4ffb3d671f2f79609 libreoffice-translations-4.4.2.2.tar.xz +427075aba3e1d32197954b7d6a2d0566 libreoffice-4.4.3.2.tar.xz +9019bcc3d1bc4bb882c3366a2dfc302d libreoffice-help-4.4.3.2.tar.xz +8a7d1a0976f37334cb15cd93e01f5914 libreoffice-translations-4.4.3.2.tar.xz