From 07fc79dd681281b5a18c8429a148cd3c036ec985a1a741abb21171bb8d50058c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 23 Jun 2015 13:26:53 +0000 Subject: [PATCH] - Version bump to 5.0 rc1, remove obsolete patches: * 0001-Fix-could-not-convert-.-const-char-to-const-rtl-OUSt.patch * 0001-writerperfect-fix-gcc-4.7-build.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=297 --- ...nvert-.-const-char-to-const-rtl-OUSt.patch | 65 ---------- 0001-writerperfect-fix-gcc-4.7-build.patch | 118 ------------------ libreoffice-5.0.0.0.beta3.tar.xz | 3 - libreoffice-5.0.0.1.tar.xz | 3 + libreoffice-help-5.0.0.0.beta3.tar.xz | 3 - libreoffice-help-5.0.0.1.tar.xz | 3 + libreoffice-translations-5.0.0.0.beta3.tar.xz | 3 - libreoffice-translations-5.0.0.1.tar.xz | 3 + libreoffice.changes | 7 ++ libreoffice.spec | 7 +- 10 files changed, 17 insertions(+), 198 deletions(-) delete mode 100644 0001-Fix-could-not-convert-.-const-char-to-const-rtl-OUSt.patch delete mode 100644 0001-writerperfect-fix-gcc-4.7-build.patch delete mode 100644 libreoffice-5.0.0.0.beta3.tar.xz create mode 100644 libreoffice-5.0.0.1.tar.xz delete mode 100644 libreoffice-help-5.0.0.0.beta3.tar.xz create mode 100644 libreoffice-help-5.0.0.1.tar.xz delete mode 100644 libreoffice-translations-5.0.0.0.beta3.tar.xz create mode 100644 libreoffice-translations-5.0.0.1.tar.xz diff --git a/0001-Fix-could-not-convert-.-const-char-to-const-rtl-OUSt.patch b/0001-Fix-could-not-convert-.-const-char-to-const-rtl-OUSt.patch deleted file mode 100644 index cafc0e5..0000000 --- a/0001-Fix-could-not-convert-.-const-char-to-const-rtl-OUSt.patch +++ /dev/null @@ -1,65 +0,0 @@ -From a44b770b59d322083cac6ac22cef20ce17a89e6d Mon Sep 17 00:00:00 2001 -From: Tor Lillqvist -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 - diff --git a/0001-writerperfect-fix-gcc-4.7-build.patch b/0001-writerperfect-fix-gcc-4.7-build.patch deleted file mode 100644 index bb1d7da..0000000 --- a/0001-writerperfect-fix-gcc-4.7-build.patch +++ /dev/null @@ -1,118 +0,0 @@ -From 72833e22fcb2914fc422ff84d8e853d3e99c6c44 Mon Sep 17 00:00:00 2001 -From: Miklos Vajna -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 ---- - 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 - diff --git a/libreoffice-5.0.0.0.beta3.tar.xz b/libreoffice-5.0.0.0.beta3.tar.xz deleted file mode 100644 index 9b487a6..0000000 --- a/libreoffice-5.0.0.0.beta3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33023369a892e369023727b233505eaf076549fb71d394e78ed26fdf9a94a4a7 -size 164938212 diff --git a/libreoffice-5.0.0.1.tar.xz b/libreoffice-5.0.0.1.tar.xz new file mode 100644 index 0000000..41a4d67 --- /dev/null +++ b/libreoffice-5.0.0.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c0070883377219be34a5961761576c953e18ef0aa6b5f8f6dc7c126d4ff80bad +size 164983572 diff --git a/libreoffice-help-5.0.0.0.beta3.tar.xz b/libreoffice-help-5.0.0.0.beta3.tar.xz deleted file mode 100644 index 9e0539e..0000000 --- a/libreoffice-help-5.0.0.0.beta3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7df61c17e7267694b1267b4d76d0e5fb07f45240fd9be6d2adcab91abbd585b2 -size 1882532 diff --git a/libreoffice-help-5.0.0.1.tar.xz b/libreoffice-help-5.0.0.1.tar.xz new file mode 100644 index 0000000..1fc037e --- /dev/null +++ b/libreoffice-help-5.0.0.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31ea2d01550a72cdf3a8bd76c404ad20ee44e57c37e3af7aaa1a4f7eb7067e7f +size 1881864 diff --git a/libreoffice-translations-5.0.0.0.beta3.tar.xz b/libreoffice-translations-5.0.0.0.beta3.tar.xz deleted file mode 100644 index d792a2e..0000000 --- a/libreoffice-translations-5.0.0.0.beta3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e518873140290a61a9175dd6a1860bd11402986d44a9b569d13fe3fc5b62b797 -size 127767644 diff --git a/libreoffice-translations-5.0.0.1.tar.xz b/libreoffice-translations-5.0.0.1.tar.xz new file mode 100644 index 0000000..a0e8515 --- /dev/null +++ b/libreoffice-translations-5.0.0.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:365c92029bc3703c802063b853f17d50917795087b6aa1b9ee8bc1540d4b4215 +size 128482040 diff --git a/libreoffice.changes b/libreoffice.changes index a719e09..a73047a 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jun 23 13:21:48 UTC 2015 - tchvatal@suse.com + +- Version bump to 5.0 rc1, remove obsolete patches: + * 0001-Fix-could-not-convert-.-const-char-to-const-rtl-OUSt.patch + * 0001-writerperfect-fix-gcc-4.7-build.patch + ------------------------------------------------------------------- Mon Jun 22 09:15:38 UTC 2015 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 0efae84..af7f7d4 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -65,7 +65,7 @@ Requires: python-importlib %endif # This is used due to the need for beta releases Name: libreoffice -Version: 5.0.0.0.beta3 +Version: 5.0.0.1 Release: 0 Summary: A Free Office Suite (Framework) License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C @@ -172,9 +172,6 @@ Patch5: mediawiki-no-broken-help.diff 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 Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -977,8 +974,6 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch7 -p1 %endif %patch8 -p1 -%patch9 -p1 -%patch10 -p1 %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20}