From 61559a00790a0fc208eed5c8869e9d772cd50d441e24ff71711f72155cdb04e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 16 May 2014 19:58:40 +0000 Subject: [PATCH] Accepting request 234328 from home:timar:branches:LibreOffice:Factory build fix on openSUSE 12.3 OBS-URL: https://build.opensuse.org/request/show/234328 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=152 --- ...en-requires-cstring-include-to-build.patch | 44 +++++ libreoffice.changes | 187 +++++++++--------- libreoffice.spec | 7 +- 3 files changed, 145 insertions(+), 93 deletions(-) create mode 100644 0001-std-strlen-requires-cstring-include-to-build.patch diff --git a/0001-std-strlen-requires-cstring-include-to-build.patch b/0001-std-strlen-requires-cstring-include-to-build.patch new file mode 100644 index 0000000..8baf6db --- /dev/null +++ b/0001-std-strlen-requires-cstring-include-to-build.patch @@ -0,0 +1,44 @@ +From f12631e960a2b4123c96e96d2af7d43741d8e6a5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= +Date: Wed, 12 Mar 2014 13:44:29 +0100 +Subject: [PATCH] std::strlen requires cstring include to build + +Or, even simpler, don't bother with the needless namespacing. + +Change-Id: I4bbb115c1c2c89881a0bf88ccd54b0f5cb8b3518 +(cherry picked from commit da9bd301c6f62e829daadb2af6a6b9633d4f1cb9) +Signed-off-by: Andras Timar +--- + sc/source/filter/excel/xestream.cxx | 2 +- + sc/source/filter/qpro/qpro.cxx | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx +index 035a827..df08d2c 100644 +--- a/sc/source/filter/excel/xestream.cxx ++++ b/sc/source/filter/excel/xestream.cxx +@@ -985,7 +985,7 @@ sax_fastparser::FSHelperPtr& XclExpXmlStream::WriteAttributesInternal( sal_Int32 + rStream->write( " " ) + ->writeId( nAttribute ) + ->write( "=\"" ) +- ->writeEscaped( OUString(pValue, std::strlen(pValue), RTL_TEXTENCODING_UTF8) ) ++ ->writeEscaped( OUString(pValue, strlen(pValue), RTL_TEXTENCODING_UTF8) ) + ->write( "\"" ); + } + +diff --git a/sc/source/filter/qpro/qpro.cxx b/sc/source/filter/qpro/qpro.cxx +index c370492..793412a 100644 +--- a/sc/source/filter/qpro/qpro.cxx ++++ b/sc/source/filter/qpro/qpro.cxx +@@ -229,7 +229,7 @@ void ScQProReader::readString( OUString &rString, sal_uInt16 nLength ) + sal_Char* pText = new sal_Char[ nLength + 1 ]; + mpStream->Read( pText, nLength ); + pText[ nLength ] = 0; +- rString = OUString( pText, std::strlen(pText), mpStream->GetStreamCharSet() ); ++ rString = OUString( pText, strlen(pText), mpStream->GetStreamCharSet() ); + delete [] pText; + } + +-- +1.8.4.5 + diff --git a/libreoffice.changes b/libreoffice.changes index bfeb6c5..315dda0 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 16 10:20:00 UTC 2014 - timar@fsf.hu + +- fix build on openSUSE 12.3 + ------------------------------------------------------------------- Tue May 6 19:58:50 UTC 2014 - tchvatal@suse.com @@ -284,7 +289,7 @@ Fri Jan 17 20:19:39 UTC 2014 - tchvatal@suse.com ------------------------------------------------------------------- Fri Jan 17 20:17:00 UTC 2014 - tchvatal@suse.com -- Updated patch install-with-hardlinks.diff to keep sane whitespace +- Updated patch install-with-hardlinks.diff to keep sane whitespace ------------------------------------------------------------------- Fri Jan 17 20:13:38 UTC 2014 - tchvatal@suse.com @@ -357,17 +362,17 @@ Tue Jan 7 15:09:22 UTC 2014 - tchvatal@suse.com ------------------------------------------------------------------- Mon Jan 6 19:04:53 UTC 2014 - tchvatal@suse.com -- Fix copy&paste +- Fix copy&paste ------------------------------------------------------------------- Mon Jan 6 18:59:34 UTC 2014 - tchvatal@suse.com -- Use bsh2 not bsh1 for dep. Thanks to mvyskocil. +- Use bsh2 not bsh1 for dep. Thanks to mvyskocil. ------------------------------------------------------------------- Mon Jan 6 18:59:09 UTC 2014 - tchvatal@suse.com -- More filelist moves for langpacks and extra files. +- More filelist moves for langpacks and extra files. ------------------------------------------------------------------- Sun Jan 5 20:07:46 UTC 2014 - tchvatal@suse.com @@ -575,7 +580,7 @@ Tue Aug 13 15:21:02 UTC 2013 - pmladek@suse.com ------------------------------------------------------------------- Mon Aug 12 12:30:27 UTC 2013 - dvaleev@suse.com -- disable jfreereport extension for powerpc64 +- disable jfreereport extension for powerpc64 ------------------------------------------------------------------- Thu Aug 1 14:46:22 UTC 2013 - pmladek@suse.com @@ -759,7 +764,7 @@ Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com + --without-system-libodfgen on openSUSE < 13.1 + --without-system-harfbuzz on openSUSE < 12.3 - report builder is not longer an extension - + ------------------------------------------------------------------- Fri Jul 26 10:06:40 UTC 2013 - pmladek@suse.com @@ -873,7 +878,7 @@ Fri May 31 15:14:07 UTC 2013 - pmladek@suse.com + stability improvements - conflicts with older icon theme packages to make sure that all icon themes are up-to-date - + * May 17 2013 by pmladek@suse.com in LibreOffice:Unstable - really does not use hardlinks when the save_space feature is not enabled; @@ -1274,21 +1279,21 @@ Thu Feb 21 10:27:15 UTC 2013 - tchvatal@suse.com * fdups to reduce duplicities in the installed files * bluez-devel to support remore control using BlueTooth - add more system libraries into BuildRequires on openSUSE => 12.3: - * clucene-core-devel - * graphite2-devel - * hyphen-devel - * libcdr-devel - * libcmis-devel - * libexttextcat-devel - * liblangtag-devel - * libmspub-devel - * liborcus-devel - * libredland-devel - * libvisio-devel - * mdds-devel - * mysql-connector-c++-devel - * mythes-devel - * ucpp + * clucene-core-devel + * graphite2-devel + * hyphen-devel + * libcdr-devel + * libcmis-devel + * libexttextcat-devel + * liblangtag-devel + * libmspub-devel + * liborcus-devel + * libredland-devel + * libvisio-devel + * mdds-devel + * mysql-connector-c++-devel + * mythes-devel + * ucpp - remove unused build_module_in_parallel and remove obsolete test_build_binfilters defines - update extensions: @@ -1340,14 +1345,14 @@ Thu Feb 21 10:27:15 UTC 2013 - tchvatal@suse.com - system-python-ure-bootstrap.diff and pyuno-path.diff merged into system-pyuno.diff - remove obsolete configure switches: - * --disable-ldap \ - * --disable-mozilla \ - * --enable-xmlsec \ + * --disable-ldap \ + * --disable-mozilla \ + * --enable-xmlsec \ * --enable-binfilter * --disable-strip-solver - * --without-stlport \ - * --without-system-mozilla \ - * --with-openldap \ + * --without-stlport \ + * --without-system-mozilla \ + * --with-openldap \ * --with-java-target-version=1.5 - use configure switches: * --enable-release-build: use the "LibreOffice" name for the final product @@ -1370,11 +1375,11 @@ Thu Feb 21 10:27:15 UTC 2013 - tchvatal@suse.com * --without-system-libcmis * --without-system-libexttextcat * --without-system-liblangtag - * --without-system-libmspub + * --without-system-libmspub * --without-system-libvisio * --without-system-mythes * --without-system-mysql-cppconn - * --without-system-orcus + * --without-system-orcus * --without-system-redland * --without-system-servlet-api - reduce duplicities by fdupes @@ -1523,17 +1528,17 @@ Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com * several RTF import/export fixes (fdo#48442, fdo#55526, fdo#52475, fdo#50539, fdo#55939, fdo#52389, fdo#55493, fdo#49655, fdo#52989) - update mdds to version 0.6.1: - * mixed_type_matrix: speed up + * mixed_type_matrix: speed up * flat_segment_tree, point_quad_tree: broken iterator implementation * multi_type_vector(new): efficient storage of data of different types * multi_type_matrix(new): eventually replace mixed_type_matrix - update libcdr to version 0.0.9: * better color import (fdo#54785, fdo#55522) * bin obsolete patches: - * mono-enable-climaker-stuff-in-unoil.diff - * mono-install-cli-when-mono-enabled.diff - * mono-install-mono-before-finalizing-filelits.diff -* pack-addressbook.diff: correctly pack KDE and TDE addressbook (bnc#779697) + * mono-enable-climaker-stuff-in-unoil.diff + * mono-install-cli-when-mono-enabled.diff + * mono-install-mono-before-finalizing-filelits.diff +* pack-addressbook.diff: correctly pack KDE and TDE addressbook (bnc#779697) - flat_logo.svg need to be modified by the branding packages - update mime, desktop files, and icon theme cache from the main package - update desktop files cache also from subpackages that install desktop @@ -1732,7 +1737,7 @@ Tue Oct 30 11:58:44 UTC 2012 - pmladek@suse.com * formula performance improvement for XLSX import (bnc#765942, bnc#763168) * make ctrl-8 and 9 increase/decrease font size in Swedish (fdo#36187) * undocked toolbars do not show all icons in special ratio (fdo#47071) - * lots different import fixes (bnc#758883, bnc#766481, bnc#766487, fdo#46966, + * lots different import fixes (bnc#758883, bnc#766481, bnc#766487, fdo#46966, bnc#693238, bnc#758883, bnc#758883, bnc#766487, bnc#758883, bnc#758883) - update libvisio to version 0.0.18: * Greek code page instead the Russian code page (fdo#48602) @@ -2053,7 +2058,7 @@ Thu Jun 14 15:38:44 UTC 2012 - pmladek@suse.com * more on borders handling (fdo#33634, fdo#38116, fdo#40874, fdo#43249, fdo#46112, fdo#48647, fdo#49438) * UI improvements: - * border window: design by Mirek M. + * border window: design by Mirek M. * layout status control: improved artwork by Mirek M. * calc input line: native rendering of the input line * start centre: solid color fits the new artwork better @@ -2122,7 +2127,7 @@ Thu May 17 19:06:15 UTC 2012 - pmladek@suse.com * add VBA support for BackColor, AutoSize, Locked attributes (bnc#749960) * border painting (fdo#45562, fdo#47717, fdo#42750, fdo#45562, fdo#48647, fdo#44010, fdo#38215) - * lots RTF import/export fixes (fdo#49692, fdo#38176, fdo#48023, fdo#48876, + * lots RTF import/export fixes (fdo#49692, fdo#38176, fdo#48023, fdo#48876, fdo#47764, fdo#48193, fdo#48037, fdo#48356, fdo#49692, fdo#49501, fdo#39053) - jvmfwk-disable-gcj.diff: do not detect GCJ; LO newer worked well @@ -2205,7 +2210,7 @@ Fri Apr 6 14:57:48 UTC 2012 - pmladek@suse.com redland, mythes * bin not longer existing options - use system libwpd, libwpg, libwps, librsvg, vigra on openSUSE >= 11.4 -- remove unused sablot-devel, xalan-j2, xerces-j2, xml-commons-apis +- remove unused sablot-devel, xalan-j2, xerces-j2, xml-commons-apis from BuildRequires and Requires - remove some %if sections for not longer supported openSUSE < 11.1 - update license tag: added BSD-4-Clause, SUSE-Public-Domain, W3C @@ -3568,7 +3573,7 @@ Wed Jun 16 19:17:34 CEST 2010 - pmladek@suse.cz * update translations from the openSUSE community * KDE4 bits: * non-Oxygen theme crashes (bnc#612491, i#112102) - + ------------------------------------------------------------------- Mon May 31 17:27:18 CEST 2010 - pmladek@suse.cz @@ -5132,52 +5137,52 @@ Thu Sep 11 22:44:35 CEST 2008 - pmladek@suse.cz - updated to the milestone ooo300-m5 (3.0rc1) - updated ooo-build to version 3.0.0.4: - * add two buttons to scale Impress text up/down - * right-click Approve/Reject with red lining (bnc#249775) - * enabled again WW-like input-fields and checkboxes - * layouted Find&Replace dialog - * new FadeThroughBlack transition - * search /usr/share/templates/ooo for templates - * more on the layout stuff - * more on the external range names - * annoying PDF permission checks - * various fixes of the 3D transitions - * wrong read-out of fontconfig flags (bnc#407958) - * more on skipping overlapped cells (n#362674, i#86943) - * more on chart subtitle export to XLS (bnc#411855, i#92357) + * add two buttons to scale Impress text up/down + * right-click Approve/Reject with red lining (bnc#249775) + * enabled again WW-like input-fields and checkboxes + * layouted Find&Replace dialog + * new FadeThroughBlack transition + * search /usr/share/templates/ooo for templates + * more on the layout stuff + * more on the external range names + * annoying PDF permission checks + * various fixes of the 3D transitions + * wrong read-out of fontconfig flags (bnc#407958) + * more on skipping overlapped cells (n#362674, i#86943) + * more on chart subtitle export to XLS (bnc#411855, i#92357) * disabled problematic fix for moving cell notes with anchored - cells (i#59745, bnc#422677) - * autohinting problem (bnc#407958) - * broken getRecentFunctionIds() (bnc#422206) - * Cyrillic text displayed with too much spacing (i#92072) - * broken logical size calculation on BMP export - * various uninitialised values - * use V2 format for types.rdb as well - * updated Hungarian translation fixes - * mono support to work again - * non-UTF8 dictionaries (bnc#418307) - * import the content of TOC (bnc#404254) - * bin obsolete hack for searching mozilla certificates - * saving with the external odf-converter (bnc#410982) - * 100% CPU usage while opening GNOME fpicker - * avoid extra tab in the task bar for GNOME fpicker + cells (i#59745, bnc#422677) + * autohinting problem (bnc#407958) + * broken getRecentFunctionIds() (bnc#422206) + * Cyrillic text displayed with too much spacing (i#92072) + * broken logical size calculation on BMP export + * various uninitialised values + * use V2 format for types.rdb as well + * updated Hungarian translation fixes + * mono support to work again + * non-UTF8 dictionaries (bnc#418307) + * import the content of TOC (bnc#404254) + * bin obsolete hack for searching mozilla certificates + * saving with the external odf-converter (bnc#410982) + * 100% CPU usage while opening GNOME fpicker + * avoid extra tab in the task bar for GNOME fpicker * VBA bits: - * more on the user forms and event handling - * various regressions - * sheet copying and associated modules (bnc#417320) - * lcl_ScRange_Parse_XL_Header and 3D flags (bnc#422569) - * ClassModule property with type Variant (bnc#417316, i#93214) - * Range with Listbox.value comparison (bnc#421939) - * number to string comparsion (bnc#422559) - * Application.Worksheetfunctions object issue (bnc#414248) - * more on friendly name for objectmodule tab - * worksheet calculate event - * UNO interface of VBA mode - * updated scsolver to the snapshot 2008-09-08 - * build xpdfwrapper only when necessary - * temporary globally disabled report builder - * allow to install dictionaries again - * set java target 1.5 by default + * more on the user forms and event handling + * various regressions + * sheet copying and associated modules (bnc#417320) + * lcl_ScRange_Parse_XL_Header and 3D flags (bnc#422569) + * ClassModule property with type Variant (bnc#417316, i#93214) + * Range with Listbox.value comparison (bnc#421939) + * number to string comparsion (bnc#422559) + * Application.Worksheetfunctions object issue (bnc#414248) + * more on friendly name for objectmodule tab + * worksheet calculate event + * UNO interface of VBA mode + * updated scsolver to the snapshot 2008-09-08 + * build xpdfwrapper only when necessary + * temporary globally disabled report builder + * allow to install dictionaries again + * set java target 1.5 by default - split build of the package (fate#304700) - the new packages were: * OpenOffice_org-base, OpenOffice_org-bootstrap, OpenOffice_org-calc, @@ -5550,7 +5555,7 @@ Mon Apr 14 14:55:05 CEST 2008 - pmladek@suse.cz - enabled system libwpd, libwps, libwpg, hunspell for openSUSE >= 11.0 - added libwpd-devel libwpg-devel libwps-devel hunspell-devel to BuildRequires for openSUSE >= 11.0 -- created a hacky icon-themes-prebuilt package to speed up the build of the +- created a hacky icon-themes-prebuilt package to speed up the build of the real architecture independent icon-themes package - added "hu ja" to the min language selection to support the split i18n-group2 package @@ -5998,7 +6003,7 @@ Fri Aug 31 18:10:10 CEST 2007 - pmladek@suse.cz * branched SUSE-10.3 configuration - updated libwpd to version 0.8.11 * crashes with tables where cells span more then 0x7f rows - * incorrect reading of font information + * incorrect reading of font information - added the tarball with OOX import filters; all these files were added by patches in the previous versions of ooo-build; it was ugly... - fixed dependency on java; any 64-bit JRE is enough on x86_64 @@ -6539,7 +6544,7 @@ Mon Oct 23 16:18:49 CEST 2006 - pmladek@suse.cz - fixed build with gcc (GCC) 4.1.2 20061018 - added /usr/share/templates to search path for templates; made sure that it was - added also for the existing user configuration + added also for the existing user configuration ------------------------------------------------------------------- Thu Oct 19 21:03:47 CEST 2006 - pmladek@suse.cz @@ -6958,7 +6963,7 @@ Thu Mar 2 20:20:10 CET 2006 - pmladek@suse.cz * bitmap surface drawing * arrows misplacing after sheet recalculation * parallel build of cli_ure fix - * build on ppc without java + * build on ppc without java * new wrappers for smoketest, qadevOOo, qatesttool - updated extra translation sources: Bulgarian, Estonian, Greek, Latvian, Slovak, Slovene @@ -7035,7 +7040,7 @@ Fri Feb 10 13:20:36 CET 2006 - pmladek@suse.cz * some fixes in Cairo stuff * reworked patch for d_type entry based speedup * testtool compatibility with our VBA stuff [#145906] - * too wide "Menu/Insert/Picture/From File..." dialog + * too wide "Menu/Insert/Picture/From File..." dialog * quickstarter argv[0] handling * Hebrew font configuration [#114495] * helpcontent configuration of some localizations @@ -7413,7 +7418,7 @@ Tue Aug 23 17:02:05 CEST 2005 - pmladek@suse.cz * target m125 * updated internal cairo to 0.9.2 * backported lots fixes that were approved for 2.0.1 - * case sensitive autoword completion + * case sensitive autoword completion * proper ms access tab page for creating msaccess db * crash in evo2, fix for new API [#10446] * insensitive menu items [#105864] @@ -7926,7 +7931,7 @@ Wed Jan 19 19:40:16 CET 2005 - pmladek@suse.cz * default optimal page wrap * calc / filter fixes * drop libart bits - * build fixes + * build fixes - renamed package to OpenOffice_org, set prefix to /usr/lib/ooo-2.0, removed the wrappers suffix 1.7, set the package version to 1.9.70 - added de, es, fr and it subpackages diff --git a/libreoffice.spec b/libreoffice.spec index 4abe1f1..b15fd5f 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -85,10 +85,12 @@ Patch11: nlpsolver-no-broken-help.diff Patch12: mediawiki-no-broken-help.diff # LO newer worked well with it Patch13: jvmfwk-disable-gcj.diff -# Fix running wizzards in py2 as the utf is not htere +# Fix running wizards in py2 as the utf is not there Patch16: wizards-create-temlates-with-python-2.6.diff # PATCH-FIX-UPSTREAM: fix kde hanging in 4.2.3.3 Patch18: kde4-4.2.3.3-timer-mutex.patch +# Fix build on openSUSE 12.3 +Patch19: 0001-std-strlen-requires-cstring-include-to-build.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: ImageMagick @@ -773,7 +775,7 @@ Provides additional %{langname} translations and resources for %{project}. \ %langpack -l cy -n Welsh %langpack -l da -n Danish -T -X -m da_DK %langpack -l de -n German -T -X -M -%langpack -l dz -n Dzongkha -s ctl -T +%langpack -l dz -n Dzongkha -s ctl -T %langpack -l el -n Greek -T -m el_GR %langpack -l en -n English -L en-US -T -X -p en-GB -p en-ZA -M %langpack -l es -n Spanish -M -T -X @@ -850,6 +852,7 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch13 -p1 %patch16 -p1 %patch18 -p1 +%patch19 -p1 %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20}