pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Provide/obsolete crystal icons so they are purged and not left over

Browse Source 
- Add few patch to get LO in more buildable state on SLE11, all
  upstreamed:
  * 0001-Fix-could-not-convert-.-const-char-to-const-rtl-OUSt.patch
  * 0001-writerperfect-fix-gcc-4.7-build.patch
  * fix-old-poppler.patch

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=293
This commit is contained in:
Tomáš Chvátal 2015-06-19 09:41:48 +00:00 committed by Git OBS Bridge
parent 4df94ea244
commit 2e33986a90
5 changed files with 217 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
0001-Fix-could-not-convert-.-const-char-to-const-rtl-OUSt.patch Normal file
View File

@ -0,0 +1,65 @@
From a44b770b59d322083cac6ac22cef20ce17a89e6d Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Fri, 5 Jun 2015 16:45:45 +0300
Subject: [PATCH] =?UTF-8?q?Fix:=20could=20not=20convert=20[...]=20?=
=?UTF-8?q?=E2=80=98const=20char*=E2=80=99=20to=20=E2=80=98const=20rtl::OU?=
=?UTF-8?q?String=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: Ib94c9f5eed0da67e846705f5c2c233c10583c791
---
svx/source/form/fmdmod.cxx | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx
index 447ad5a..bb63fed 100644
--- a/svx/source/form/fmdmod.cxx
+++ b/svx/source/form/fmdmod.cxx
@@ -65,25 +65,25 @@ SAL_WNOUNREACHABLE_CODE_POP
{
static const OUString aSvxComponentServiceNameList[] =
{
- FM_SUN_COMPONENT_TEXTFIELD,
- FM_SUN_COMPONENT_FORM,
- FM_SUN_COMPONENT_LISTBOX,
- FM_SUN_COMPONENT_COMBOBOX,
- FM_SUN_COMPONENT_RADIOBUTTON,
- FM_SUN_COMPONENT_GROUPBOX,
- FM_SUN_COMPONENT_FIXEDTEXT,
- FM_SUN_COMPONENT_COMMANDBUTTON,
+ OUString(FM_SUN_COMPONENT_TEXTFIELD),
+ OUString(FM_SUN_COMPONENT_FORM),
+ OUString(FM_SUN_COMPONENT_LISTBOX),
+ OUString(FM_SUN_COMPONENT_COMBOBOX),
+ OUString(FM_SUN_COMPONENT_RADIOBUTTON),
+ OUString(FM_SUN_COMPONENT_GROUPBOX),
+ OUString(FM_SUN_COMPONENT_FIXEDTEXT),
+ OUString(FM_SUN_COMPONENT_COMMANDBUTTON),
OUString(FM_SUN_COMPONENT_CHECKBOX),
- FM_SUN_COMPONENT_GRIDCONTROL,
- FM_SUN_COMPONENT_IMAGEBUTTON,
- FM_SUN_COMPONENT_FILECONTROL,
- FM_SUN_COMPONENT_TIMEFIELD,
- FM_SUN_COMPONENT_DATEFIELD,
+ OUString(FM_SUN_COMPONENT_GRIDCONTROL),
+ OUString(FM_SUN_COMPONENT_IMAGEBUTTON),
+ OUString(FM_SUN_COMPONENT_FILECONTROL),
+ OUString(FM_SUN_COMPONENT_TIMEFIELD),
+ OUString(FM_SUN_COMPONENT_DATEFIELD),
OUString(FM_SUN_COMPONENT_NUMERICFIELD),
- FM_SUN_COMPONENT_CURRENCYFIELD,
- FM_SUN_COMPONENT_PATTERNFIELD,
- FM_SUN_COMPONENT_HIDDENCONTROL,
- FM_SUN_COMPONENT_IMAGECONTROL
+ OUString(FM_SUN_COMPONENT_CURRENCYFIELD),
+ OUString(FM_SUN_COMPONENT_PATTERNFIELD),
+ OUString(FM_SUN_COMPONENT_HIDDENCONTROL),
+ OUString(FM_SUN_COMPONENT_IMAGECONTROL)
};
static const sal_uInt16 nSvxComponentServiceNameListCount = sizeof(aSvxComponentServiceNameList) / sizeof ( aSvxComponentServiceNameList[0] );
--
2.4.3

118
0001-writerperfect-fix-gcc-4.7-build.patch Normal file
View File

@ -0,0 +1,118 @@
From 72833e22fcb2914fc422ff84d8e853d3e99c6c44 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Wed, 10 Jun 2015 09:12:12 +0200
Subject: [PATCH] writerperfect: fix gcc-4.7 build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
error: could not convert '(const char*)"..."' from 'const char*' to 'const rtl::OUString'
Change-Id: Ia8569aed46e571bd98489fd91b9708d0fe5df4c0
Signed-off-by: Tomáš Chvátal <tomas.chvatal@gmail.com>
---
writerperfect/source/common/WPFTEncodingDialog.cxx | 88 +++++++++++-----------
1 file changed, 44 insertions(+), 44 deletions(-)
diff --git a/writerperfect/source/common/WPFTEncodingDialog.cxx b/writerperfect/source/common/WPFTEncodingDialog.cxx
index de521c6..dec775b 100644
--- a/writerperfect/source/common/WPFTEncodingDialog.cxx
+++ b/writerperfect/source/common/WPFTEncodingDialog.cxx
@@ -38,50 +38,50 @@ struct EncodingImplementation
OUString const(EncodingImplementation::s_encodings[])=
{
- "MacArabic", "Arabic (Apple Macintosh)",
- "CP864", "Arabic (DOS/OS2-864)",
- "CP1006", "Arabic (IBM-1006)",
- "CP1256", "Arabic (Windows-1256)",
- "CP775", "Baltic (DOS/OS2-775)",
- "CP1257", "Baltic (Windows-1257)",
- "MacCeltic", "Celtic (Apple Macintosh)",
- "MacCyrillic", "Cyrillic (Apple Macintosh)",
- "CP855", "Cyrillic (DOS/OS2-855)",
- "CP866", "Cyrillic (DOS/OS2-866/Russian)",
- "CP1251", "Cyrillic (Windows-1251)",
- "MacCEurope", "Eastern Europe (Apple Macintosh)",
- "MacCroatian", "Eastern Europe (Apple Macintosh/Croatian)",
- "MacRomanian", "Eastern Europe (Apple Macintosh/Romanian)",
- "CP852", "Eastern Europe (DOS/OS2-852)",
- "CP1250", "Eastern Europe (Windows-1250/WinLatin 2)",
- "MacGreek", "Greek (Apple Macintosh)",
- "CP737", "Greek (DOS/OS2-737)",
- "CP869", "Greek (DOS/OS2-869/Greek-2)",
- "CP875", "Greek (DOS/OS2-875)",
- "CP1253", "Greek (Windows-1253)",
- "MacHebrew", "Hebrew (Apple Macintosh)",
- "CP424", "Hebrew (DOS/OS2-424)",
- "CP856", "Hebrew (DOS/OS2-856)",
- "CP862", "Hebrew (DOS/OS2-862)",
- "CP1255", "Hebrew (Windows-1255)",
- "CP500", "International (DOS/OS2-500)",
- "MacThai", "Thai (Apple Macintosh)",
- "CP874", "Thai (DOS/OS2-874)",
- "MacTurkish", "Turkish (Apple Macintosh)",
- "CP857", "Turkish (DOS/OS2-857)",
- "CP1026", "Turkish (DOS/OS2-1026)",
- "CP1254", "Turkish (Windows-1254)",
- "CP1258", "Vietnamese (Windows-1258)",
- "MacRoman", "Western Europe (Apple Macintosh)",
- "MacIceland", "Western Europe (Apple Macintosh/Icelandic)",
- "CP037", "Western Europe (DOS/OS2-037/US-Canada)",
- "CP437", "Western Europe (DOS/OS2-437/US)",
- "CP850", "Western Europe (DOS/OS2-850)",
- "CP860", "Western Europe (DOS/OS2-860/Portuguese)",
- "CP861", "Western Europe (DOS/OS2-861/Icelandic)",
- "CP863", "Western Europe (DOS/OS2-863/French)",
- "CP865", "Western Europe (DOS/OS2-865/Nordic)",
- "CP1252", "Western Europe (Windows-1252/WinLatin 1)"
+ OUString("MacArabic"), OUString("Arabic (Apple Macintosh)"),
+ OUString("CP864"), OUString("Arabic (DOS/OS2-864)"),
+ OUString("CP1006"), OUString("Arabic (IBM-1006)"),
+ OUString("CP1256"), OUString("Arabic (Windows-1256)"),
+ OUString("CP775"), OUString("Baltic (DOS/OS2-775)"),
+ OUString("CP1257"), OUString("Baltic (Windows-1257)"),
+ OUString("MacCeltic"), OUString("Celtic (Apple Macintosh)"),
+ OUString("MacCyrillic"), OUString("Cyrillic (Apple Macintosh)"),
+ OUString("CP855"), OUString("Cyrillic (DOS/OS2-855)"),
+ OUString("CP866"), OUString("Cyrillic (DOS/OS2-866/Russian)"),
+ OUString("CP1251"), OUString("Cyrillic (Windows-1251)"),
+ OUString("MacCEurope"), OUString("Eastern Europe (Apple Macintosh)"),
+ OUString("MacCroatian"), OUString("Eastern Europe (Apple Macintosh/Croatian)"),
+ OUString("MacRomanian"), OUString("Eastern Europe (Apple Macintosh/Romanian)"),
+ OUString("CP852"), OUString("Eastern Europe (DOS/OS2-852)"),
+ OUString("CP1250"), OUString("Eastern Europe (Windows-1250/WinLatin 2)"),
+ OUString("MacGreek"), OUString("Greek (Apple Macintosh)"),
+ OUString("CP737"), OUString("Greek (DOS/OS2-737)"),
+ OUString("CP869"), OUString("Greek (DOS/OS2-869/Greek-2)"),
+ OUString("CP875"), OUString("Greek (DOS/OS2-875)"),
+ OUString("CP1253"), OUString("Greek (Windows-1253)"),
+ OUString("MacHebrew"), OUString("Hebrew (Apple Macintosh)"),
+ OUString("CP424"), OUString("Hebrew (DOS/OS2-424)"),
+ OUString("CP856"), OUString("Hebrew (DOS/OS2-856)"),
+ OUString("CP862"), OUString("Hebrew (DOS/OS2-862)"),
+ OUString("CP1255"), OUString("Hebrew (Windows-1255)"),
+ OUString("CP500"), OUString("International (DOS/OS2-500)"),
+ OUString("MacThai"), OUString("Thai (Apple Macintosh)"),
+ OUString("CP874"), OUString("Thai (DOS/OS2-874)"),
+ OUString("MacTurkish"), OUString("Turkish (Apple Macintosh)"),
+ OUString("CP857"), OUString("Turkish (DOS/OS2-857)"),
+ OUString("CP1026"), OUString("Turkish (DOS/OS2-1026)"),
+ OUString("CP1254"), OUString("Turkish (Windows-1254)"),
+ OUString("CP1258"), OUString("Vietnamese (Windows-1258)"),
+ OUString("MacRoman"), OUString("Western Europe (Apple Macintosh)"),
+ OUString("MacIceland"), OUString("Western Europe (Apple Macintosh/Icelandic)"),
+ OUString("CP037"), OUString("Western Europe (DOS/OS2-037/US-Canada)"),
+ OUString("CP437"), OUString("Western Europe (DOS/OS2-437/US)"),
+ OUString("CP850"), OUString("Western Europe (DOS/OS2-850)"),
+ OUString("CP860"), OUString("Western Europe (DOS/OS2-860/Portuguese)"),
+ OUString("CP861"), OUString("Western Europe (DOS/OS2-861/Icelandic)"),
+ OUString("CP863"), OUString("Western Europe (DOS/OS2-863/French)"),
+ OUString("CP865"), OUString("Western Europe (DOS/OS2-865/Nordic)"),
+ OUString("CP1252"), OUString("Western Europe (Windows-1252/WinLatin 1)")
};
int EncodingImplementation::numEncodings()
--
2.4.3

14
fix-old-poppler.patch Normal file
View File

@ -0,0 +1,14 @@
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index cc64db4..d2602c1 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -114,7 +114,7 @@ namespace pdfi
bool operator==(const FontAttributes& rFont) const
{
- return familyName.cmp(
+ return const_cast<GooString*>(&familyName)->cmp(
const_cast<GooString*>(&rFont.familyName))==0 &&
isEmbedded == rFont.isEmbedded &&
isBold == rFont.isBold &&

10
libreoffice.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Fri Jun 19 09:40:37 UTC 2015 - tchvatal@suse.com
- Provide/obsolete crystal icons so they are purged and not left over
- Add few patch to get LO in more buildable state on SLE11, all
upstreamed:
* 0001-Fix-could-not-convert-.-const-char-to-const-rtl-OUSt.patch
* 0001-writerperfect-fix-gcc-4.7-build.patch
* fix-old-poppler.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 17 06:54:47 UTC 2015 - tchvatal@suse.com Wed Jun 17 06:54:47 UTC 2015 - tchvatal@suse.com

10
libreoffice.spec
View File

@ -168,6 +168,11 @@ Patch4: nlpsolver-no-broken-help.diff
Patch5: mediawiki-no-broken-help.diff Patch5: mediawiki-no-broken-help.diff
# PATCH-FIX-SUSE: do not declare java6 available for without system libs build # PATCH-FIX-SUSE: do not declare java6 available for without system libs build
Patch7: 0001-Make-HAVE_JAVA6-be-always-false.patch Patch7: 0001-Make-HAVE_JAVA6-be-always-false.patch
# PATCH-FIX-UPSTREAM: old poppler is broken without this
Patch8: fix-old-poppler.patch
# PATCH-FIX-UPSTREAM: old gcc compat
Patch9: 0001-Fix-could-not-convert-.-const-char-to-const-rtl-OUSt.patch
Patch10: 0001-writerperfect-fix-gcc-4.7-build.patch
# try to save space by using hardlinks # try to save space by using hardlinks
Patch990: install-with-hardlinks.diff Patch990: install-with-hardlinks.diff
BuildRequires: %{name}-share-linker BuildRequires: %{name}-share-linker
@ -246,6 +251,8 @@ Provides: %{name}-l10n-prebuild = %{version}
Obsoletes: %{name}-l10n-prebuild < %{version} Obsoletes: %{name}-l10n-prebuild < %{version}
Provides: %{name}-ure = %{version} Provides: %{name}-ure = %{version}
Obsoletes: %{name}-ure < %{version} Obsoletes: %{name}-ure < %{version}
Provides: %{name}-icon-theme-breeze = %{version}
Obsoletes: %{name}-icon-theme-breeze < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %arm %ix86 x86_64 ppc ppc64 ExclusiveArch: %arm %ix86 x86_64 ppc ppc64
%if %{with systemlibs} %if %{with systemlibs}
@ -967,6 +974,9 @@ Provides additional %{langname} translations and resources for %{project}. \
%if !%{with systemlibs} %if !%{with systemlibs}
%patch7 -p1 %patch7 -p1
%endif %endif
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch990 -p1 %patch990 -p1
# 256x256 icons # 256x256 icons
tar -xjf %{SOURCE20} tar -xjf %{SOURCE20}