update to 5.1.0 beta1
This commit is contained in:
David Tardon
parent
e58e141849
commit
bb108ddfe2
11
.gitignore
vendored
11
.gitignore
vendored
@ -7,7 +7,7 @@
|
||||
/libreoffice-multiliblauncher.sh
|
||||
/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
|
||||
/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz
|
||||
/80d063d6db4c010e18c606af8aed6231-liblangtag-0.5.7.tar.bz2
|
||||
/aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2
|
||||
/46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
|
||||
/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
|
||||
/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
|
||||
@ -21,19 +21,19 @@
|
||||
/Firebird-2.5.2.26540-0.tar.bz2
|
||||
/OpenCOLLADA-master-6509aa13af.tar.bz2
|
||||
/harfbuzz-0.9.40.tar.bz2
|
||||
/language-subtag-registry-2015-06-08.tar.bz2
|
||||
/language-subtag-registry-2015-08-04.tar.bz2
|
||||
/lcms2-2.6.tar.gz
|
||||
/libabw-0.1.1.tar.bz2
|
||||
/libatomic_ops-7_2d.zip
|
||||
/libcdr-0.1.1.tar.bz2
|
||||
/libe-book-0.1.1.tar.bz2
|
||||
/libeot-0.01.tar.bz2
|
||||
/libetonyek-0.1.3.tar.bz2
|
||||
/libetonyek-0.1.4.tar.bz2
|
||||
/libfreehand-0.1.1.tar.bz2
|
||||
/libgltf-0.0.2.tar.bz2
|
||||
/libmspub-0.1.2.tar.bz2
|
||||
/libmwaw-0.3.6.tar.bz2
|
||||
/libodfgen-0.1.4.tar.bz2
|
||||
/libodfgen-0.1.5.tar.bz2
|
||||
/liborcus-0.9.2.tar.gz
|
||||
/libpagemaker-0.0.2.tar.bz2
|
||||
/libvisio-0.1.3.tar.bz2
|
||||
@ -72,3 +72,6 @@
|
||||
/libreoffice-5.1.0.0.alpha1.tar.xz
|
||||
/libreoffice-help-5.1.0.0.alpha1.tar.xz
|
||||
/libreoffice-translations-5.1.0.0.alpha1.tar.xz
|
||||
/libreoffice-5.1.0.0.beta1-buildfix1.tar.xz
|
||||
/libreoffice-help-5.1.0.0.beta1-buildfix1.tar.xz
|
||||
/libreoffice-translations-5.1.0.0.beta1-buildfix1.tar.xz
|
||||
|
||||
@ -1,70 +0,0 @@
|
||||
From b8cb34279feea2d6e8cc0f58f4478f068488f268 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <b8cb34279feea2d6e8cc0f58f4478f068488f268.1445967354.git.erack@redhat.com>
|
||||
From: Eike Rathke <erack@redhat.com>
|
||||
Date: Tue, 27 Oct 2015 16:43:38 +0100
|
||||
Subject: [PATCH] prepare to enable build with ICU 56
|
||||
MIME-Version: 1.0
|
||||
Content-Type: multipart/mixed; boundary="------------erAck-patch-parts"
|
||||
|
||||
This is a multi-part message in MIME format.
|
||||
--------------erAck-patch-parts
|
||||
Content-Type: text/plain; charset=UTF-8; format=fixed
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
|
||||
Accept new UBlockCode enum values.
|
||||
Just make it compile, without adding resource strings and blocks.
|
||||
Excerpt of 5b7e8efbf4d73e385c8fb3469a23c0b2592bfb57
|
||||
|
||||
Change-Id: Ia14e4c1c85f8be3e7bae0eb6f5bec1ae33f1a0bf
|
||||
---
|
||||
svx/source/dialog/charmap.cxx | 26 ++++++++++++++++++++++++++
|
||||
1 file changed, 26 insertions(+)
|
||||
|
||||
|
||||
--------------erAck-patch-parts
|
||||
Content-Type: text/x-patch; name="0001-prepare-to-enable-build-with-ICU-56.patch"
|
||||
Content-Transfer-Encoding: 8bit
|
||||
Content-Disposition: attachment; filename="0001-prepare-to-enable-build-with-ICU-56.patch"
|
||||
|
||||
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
|
||||
index 3d616e9..a65fefc 100644
|
||||
--- a/svx/source/dialog/charmap.cxx
|
||||
+++ b/svx/source/dialog/charmap.cxx
|
||||
@@ -1574,6 +1574,32 @@ void SubsetMap::InitList()
|
||||
aAllSubsets.push_back( Subset( 0x118A0, 0x118FF, RID_SUBSETSTR_WARANG_CITI ) );
|
||||
break;
|
||||
#endif
|
||||
+#if U_ICU_VERSION_MAJOR_NUM >= 56
|
||||
+ /* FIXME: add RID_... to include/svx/ucsubset.hrc and
|
||||
+ * strings to svx/source/dialog/ucsubset.src and Unicode
|
||||
+ * block ranges to aAllSubsets, for now this only
|
||||
+ * compiles.. */
|
||||
+ case UBLOCK_AHOM:
|
||||
+ break;
|
||||
+ case UBLOCK_ANATOLIAN_HIEROGLYPHS:
|
||||
+ break;
|
||||
+ case UBLOCK_CHEROKEE_SUPPLEMENT:
|
||||
+ break;
|
||||
+ case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E:
|
||||
+ break;
|
||||
+ case UBLOCK_EARLY_DYNASTIC_CUNEIFORM:
|
||||
+ break;
|
||||
+ case UBLOCK_HATRAN:
|
||||
+ break;
|
||||
+ case UBLOCK_MULTANI:
|
||||
+ break;
|
||||
+ case UBLOCK_OLD_HUNGARIAN:
|
||||
+ break;
|
||||
+ case UBLOCK_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS:
|
||||
+ break;
|
||||
+ case UBLOCK_SUTTON_SIGNWRITING:
|
||||
+ break;
|
||||
+#endif
|
||||
|
||||
}
|
||||
|
||||
|
||||
--------------erAck-patch-parts--
|
||||
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
From ab6d77264008cb94ff387b4011961f82fcd5754c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Tue, 20 Oct 2015 10:10:16 +0100
|
||||
Subject: [PATCH] use far simpler size group
|
||||
|
||||
Change-Id: I54d658951fb90892d006b265e3d35d91991e73d8
|
||||
---
|
||||
cui/uiconfig/ui/slantcornertabpage.ui | 18 ++++--------------
|
||||
1 file changed, 4 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/cui/uiconfig/ui/slantcornertabpage.ui b/cui/uiconfig/ui/slantcornertabpage.ui
|
||||
index 2751144..b3ce646 100644
|
||||
--- a/cui/uiconfig/ui/slantcornertabpage.ui
|
||||
+++ b/cui/uiconfig/ui/slantcornertabpage.ui
|
||||
@@ -394,8 +394,12 @@
|
||||
</object>
|
||||
<object class="GtkSizeGroup" id="sizegroup1">
|
||||
<widgets>
|
||||
+ <widget name="label5"/>
|
||||
+ <widget name="label6"/>
|
||||
<widget name="FT_RADIUS"/>
|
||||
<widget name="FT_ANGLE"/>
|
||||
+ <widget name="label4"/>
|
||||
+ <widget name="label7"/>
|
||||
</widgets>
|
||||
</object>
|
||||
<object class="GtkSizeGroup" id="sizegroup2">
|
||||
@@ -404,20 +408,6 @@
|
||||
<widget name="MTR_FLD_ANGLE:0.00degrees"/>
|
||||
</widgets>
|
||||
</object>
|
||||
- <object class="GtkSizeGroup" id="sizegroup3">
|
||||
- <widgets>
|
||||
- <widget name="label5"/>
|
||||
- <widget name="label6"/>
|
||||
- <widget name="FT_RADIUS"/>
|
||||
- </widgets>
|
||||
- </object>
|
||||
- <object class="GtkSizeGroup" id="sizegroup4">
|
||||
- <widgets>
|
||||
- <widget name="FT_ANGLE"/>
|
||||
- <widget name="label4"/>
|
||||
- <widget name="label7"/>
|
||||
- </widgets>
|
||||
- </object>
|
||||
<object class="GtkSizeGroup" id="sizegroup5">
|
||||
<widgets>
|
||||
<widget name="controlx1:0.00cm"/>
|
||||
--
|
||||
2.5.0
|
||||
|
||||
@ -3,7 +3,9 @@
|
||||
# Should contain .alphaX / .betaX, if this is pre-release (actually
|
||||
# pre-RC) version. The pre-release string is part of tarball file names,
|
||||
# so we need a way to define it easily at one place.
|
||||
%define libo_prerelease .alpha1
|
||||
%define libo_prerelease .beta1
|
||||
# Should contain any postfix of release tarball name, e.g., -buildfix1.
|
||||
%define libo_src_postfix -buildfix1
|
||||
# rhbz#715152 state vendor
|
||||
%if 0%{?rhel}
|
||||
%define vendoroption --with-vendor="Red Hat, Inc."
|
||||
@ -53,14 +55,14 @@ Summary: Free Software Productivity Suite
|
||||
Name: libreoffice
|
||||
Epoch: 1
|
||||
Version: %{libo_version}.0
|
||||
Release: 6%{?libo_prerelease}%{?dist}
|
||||
Release: 7%{?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 and CC0
|
||||
Group: Applications/Productivity
|
||||
URL: http://www.libreoffice.org/
|
||||
|
||||
Source0: %{source_url}/libreoffice-%{version}%{?libo_prerelease}.tar.xz
|
||||
Source1: %{source_url}/libreoffice-help-%{version}%{?libo_prerelease}.tar.xz
|
||||
Source2: %{source_url}/libreoffice-translations-%{version}%{?libo_prerelease}.tar.xz
|
||||
Source0: %{source_url}/libreoffice-%{version}%{?libo_prerelease}%{?libo_src_postfix}.tar.xz
|
||||
Source1: %{source_url}/libreoffice-help-%{version}%{?libo_prerelease}%{?libo_src_postfix}.tar.xz
|
||||
Source2: %{source_url}/libreoffice-translations-%{version}%{?libo_prerelease}%{?libo_src_postfix}.tar.xz
|
||||
Source3: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
|
||||
Source4: libreoffice-multiliblauncher.sh
|
||||
Source5: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
|
||||
@ -91,10 +93,10 @@ Source18: %{external_url}/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.t
|
||||
Source19: %{external_url}/ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
|
||||
Source20: %{external_url}/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
|
||||
Source21: %{external_url}/lcms2-2.6.tar.gz
|
||||
Source22: %{external_url}/80d063d6db4c010e18c606af8aed6231-liblangtag-0.5.7.tar.bz2
|
||||
Source22: %{external_url}/aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2
|
||||
Source23: %{external_url}/boost_1_59_0.tar.bz2
|
||||
Source24: %{external_url}/harfbuzz-0.9.40.tar.bz2
|
||||
Source25: %{external_url}/language-subtag-registry-2015-06-08.tar.bz2
|
||||
Source25: %{external_url}/language-subtag-registry-2015-08-04.tar.bz2
|
||||
%global bundling_options %{?bundling_options} --without-system-mythes --without-system-redland --without-system-libexttextcat --without-system-clucene --without-system-lcms2 --without-system-liblangtag --without-system-boost --without-system-harfbuzz
|
||||
%endif
|
||||
Source26: %{external_url}/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz
|
||||
@ -104,9 +106,9 @@ Source29: %{external_url}/libwpd-0.10.0.tar.bz2
|
||||
Source30: %{external_url}/libwps-0.4.2.tar.bz2
|
||||
Source31: %{external_url}/libvisio-0.1.3.tar.bz2
|
||||
Source32: %{external_url}/libmspub-0.1.2.tar.bz2
|
||||
Source33: %{external_url}/libodfgen-0.1.4.tar.bz2
|
||||
Source33: %{external_url}/libodfgen-0.1.5.tar.bz2
|
||||
Source34: %{external_url}/libmwaw-0.3.6.tar.bz2
|
||||
Source35: %{external_url}/libetonyek-0.1.3.tar.bz2
|
||||
Source35: %{external_url}/libetonyek-0.1.4.tar.bz2
|
||||
Source36: %{external_url}/libfreehand-0.1.1.tar.bz2
|
||||
Source37: %{external_url}/libabw-0.1.1.tar.bz2
|
||||
Source38: %{external_url}/librevenge-0.0.2.tar.bz2
|
||||
@ -313,8 +315,6 @@ Patch14: 0001-never-run-autogen.sh.patch
|
||||
Patch15: 0001-add-X-TryExec-entries-to-desktop-files.patch
|
||||
# not upstreamed
|
||||
Patch16: 0001-disable-PSD-import-test-which-deadlocks-on-ARM.patch
|
||||
Patch17: 0001-use-far-simpler-size-group.patch
|
||||
Patch18: 0001-prepare-to-enable-build-with-ICU-56.patch
|
||||
|
||||
%define instdir %{_libdir}
|
||||
%define baseinstdir %{instdir}/libreoffice
|
||||
@ -1145,7 +1145,7 @@ done \
|
||||
%{!?-l:%{error:-l must be present}}
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}%{?libo_prerelease} -b 1 -b 2
|
||||
%setup -q -n %{name}-%{version}%{?libo_prerelease}%{?libo_src_postfix} -b 1 -b 2
|
||||
rm -rf git-hooks */git-hooks
|
||||
|
||||
# set up git repo
|
||||
@ -1193,9 +1193,6 @@ sed -i -e /CppunitTest_sw_ooxmlexport/d -e /CppunitTest_sw_ooxmlexport2/d sw/Mod
|
||||
git commit -q -a -m 'disable tests segfaulting on arm'
|
||||
%endif
|
||||
|
||||
git mv writerperfect/qa/unit/data/impress/libetonyek/fail/v6.zip writerperfect/qa/unit/data/impress/libetonyek/pass/v6.zip
|
||||
git commit -am 'update for libetonyek 0.1.4'
|
||||
|
||||
# Seeing .git dir makes some of the build tools change their behavior.
|
||||
# We do not want that. Note: it is still possible to use
|
||||
# git --git-dir=.git-rpm
|
||||
@ -2445,6 +2442,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Nov 26 2015 David Tardon <dtardon@redhat.com> - 1:5.1.0.0-7.beta1
|
||||
- update to 5.1.0 beta1
|
||||
|
||||
* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:5.1.0.0-6.alpha1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
|
||||
|
||||
|
||||
6
sources
6
sources
@ -7,6 +7,6 @@ a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.
|
||||
0168229624cfac409e766913506961a8 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
|
||||
12fb8b5b0d5132726e57b9b9fc7e22c4 libreoffice-multiliblauncher.sh
|
||||
4b87018f7fff1d054939d19920b751a0 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
|
||||
146d7f35639c93da3995009b9caabb9d libreoffice-5.1.0.0.alpha1.tar.xz
|
||||
9e3be1d7779d89f0850da6c776d11489 libreoffice-help-5.1.0.0.alpha1.tar.xz
|
||||
a6ec18586a09c3d7f136cfc2418df6dd libreoffice-translations-5.1.0.0.alpha1.tar.xz
|
||||
89bf9355a689c20fde1fb89afcf3b202 libreoffice-5.1.0.0.beta1-buildfix1.tar.xz
|
||||
d61948dbcd0c091e05ae9dbde4447e13 libreoffice-help-5.1.0.0.beta1-buildfix1.tar.xz
|
||||
a640f886672f1b0d8c3d4fec08a6aef7 libreoffice-translations-5.1.0.0.beta1-buildfix1.tar.xz
|
||||
|
||||
Loading…
Reference in New Issue
Block a user