diff --git a/.gitignore b/.gitignore index 97d1393..152c53b 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,6 @@ /libreoffice-4.0.2.1.tar.xz /libreoffice-help-4.0.2.1.tar.xz /libreoffice-translations-4.0.2.1.tar.xz +/libreoffice-4.0.2.2.tar.xz +/libreoffice-help-4.0.2.2.tar.xz +/libreoffice-translations-4.0.2.2.tar.xz diff --git a/0001-Resolves-rhbz-906137-slide-show-inverts-outputs.patch b/0001-Resolves-rhbz-906137-slide-show-inverts-outputs.patch deleted file mode 100644 index 2d15fb8..0000000 --- a/0001-Resolves-rhbz-906137-slide-show-inverts-outputs.patch +++ /dev/null @@ -1,64 +0,0 @@ -From ff252b6e2b7d4f5399dafffcea745486745bdeaf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Fri, 15 Mar 2013 10:38:06 +0000 -Subject: [PATCH] Resolves: rhbz#906137 slide show inverts outputs - -we go to some effort to determine the right value of ret -and then throw it away and return 0 - -regression since 4a7e3482912c90b73d6e12c82bcd9ce31975e3f1 - -Change-Id: I652cfbe44fdab6560c1c8dc8fe25d6211b5357cb -(cherry picked from commit 67aae198f80195e77bd62e7675a372312075b126) ---- - vcl/unx/gtk/app/gtksys.cxx | 16 ++++++---------- - 1 file changed, 6 insertions(+), 10 deletions(-) - -diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx -index b7996c1..48bc239 100644 ---- a/vcl/unx/gtk/app/gtksys.cxx -+++ b/vcl/unx/gtk/app/gtksys.cxx -@@ -18,7 +18,6 @@ - */ - - #include --#include - #include - #include - #include -@@ -179,14 +178,14 @@ namespace { - static int _fallback_get_primary_monitor (GdkScreen *pScreen) - { - // Use monitor name as primacy heuristic -- int ret = -1; - int max = gdk_screen_get_n_monitors (pScreen); -- for (int i = 0; i < max && ret < 0; i++) -+ for (int i = 0; i < max; ++i) - { - char *name = gdk_screen_get_monitor_plug_name (pScreen, i); -- if (name && !g_ascii_strncasecmp (name, "LVDS", 4)) -- ret = i; -+ bool bLaptop = (name && !g_ascii_strncasecmp (name, "LVDS", 4)); - g_free (name); -+ if (bLaptop) -+ return i; - } - return 0; - } -@@ -201,11 +200,8 @@ static int _get_primary_monitor (GdkScreen *pScreen) - // Perhaps we have a newer gtk+ with this symbol: - if (!get_fn) - { -- GModule *module = g_module_open (NULL, (GModuleFlags) 0); -- if (!g_module_symbol (module, "gdk_screen_get_primary_monitor", -- (gpointer *)&get_fn)) -- get_fn = NULL; -- g_module_close (module); -+ get_fn = (int(*)(GdkScreen*))osl_getAsciiFunctionSymbol(NULL, -+ "gdk_screen_get_primary_monitor"); - } - #if GTK_CHECK_VERSION(2,14,0) - if (!get_fn) --- -1.8.1.2 - diff --git a/0001-rhbz-895690-Make-GIO-UCP-less-brittle-so-saving-docs.patch b/0001-rhbz-895690-Make-GIO-UCP-less-brittle-so-saving-docs.patch deleted file mode 100644 index e02c040..0000000 --- a/0001-rhbz-895690-Make-GIO-UCP-less-brittle-so-saving-docs.patch +++ /dev/null @@ -1,143 +0,0 @@ -From 8722f0e7ef690205d042c8a6b1fdf342a34ecbe1 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann -Date: Wed, 13 Mar 2013 08:59:42 +0100 -Subject: [PATCH] rhbz#895690: Make GIO UCP less brittle, so saving docs works - again - -966d20e35d5a2be2fce6c204af5c156c3ead7063 "CMIS ucp: write documents back to CMIS -server" had introduced changes to sfx2/source/doc/docfile.cxx in LO 3.6 that -changed the exact commands that this code issued for UCP content nodes. The GIO -UCP was not prepared to handle that, causing saving of documents via it to fail -with rather obscure error messages: - -* For one, docfile.cxx started to call "getPropertyValues" to obtain the "Title" - of a non-existent content. That lead to an InteractiveAugmentedIOException - instead of silently returning a void value. - -* For another, docfile.cxx started to call "transfer" on a folder content whose - URL did not have a trailing slash, so the code computed a wrong URL for the - child element, resulting in various problems depending on context. - -Change-Id: I1a9c0c094f5320456940e3af4c802711828ab5ac ---- - ucb/source/ucp/gio/gio_content.cxx | 31 +++++++++++++++---------------- - 1 file changed, 15 insertions(+), 16 deletions(-) - -diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx -index e08b727..6584bc5 100644 ---- a/ucb/source/ucp/gio/gio_content.cxx -+++ b/ucb/source/ucp/gio/gio_content.cxx -@@ -405,7 +405,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValuesFromGFileInfo(GFileInfo * - - if ( rProp.Name == "IsDocument" ) - { -- if (g_file_info_has_attribute(pInfo, G_FILE_ATTRIBUTE_STANDARD_TYPE)) -+ if (pInfo != 0 && g_file_info_has_attribute(pInfo, G_FILE_ATTRIBUTE_STANDARD_TYPE)) - xRow->appendBoolean( rProp, ( g_file_info_get_file_type( pInfo ) == G_FILE_TYPE_REGULAR || - g_file_info_get_file_type( pInfo ) == G_FILE_TYPE_UNKNOWN ) ); - else -@@ -413,45 +413,45 @@ uno::Reference< sdbc::XRow > Content::getPropertyValuesFromGFileInfo(GFileInfo * - } - else if ( rProp.Name == "IsFolder" ) - { -- if( g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_STANDARD_TYPE) ) -+ if (pInfo != 0 && g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_STANDARD_TYPE) ) - xRow->appendBoolean( rProp, ( g_file_info_get_file_type( pInfo ) == G_FILE_TYPE_DIRECTORY )); - else - xRow->appendVoid( rProp ); - } - else if ( rProp.Name == "Title" ) - { -- if (g_file_info_has_attribute(pInfo, G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME)) -+ if (pInfo != 0 && g_file_info_has_attribute(pInfo, G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME)) - { - const char *pName = g_file_info_get_display_name(pInfo); - xRow->appendString( rProp, rtl::OUString(pName, strlen(pName), RTL_TEXTENCODING_UTF8) ); - } - else -- xRow->appendVoid( rProp ); -+ xRow->appendVoid(rProp); - } - else if ( rProp.Name == "IsReadOnly" ) - { -- if( g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE ) ) -+ if (pInfo != 0 && g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE ) ) - xRow->appendBoolean( rProp, !g_file_info_get_attribute_boolean( pInfo, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE) ); - else - xRow->appendVoid( rProp ); - } - else if ( rProp.Name == "DateCreated" ) - { -- if( g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_TIME_CREATED ) ) -+ if (pInfo != 0 && g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_TIME_CREATED ) ) - xRow->appendTimestamp( rProp, getDateFromUnix(g_file_info_get_attribute_uint64(pInfo, G_FILE_ATTRIBUTE_TIME_CREATED)) ); - else - xRow->appendVoid( rProp ); - } - else if ( rProp.Name == "DateModified" ) - { -- if( g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_TIME_CHANGED ) ) -+ if (pInfo != 0 && g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_TIME_CHANGED ) ) - xRow->appendTimestamp( rProp, getDateFromUnix(g_file_info_get_attribute_uint64(pInfo, G_FILE_ATTRIBUTE_TIME_CHANGED)) ); - else - xRow->appendVoid( rProp ); - } - else if ( rProp.Name == "Size" ) - { -- if( g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_STANDARD_SIZE) ) -+ if (pInfo != 0 && g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_STANDARD_SIZE) ) - xRow->appendLong( rProp, ( g_file_info_get_size( pInfo ) )); - else - xRow->appendVoid( rProp ); -@@ -463,14 +463,14 @@ uno::Reference< sdbc::XRow > Content::getPropertyValuesFromGFileInfo(GFileInfo * - } - else if ( rProp.Name == "IsCompactDisc" ) - { -- if( g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT ) ) -+ if (pInfo != 0 && g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT ) ) - xRow->appendBoolean( rProp, g_file_info_get_attribute_boolean(pInfo, G_FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT) ); - else - xRow->appendVoid( rProp ); - } - else if ( rProp.Name == "IsRemoveable" ) - { -- if( g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT ) ) -+ if (pInfo != 0 && g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT ) ) - xRow->appendBoolean( rProp, g_file_info_get_attribute_boolean(pInfo, G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT ) ); - else - xRow->appendVoid( rProp ); -@@ -481,7 +481,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValuesFromGFileInfo(GFileInfo * - } - else if ( rProp.Name == "IsHidden" ) - { -- if( g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN) ) -+ if (pInfo != 0 && g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN) ) - xRow->appendBoolean( rProp, ( g_file_info_get_is_hidden ( pInfo ) ) ); - else - xRow->appendVoid( rProp ); -@@ -506,11 +506,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( - const uno::Sequence< beans::Property >& rProperties, - const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - { -- GError *pError = NULL; -- GFileInfo *pInfo = getGFileInfo(xEnv, &pError); -- if (!pInfo) -- ucbhelper::cancelCommandExecution(mapGIOError(pError), xEnv); -- -+ GFileInfo *pInfo = getGFileInfo(xEnv); - return getPropertyValuesFromGFileInfo(pInfo, m_xContext, xEnv, rProperties); - } - -@@ -1063,6 +1059,9 @@ void Content::transfer( const ucb::TransferInfo& aTransferInfo, const uno::Refer - throw( uno::Exception ) - { - rtl::OUString sDest = m_xIdentifier->getContentIdentifier(); -+ if (!sDest.endsWith("/")) { -+ sDest += "/"; -+ } - if (aTransferInfo.NewTitle.getLength()) - sDest += aTransferInfo.NewTitle; - else --- -1.8.1.4 - diff --git a/libreoffice.spec b/libreoffice.spec index 43d095e..50d17e1 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -42,8 +42,8 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.1 -Release: 2%{?libo_prerelease}%{?dist} +Version: %{libo_version}.2 +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 Group: Applications/Productivity URL: http://www.documentfoundation.org/develop @@ -249,8 +249,6 @@ Patch19: 0001-fix-compile-for-change-to-boost-1.53.0-declaring-sma.patch Patch20: 0001-rhbz-742780-Let-make-OPT_FLAGS-.-override-SDK-optimi.patch Patch21: 0001-Related-rhbz-902884-check-for-GetSelectedMasterPage-.patch Patch22: 0001-Resolves-rhbz-920697-i110881-rhbz-623191-presentatio.patch -Patch23: 0001-rhbz-895690-Make-GIO-UCP-less-brittle-so-saving-docs.patch -Patch24: 0001-Resolves-rhbz-906137-slide-show-inverts-outputs.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -1003,8 +1001,6 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch20 -p1 -b .rhbz-742780-Let-make-OPT_FLAGS-.-override-SDK-optimi.patch %patch21 -p1 -b .rhbz-902884-check-for-GetSelectedMasterPage-.patch %patch22 -p1 -b .rhbz-920697-i110881-rhbz-623191-presentatio.patch -%patch23 -p1 -b .rhbz-895690-Make-GIO-UCP-less-brittle-so-saving-docs.patch -%patch24 -p1 -b .rhbz-906137-slide-show-inverts-outputs.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2077,6 +2073,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Thu Mar 28 2013 David Tardon - 1:4.0.2.2-1 +- 4.0.2 rc2 + * Fri Mar 15 2013 Caolán McNamara - 1:4.0.2.1-2 - Resolves: rhbz#906137 slide show inverts outputs diff --git a/sources b/sources index e942318..909489d 100644 --- a/sources +++ b/sources @@ -6,6 +6,6 @@ a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 1f24ab1d39f4a51faf22244c94a6203f 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 0168229624cfac409e766913506961a8 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz -d6bc4bcc4a96fc748dc65bd5de63b791 libreoffice-4.0.2.1.tar.xz -a36f9594eef29cfd423bb18d770c9cd7 libreoffice-help-4.0.2.1.tar.xz -cfc0bd880ec7441ca6c5fc58c1693a2c libreoffice-translations-4.0.2.1.tar.xz +2c92879fa8c50d0071c4703afb7d10bf libreoffice-4.0.2.2.tar.xz +22e99e58aa32417dd7c132f40ae7654b libreoffice-help-4.0.2.2.tar.xz +8b61fbfa6bcd18213b5744f2b8a289b0 libreoffice-translations-4.0.2.2.tar.xz