From e6349c063e0e6b309f385aec2a3f91c65805431b Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 14 Jun 2012 07:10:20 +0200 Subject: [PATCH] update to 3.5.5 rc1 --- .gitignore | 4 + ...99628-crash-with-chewing-IM-with-g3g.patch | 30 -- ...6609-rhbz-820554-fix-smoketest-on-pp.patch | 69 ---- ...able-to-find-string-literal-operator.patch | 26 -- 0001-make-hsqldb-build-with-java-1.7.patch | 301 ------------------ ...rns-a-int-truncating-to-unsigned-cha.patch | 91 ------ 0001-silence-SolarMutex-not-locked-spew.patch | 68 ---- libreoffice.spec | 91 +++--- sources | 8 +- 9 files changed, 52 insertions(+), 636 deletions(-) delete mode 100644 0001-Related-rhbz-799628-crash-with-chewing-IM-with-g3g.patch delete mode 100644 0001-Resolves-rhbz-826609-rhbz-820554-fix-smoketest-on-pp.patch delete mode 100644 0001-gcc-trunk-fix-unable-to-find-string-literal-operator.patch delete mode 100644 0001-make-hsqldb-build-with-java-1.7.patch delete mode 100644 0001-ppc-yyinput-returns-a-int-truncating-to-unsigned-cha.patch delete mode 100644 0001-silence-SolarMutex-not-locked-spew.patch diff --git a/.gitignore b/.gitignore index b7aea1e..360d7de 100644 --- a/.gitignore +++ b/.gitignore @@ -97,3 +97,7 @@ /libreoffice-core-3.5.4.2.tar.xz /libreoffice-help-3.5.4.2.tar.xz /libreoffice-translations-3.5.4.2.tar.xz +/libreoffice-binfilter-3.5.5.1.tar.xz +/libreoffice-core-3.5.5.1.tar.xz +/libreoffice-help-3.5.5.1.tar.xz +/libreoffice-translations-3.5.5.1.tar.xz diff --git a/0001-Related-rhbz-799628-crash-with-chewing-IM-with-g3g.patch b/0001-Related-rhbz-799628-crash-with-chewing-IM-with-g3g.patch deleted file mode 100644 index a26baac..0000000 --- a/0001-Related-rhbz-799628-crash-with-chewing-IM-with-g3g.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7e3ebe35a6a1a69b3a36f7eb41e1ec5c5905f714 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Mon, 5 Mar 2012 21:02:45 +0000 -Subject: [PATCH] Related: rhbz#799628 crash with chewing-IM with g3g - ---- - vcl/unx/gtk/window/gtkframe.cxx | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx -index 112e066..1cd1bd0 100644 ---- a/vcl/unx/gtk/window/gtkframe.cxx -+++ b/vcl/unx/gtk/window/gtkframe.cxx -@@ -3984,8 +3984,12 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_ - g_slist_free (attr_list); - - // Set the sal attributes on our text -- for (int i = start; i < end; i++) -+ for (int i = start; i < end; ++i) -+ { -+ if (i >= static_cast(pThis->m_aInputFlags.size())) -+ continue; - pThis->m_aInputFlags[i] |= sal_attr; -+ } - } while (pango_attr_iterator_next (iter)); - - pThis->m_aInputEvent.mpTextAttr = &pThis->m_aInputFlags[0]; --- -1.7.7.6 - diff --git a/0001-Resolves-rhbz-826609-rhbz-820554-fix-smoketest-on-pp.patch b/0001-Resolves-rhbz-826609-rhbz-820554-fix-smoketest-on-pp.patch deleted file mode 100644 index 0653d89..0000000 --- a/0001-Resolves-rhbz-826609-rhbz-820554-fix-smoketest-on-pp.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff --git a/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk b/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk -index 33f6bd1..08e7b23 100644 ---- a/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk -+++ b/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk -@@ -28,8 +28,7 @@ - #please make generic modifications to unxgcc.mk or linux.mk - gb_CPUDEFS += -DPPC - gb_COMPILERDEFAULTOPTFLAGS := -O2 --gb_CXXFLAGS += -mminimal-toc -fsigned-char --gb_CFLAGS += -fsigned-char -+gb_CXXFLAGS += -mminimal-toc - - include $(GBUILDDIR)/platform/linux.mk - -diff --git a/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk b/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk -index 1c78df0..6fe92ec 100644 ---- a/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk -+++ b/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk -@@ -28,8 +28,6 @@ - #please make generic modifications to unxgcc.mk or linux.mk - gb_CPUDEFS += -DPPC - gb_COMPILERDEFAULTOPTFLAGS := -O2 --gb_CXXFLAGS += -fsigned-char --gb_CFLAGS += -fsigned-char - - include $(GBUILDDIR)/platform/linux.mk - -diff --git a/solenv/gbuild/platform/LINUX_S390X_GCC.mk b/solenv/gbuild/platform/LINUX_S390X_GCC.mk -index b352572..1d6889e 100644 ---- a/solenv/gbuild/platform/LINUX_S390X_GCC.mk -+++ b/solenv/gbuild/platform/LINUX_S390X_GCC.mk -@@ -27,8 +27,8 @@ - - #please make generic modifications to unxgcc.mk or linux.mk - gb_COMPILERDEFAULTOPTFLAGS := -O2 --gb_CXXFLAGS += -fsigned-char -fno-omit-frame-pointer --gb_CFLAGS += -fsigned-char -fno-omit-frame-pointer -+gb_CXXFLAGS += -fno-omit-frame-pointer -+gb_CFLAGS += -fno-omit-frame-pointer - - include $(GBUILDDIR)/platform/linux.mk - -diff --git a/solenv/gbuild/platform/LINUX_S390_GCC.mk b/solenv/gbuild/platform/LINUX_S390_GCC.mk -index b352572..1d6889e 100644 ---- a/solenv/gbuild/platform/LINUX_S390_GCC.mk -+++ b/solenv/gbuild/platform/LINUX_S390_GCC.mk -@@ -27,8 +27,8 @@ - - #please make generic modifications to unxgcc.mk or linux.mk - gb_COMPILERDEFAULTOPTFLAGS := -O2 --gb_CXXFLAGS += -fsigned-char -fno-omit-frame-pointer --gb_CFLAGS += -fsigned-char -fno-omit-frame-pointer -+gb_CXXFLAGS += -fno-omit-frame-pointer -+gb_CFLAGS += -fno-omit-frame-pointer - - include $(GBUILDDIR)/platform/linux.mk - -diff --git a/solenv/inc/unxlngs390.mk b/solenv/inc/unxlngs390.mk -index 0eac39a..af2518f 100644 ---- a/solenv/inc/unxlngs390.mk -+++ b/solenv/inc/unxlngs390.mk -@@ -30,6 +30,4 @@ - PICSWITCH:=-fPIC - .INCLUDE : unxlng.mk - CDEFS+=-DS390 --CFLAGS+=-fsigned-char -fno-omit-frame-pointer --CFLAGSCC+=-fsigned-char --CFLAGSCXX+=-fsigned-char -+CFLAGS+=-fno-omit-frame-pointer diff --git a/0001-gcc-trunk-fix-unable-to-find-string-literal-operator.patch b/0001-gcc-trunk-fix-unable-to-find-string-literal-operator.patch deleted file mode 100644 index 325bd31..0000000 --- a/0001-gcc-trunk-fix-unable-to-find-string-literal-operator.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8f823b7d39154d2044e08174a858f8ef357a151a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= -Date: Thu, 5 Jan 2012 17:32:21 +0100 -Subject: [PATCH] gcc-trunk: fix: unable to find string literal operator - 'operator FOO' - ---- - sal/qa/osl/mutex/osl_Mutex.cxx | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx -index 10a95c1..f4f34d6 100644 ---- a/sal/qa/osl/mutex/osl_Mutex.cxx -+++ b/sal/qa/osl/mutex/osl_Mutex.cxx -@@ -754,7 +754,7 @@ namespace osl_ClearableGuard - TimeValue aTimeVal_after; - osl_getSystemTime( &aTimeVal_after ); - sal_Int32 nSec = aTimeVal_after.Seconds - aTimeVal_befor.Seconds; -- printf("nSec is %"SAL_PRIdINT32"\n", nSec); -+ printf("nSec is %" SAL_PRIdINT32 "\n", nSec); - - myThread.join(); - --- -1.7.7.6 - diff --git a/0001-make-hsqldb-build-with-java-1.7.patch b/0001-make-hsqldb-build-with-java-1.7.patch deleted file mode 100644 index 0183fcc..0000000 --- a/0001-make-hsqldb-build-with-java-1.7.patch +++ /dev/null @@ -1,301 +0,0 @@ -From 7dbfc0012cc75e7dac9a416b53149ad8ec33f071 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Wed, 8 Feb 2012 16:03:50 +0000 -Subject: [PATCH] make hsqldb build with java 1.7 - ---- - hsqldb/makefile.mk | 3 +- - hsqldb/patches/jdbc-4.1.patch | 267 +++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 269 insertions(+), 1 deletions(-) - create mode 100644 hsqldb/patches/jdbc-4.1.patch - -diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk -index 8b3d5b1..2e9fa8a 100755 ---- a/hsqldb/makefile.mk -+++ b/hsqldb/makefile.mk -@@ -56,7 +56,8 @@ CONVERTFILES=build$/build.xml \ - PATCH_FILES=patches$/i96823.patch \ - patches$/i97032.patch \ - patches$/i103528.patch \ -- patches$/i104901.patch -+ patches$/i104901.patch \ -+ patches$/jdbc-4.1.patch - - .IF "$(JAVACISGCJ)"=="yes" - JAVA_HOME= -diff --git a/hsqldb/patches/jdbc-4.1.patch b/hsqldb/patches/jdbc-4.1.patch -new file mode 100644 -index 0000000..89149c4 ---- /dev/null -+++ b/hsqldb/patches/jdbc-4.1.patch -@@ -0,0 +1,267 @@ -+--- misc/hsqldb/build/build.xml 2012-02-08 15:14:42.827123541 +0000 -++++ misc/build/hsqldb/build/build.xml 2012-02-08 15:21:43.827722388 +0000 -+@@ -98,7 +98,11 @@ -+ -+ -+ -+- -++ -++ -++ -++ -++ -+ -+ -+ -+@@ -210,6 +214,7 @@ -+ -+ -+ -++ -+ -+ -+ -+@@ -244,6 +249,7 @@ -+ -+ -+ -++ -+ -+ -+ -+@@ -279,10 +285,47 @@ -+ -+ -+ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -+ -+ -+ -+- -+ T getObject(String columnLabel, Class type) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public T getObject(int ColumnIndex, Class type) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ -++//#endif JAVA7 -+ } -+--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java 2012-02-08 15:14:42.802123563 +0000 -++++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java 2012-02-08 15:47:35.851635628 +0000 -+@@ -48,6 +48,12 @@ -+ import java.sql.SQLXML; -+ -+ //#endif JAVA6 -++ -++//#ifdef JAVA7 -++import java.util.concurrent.Executor; -++ -++//#endif JAVA7 -++ -+ import java.sql.PreparedStatement; -+ import java.sql.SQLException; -+ import java.sql.SQLWarning; -+@@ -2793,4 +2799,31 @@ -+ } -+ -+ //#endif JAVA6 -++ -++//#ifdef JAVA7 -++ public int getNetworkTimeout() throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setNetworkTimeout(Executor executor, int millis) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void abort(Executor executor) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public String getSchema() throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setSchema(String schema) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++//#endif JAVA7 -+ } -+--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java 2012-02-08 15:14:42.802123563 +0000 -++++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java 2012-02-08 15:47:35.835635654 +0000 -+@@ -5693,4 +5693,21 @@ -+ } -+ -+ //#endif JAVA6 -++ -++ -++//#ifdef JAVA7 -++ public boolean generatedKeyAlwaysReturned() throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public ResultSet getPseudoColumns(String catalog, String schemaPattern, -++ String tableNamePattern, String columnNamePattern) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ -++//#endif JAVA7 -++ -+ } -+--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcDataSource.java 2012-02-08 15:14:42.802123563 +0000 -++++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcDataSource.java 2012-02-08 15:47:35.836635653 +0000 -+@@ -47,6 +47,11 @@ -+ //#endif JAVA4 -+ import org.hsqldb.jdbcDriver; -+ -++//#ifdef JAVA7 -++import java.sql.SQLFeatureNotSupportedException; -++import java.util.logging.Logger; -++//#endif JAVA7 -++ -+ // boucherb@users 20040411 - doc 1.7.2 - javadoc updates toward 1.7.2 final -+ -+ /** -+@@ -323,4 +328,12 @@ -+ } -+ -+ //#endif JAVA6 -++ -++//#ifdef JAVA7 -++ public Logger getParentLogger() throws SQLFeatureNotSupportedException -++ { -++ throw new SQLFeatureNotSupportedException("Not supported yet."); -++ } -++ -++//#endif JAVA7 -+ } -+--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcResultSet.java 2012-02-08 15:14:42.802123563 +0000 -++++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcResultSet.java 2012-02-08 15:47:35.866635606 +0000 -+@@ -5324,4 +5324,19 @@ -+ } -+ -+ //#endif JAVA6 -++ -++//#ifdef JAVA7 -++ -++ public T getObject(String columnLabel, Class type) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public T getObject(int columnNum, Class type) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++//#endif JAVA7 -++ -+ } -+--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java 2012-02-08 15:14:42.802123563 +0000 -++++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java 2012-02-08 15:47:35.872635595 +0000 -+@@ -1608,4 +1608,16 @@ -+ throw new UnsupportedOperationException("Not supported yet."); -+ } -+ //#endif JAVA6 -++ -++//#ifdef JAVA7 -++ public boolean isCloseOnCompletion() throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void closeOnCompletion() throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++//#endif JAVA7 -+ } -+--- misc/hsqldb/src/org/hsqldb/jdbcDriver.java 2012-02-08 15:14:42.800123566 +0000 -++++ misc/build/hsqldb/src/org/hsqldb/jdbcDriver.java 2012-02-08 15:47:35.826635667 +0000 -+@@ -42,6 +42,11 @@ -+ import org.hsqldb.persist.HsqlDatabaseProperties; -+ import org.hsqldb.persist.HsqlProperties; -+ -++//#ifdef JAVA7 -++import java.sql.SQLFeatureNotSupportedException; -++import java.util.logging.Logger; -++//#endif JAVA7 -++ -+ // fredt@users 20011220 - patch 1.7.0 by fredt -+ // new version numbering scheme -+ // fredt@users 20020320 - patch 1.7.0 - JDBC 2 support and error trapping -+@@ -321,4 +326,12 @@ -+ DriverManager.registerDriver(new jdbcDriver()); -+ } catch (Exception e) {} -+ } -++ -++//#ifdef JAVA7 -++ public Logger getParentLogger() throws SQLFeatureNotSupportedException -++ { -++ throw new SQLFeatureNotSupportedException("Not supported yet."); -++ } -++ -++//#endif JAVA7 -+ } --- -1.7.7.6 - diff --git a/0001-ppc-yyinput-returns-a-int-truncating-to-unsigned-cha.patch b/0001-ppc-yyinput-returns-a-int-truncating-to-unsigned-cha.patch deleted file mode 100644 index 2a8f154..0000000 --- a/0001-ppc-yyinput-returns-a-int-truncating-to-unsigned-cha.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 6b3bf27cb56d661725ac3fcfb756562e0ad75564 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Mon, 14 May 2012 14:00:59 +0100 -Subject: [PATCH] ppc: yyinput returns a int, truncating to (unsigned)char - does't work - -retain this as an int so that on platforms where char is unsigned -we don't mangle the value and get this all wrong. - -Fixes database opening tables on ppc if -fsigned-char is removed - -Change-Id: I66f0c6b1b19191595f8b348377579f2daabf7ada ---- - connectivity/source/parse/sqlflex.l | 18 +++++++++--------- - 1 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l -index d5b2f14..fd27cb8 100755 ---- a/connectivity/source/parse/sqlflex.l -+++ b/connectivity/source/parse/sqlflex.l -@@ -76,7 +76,7 @@ using namespace connectivity; - - static ::rtl::OUString aEmptyString; - --static sal_Int32 gatherString(sal_Int32 delim, sal_Int32 nTyp); -+static sal_Int32 gatherString(int delim, sal_Int32 nTyp); - static sal_Int32 gatherName(const sal_Char*); - static sal_Int32 gatherNamePre(const sal_Char* ); - // has to be set before the parser starts -@@ -94,8 +94,8 @@ OSQLScanner* xxx_pGLOBAL_SQLSCAN = NULL; - - #define YY_INPUT(buf,result,max_size) \ - { \ -- buf[0] = xxx_pGLOBAL_SQLSCAN->SQLyygetc(); \ -- result = buf[0] != -1; \ -+ int c = xxx_pGLOBAL_SQLSCAN->SQLyygetc(); \ -+ result = (c == EOF) ? YY_NULL : (buf[0] = c, 1);\ - } - - #define YY_FATAL_ERROR(msg) \ -@@ -518,9 +518,9 @@ inline bool checkeof(int c) { return c == 0 || c == EOF; } - * nTyp == 1 -> SQL_NODE_STRING - * nTyp == 2 -> SQL_NODE_ACCESS_DATE - */ --sal_Int32 gatherString( sal_Int32 delim, sal_Int32 nTyp) -+sal_Int32 gatherString(int delim, sal_Int32 nTyp) - { -- sal_Char ch; -+ int ch; - ::rtl::OStringBuffer sBuffer(256); - - while (!checkeof(ch = yyinput())) -@@ -547,7 +547,7 @@ sal_Int32 gatherString( sal_Int32 delim, sal_Int32 nTyp) - } - else - { -- sBuffer.append(ch); -+ sBuffer.append(static_cast(ch)); - } - - } -@@ -555,7 +555,7 @@ sal_Int32 gatherString( sal_Int32 delim, sal_Int32 nTyp) - break; - else - { -- sBuffer.append(ch); -+ sBuffer.append(static_cast(ch)); - } - } - YY_FATAL_ERROR("Unterminated name string"); -@@ -746,7 +746,7 @@ void OSQLScanner::SQLyyerror(sal_Char *fmt) - - sal_Char *s = Buffer; - sal_Int32 nPos = 1; -- sal_Int32 ch = SQLyytext ? (SQLyytext[0] == 0 ? ' ' : SQLyytext[0]): ' '; -+ int ch = SQLyytext ? (SQLyytext[0] == 0 ? ' ' : SQLyytext[0]): ' '; - *s++ = ch; - while (!checkeof(ch = yyinput())) - { -@@ -800,7 +800,7 @@ void OSQLScanner::prepareScan(const ::rtl::OUString & rNewStatement, const IPars - //------------------------------------------------------------------------------ - sal_Int32 OSQLScanner::SQLyygetc(void) - { -- sal_Int32 nPos = (m_nCurrentPos >= m_sStatement.getLength()) ? -1 : m_sStatement.getStr()[m_nCurrentPos]; -+ sal_Int32 nPos = (m_nCurrentPos >= m_sStatement.getLength()) ? EOF : m_sStatement.getStr()[m_nCurrentPos]; - m_nCurrentPos++; - return nPos; - } --- -1.7.7.6 - diff --git a/0001-silence-SolarMutex-not-locked-spew.patch b/0001-silence-SolarMutex-not-locked-spew.patch deleted file mode 100644 index 8893ea2..0000000 --- a/0001-silence-SolarMutex-not-locked-spew.patch +++ /dev/null @@ -1,68 +0,0 @@ -From f9a4af41ca574760dbd22c8207661fabb6823e3b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Tue, 6 Mar 2012 09:45:08 +0000 -Subject: [PATCH] silence SolarMutex not locked spew - ---- - sw/source/core/txtnode/fntcache.cxx | 2 ++ - sw/source/core/view/viewsh.cxx | 2 ++ - vcl/unx/gtk/window/gtkframe.cxx | 3 +++ - 3 files changed, 7 insertions(+), 0 deletions(-) - -diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx -index 2ec7fb9..4ddeb3d 100644 ---- a/sw/source/core/txtnode/fntcache.cxx -+++ b/sw/source/core/txtnode/fntcache.cxx -@@ -382,6 +382,8 @@ sal_uInt16 SwFntObj::GetFontLeading( const ViewShell *pSh, const OutputDevice& r - { - if ( USHRT_MAX == nGuessedLeading || USHRT_MAX == nExtLeading ) - { -+ SolarMutexGuard aGuard; -+ - const Font aOldFnt( rOut.GetFont() ); - ((OutputDevice&)rOut).SetFont( *pPrtFont ); - const FontMetric aMet( rOut.GetFontMetric() ); -diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx -index 0413382..774000c 100644 ---- a/sw/source/core/view/viewsh.cxx -+++ b/sw/source/core/view/viewsh.cxx -@@ -253,6 +253,8 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd ) - { - if ( !nLockPaint ) - { -+ SolarMutexGuard aGuard; -+ - sal_Bool bPaintsFromSystem = aInvalidRect.HasArea(); - GetWin()->Update(); - if ( aInvalidRect.HasArea() ) -diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx -index 24336ce..a2e6df8 100644 ---- a/vcl/unx/gtk/window/gtkframe.cxx -+++ b/vcl/unx/gtk/window/gtkframe.cxx -@@ -3835,6 +3835,7 @@ void GtkSalFrame::IMHandler::signalIMCommit( GtkIMContext* CONTEXT_ARG, gchar* p - { - GtkSalFrame::IMHandler* pThis = (GtkSalFrame::IMHandler*)im_handler; - -+ SolarMutexGuard aGuard; - vcl::DeletionListener aDel( pThis->m_pFrame ); - // open a block that will end the GTK_YIELD_GRAB before calling preedit changed again - { -@@ -4003,6 +4004,7 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_ - - GTK_YIELD_GRAB(); - -+ SolarMutexGuard aGuard; - vcl::DeletionListener aDel( pThis->m_pFrame ); - - pThis->m_pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&pThis->m_aInputEvent); -@@ -4023,6 +4025,7 @@ void GtkSalFrame::IMHandler::signalIMPreeditEnd( GtkIMContext*, gpointer im_hand - - pThis->m_bPreeditJustChanged = true; - -+ SolarMutexGuard aGuard; - vcl::DeletionListener aDel( pThis->m_pFrame ); - pThis->doCallEndExtTextInput(); - if( ! aDel.isDeleted() ) --- -1.7.7.6 - diff --git a/libreoffice.spec b/libreoffice.spec index cef4587..78b5563 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,4 +1,4 @@ -%define libo_version 3.5.4 +%define libo_version 3.5.5 # rhbz#715152 state vendor %if 0%{?rhel} %define vendoroption --with-vendor="Red Hat, Inc." @@ -34,8 +34,8 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.2 -Release: 3%{?dist} +Version: %{libo_version}.1 +Release: 1%{?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 Group: Applications/Productivity URL: http://www.documentfoundation.org/develop @@ -128,28 +128,22 @@ Patch14: 0001-Disable-problematic-reading-of-external-entities-in-.patch %endif Patch15: 0001-move-binfilter-mime-types-into-extra-.desktop-file.patch Patch16: 0001-Resolves-rhbz-788042-skip-splashscreen-with-quicksta.patch -Patch17: 0001-make-hsqldb-build-with-java-1.7.patch -Patch18: libreoffice-ensure-non-broken-xml-tree.patch -Patch19: 0001-preserve-timestamps-for-.py-files.patch -Patch20: 0001-Resolves-rhbz-788045-swriter-help-etc-doesn-t-show-h.patch -Patch21: 0001-Related-rhbz-799628-crash-with-chewing-IM-with-g3g.patch -Patch22: 0001-silence-SolarMutex-not-locked-spew.patch -Patch23: 0001-Resolves-rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch -Patch24: 0001-Resolves-rhbz-800272-complain-about-unknown-command-.patch -Patch26: 0001-fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch -Patch27: 0001-Resolves-rhbz-806663-SlideshowImpl-can-outlive-SdMod.patch -Patch28: 0001-desktop-do-not-complain-about-soffice-command-line-o.patch -Patch29: 0001-Resolves-fdo-48096-torn-off-popups-trigger-keyboard-.patch -Patch30: 0001-fdo-38088-better-CSV-import-default-separators.patch -Patch31: 0001-save-register-arguments-first.patch -Patch32: 0001-do-not-let-gcc-use-registers-we-are-setting-ourselve.patch -Patch33: 0001-wrong-types-used-here-breaks-64bit-bigendian.patch -Patch34: 0001-Resolves-rhbz-805743-a11y-call-doShow-after-we-have-.patch -Patch35: 0001-Resolves-fdo-49849-implement-Unicode-6.1-hebrew-line.patch -Patch36: 0001-gcc-trunk-fix-unable-to-find-string-literal-operator.patch -Patch37: 0001-ppc-yyinput-returns-a-int-truncating-to-unsigned-cha.patch -Patch38: 0001-Resolves-rhbz-826609-rhbz-820554-fix-smoketest-on-pp.patch -Patch39: 0001-use-ure-instead-of-ure-link.patch +Patch17: libreoffice-ensure-non-broken-xml-tree.patch +Patch18: 0001-preserve-timestamps-for-.py-files.patch +Patch19: 0001-Resolves-rhbz-788045-swriter-help-etc-doesn-t-show-h.patch +Patch20: 0001-Resolves-rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch +Patch21: 0001-Resolves-rhbz-800272-complain-about-unknown-command-.patch +Patch22: 0001-fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch +Patch23: 0001-Resolves-rhbz-806663-SlideshowImpl-can-outlive-SdMod.patch +Patch24: 0001-desktop-do-not-complain-about-soffice-command-line-o.patch +Patch25: 0001-Resolves-fdo-48096-torn-off-popups-trigger-keyboard-.patch +Patch26: 0001-fdo-38088-better-CSV-import-default-separators.patch +Patch27: 0001-save-register-arguments-first.patch +Patch28: 0001-do-not-let-gcc-use-registers-we-are-setting-ourselve.patch +Patch29: 0001-wrong-types-used-here-breaks-64bit-bigendian.patch +Patch30: 0001-Resolves-rhbz-805743-a11y-call-doShow-after-we-have-.patch +Patch31: 0001-Resolves-fdo-49849-implement-Unicode-6.1-hebrew-line.patch +Patch32: 0001-use-ure-instead-of-ure-link.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -994,30 +988,24 @@ mv -f redhat.soc extras/source/palettes/standard.soc %endif %patch15 -p1 -b .move-binfilter-mime-types-into-extra-.desktop-file.patch %patch16 -p1 -b .rhbz788042-skip-splashscreen-with-quicksta.patch -%patch17 -p1 -b .make-hsqldb-build-with-java-1.7.patch -%patch18 -p1 -b .ensure-non-broken-xml-tree.patch -%patch19 -p1 -b .preserve-timestamps-for-.py-files.patch -%patch20 -p1 -b .rhbz788045-swriter-help-etc-doesn-t-show-h.patch -%patch21 -p1 -b .rhbz-799628-crash-with-chewing-IM-with-g3g.patch -%patch22 -p1 -b .silence-SolarMutex-not-locked-spew.patch -%patch23 -p1 -b .rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch -%patch24 -p1 -b .rhbz-800272-complain-about-unknown-command-.patch -%patch26 -p1 -b .fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch -%patch27 -p1 -b .rhbz-806663-SlideshowImpl-can-outlive-SdMod.patch -%patch28 -p1 -b .do-not-complain-about-soffice-command-line-o.patch -%patch29 -p1 -b .fdo48096-torn-off-popups-trigger-keyboard-.patch -%patch30 -p1 -b .fdo-38088-better-CSV-import-default-separators.patch -%patch31 -p1 -b .save-register-arguments-first.patch -%patch32 -p1 -b .do-not-let-gcc-use-registers-we-are-setting-ourselve.patch -%patch33 -p1 -b .wrong-types-used-here-breaks-64bit-bigendian.patch -%patch34 -p1 -b .rhbz-805743-a11y-call-doShow-after-we-have-.patch +%patch17 -p1 -b .ensure-non-broken-xml-tree.patch +%patch18 -p1 -b .preserve-timestamps-for-.py-files.patch +%patch19 -p1 -b .rhbz788045-swriter-help-etc-doesn-t-show-h.patch +%patch20 -p1 -b .rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch +%patch21 -p1 -b .rhbz-800272-complain-about-unknown-command-.patch +%patch22 -p1 -b .fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch +%patch23 -p1 -b .rhbz-806663-SlideshowImpl-can-outlive-SdMod.patch +%patch24 -p1 -b .do-not-complain-about-soffice-command-line-o.patch +%patch25 -p1 -b .fdo48096-torn-off-popups-trigger-keyboard-.patch +%patch26 -p1 -b .fdo-38088-better-CSV-import-default-separators.patch +%patch27 -p1 -b .save-register-arguments-first.patch +%patch28 -p1 -b .do-not-let-gcc-use-registers-we-are-setting-ourselve.patch +%patch29 -p1 -b .wrong-types-used-here-breaks-64bit-bigendian.patch +%patch30 -p1 -b .rhbz-805743-a11y-call-doShow-after-we-have-.patch %if %{defined rhel} && 0%{?rhel} >= 7 || %{defined fedora} && 0%{?fedora} >= 18 -%patch35 -p1 -b .fdo-49849-implement-Unicode-6.1-hebrew-line.patch +%patch31 -p1 -b .fdo-49849-implement-Unicode-6.1-hebrew-line.patch %endif -%patch36 -p1 -b .gcc-trunk-fix-unable-to-find-string-literal-operator.patch -%patch37 -p1 -b .ppc-yyinput-returns-a-int-truncating-to-unsigned-cha.patch -%patch38 -p1 -b .rhbz-826609-rhbz-820554-fix-smoketest-on-pp.patch -%patch39 -p1 -b .use-ure-instead-of-ure-link.patch +%patch32 -p1 -b .use-ure-instead-of-ure-link.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2300,6 +2288,15 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Thu Jun 14 2012 David Tardon - 3.5.5.1-1 +- 3.5.5 rc1 +- drop integrated 0001-make-hsqldb-build-with-java-1.7.patch +- drop integrated 0001-Related-rhbz-799628-crash-with-chewing-IM-with-g3g.patch +- drop integrated 0001-silence-SolarMutex-not-locked-spew.patch +- drop integrated 0001-gcc-trunk-fix-unable-to-find-string-literal-operator.patch +- drop integrated 0001-ppc-yyinput-returns-a-int-truncating-to-unsigned-cha.patch +- drop integrated 0001-Resolves-rhbz-826609-rhbz-820554-fix-smoketest-on-pp.patch + * Mon Jun 11 2012 David Tardon - 3.5.4.2-3 - make gdb pretty printers for URE libs usable again diff --git a/sources b/sources index 793de09..7bd43c9 100644 --- a/sources +++ b/sources @@ -9,7 +9,7 @@ c1b5b8d1dd929a1261a6f8872d92b799 redhat-langpacks.tar.gz fdb27bfe2dbe2e7b57ae194d9bf36bab fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 1f24ab1d39f4a51faf22244c94a6203f 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz -e0ea910f2a6fbe1dbe44e437c89b8cd7 libreoffice-binfilter-3.5.4.2.tar.xz -61afc900785dd7d071b96d9ab0af46f3 libreoffice-core-3.5.4.2.tar.xz -d2e7414a60eacafef45fbc4bc1a8ccb3 libreoffice-help-3.5.4.2.tar.xz -545d1608da2cc736be5c8bf941adbbfb libreoffice-translations-3.5.4.2.tar.xz +f779accd2ed8dbbe817a0086b19e1a4e libreoffice-binfilter-3.5.5.1.tar.xz +7f68071451e13d3f8d1f71d09a7203d4 libreoffice-core-3.5.5.1.tar.xz +1d05f3f8dfbfa4f77763759f407af18e libreoffice-help-3.5.5.1.tar.xz +4981bb46cb5f1861d43ea2932dd7de6c libreoffice-translations-3.5.5.1.tar.xz