[libreoffice] 4.1.0 beta2
David Tardon
dtardon at fedoraproject.org
Thu Jun 6 11:04:32 UTC 2013
commit 4d462df8af4f7fe4df1cc18769c71926abedf7bf
Author: David Tardon <dtardon at redhat.com>
Date: Wed Jun 5 17:02:25 2013 +0200
4.1.0 beta2
.gitignore | 3 +
...bz-968892-force-render-full-grapheme-with.patch | 3 +-
0001-autosize-the-frame-direction-listbox.patch | 29 ---------
0001-disable-failing-perf-test.patch | 42 -------------
...-run-autogen.sh-if-building-from-tarballs.patch | 43 --------------
0001-fix-syntax-errors-in-python-wizards.patch | 46 ---------------
...-Don-t-needlessly-pass-URLs-through-INetU.patch | 61 --------------------
...-line-count-should-allow-extra-values-to-.patch | 42 -------------
libreoffice.spec | 33 ++++-------
sources | 6 +-
10 files changed, 19 insertions(+), 289 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 02eb215..ae60725 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,6 @@
/libreoffice-4.1.0.0.beta1.tar.xz
/libreoffice-help-4.1.0.0.beta1.tar.xz
/libreoffice-translations-4.1.0.0.beta1.tar.xz
+/libreoffice-4.1.0.0.beta2.tar.xz
+/libreoffice-help-4.1.0.0.beta2.tar.xz
+/libreoffice-translations-4.1.0.0.beta2.tar.xz
diff --git a/0001-Resolves-rhbz-968892-force-render-full-grapheme-with.patch b/0001-Resolves-rhbz-968892-force-render-full-grapheme-with.patch
index 898916e..9154ad8 100644
--- a/0001-Resolves-rhbz-968892-force-render-full-grapheme-with.patch
+++ b/0001-Resolves-rhbz-968892-force-render-full-grapheme-with.patch
@@ -128,9 +128,8 @@ index a7363f9..d6cdee1 100644
// enforce proper copy semantic
SAL_DLLPRIVATE ServerFontLayout( const ServerFontLayout& );
-@@ -324,6 +326,8 @@
+@@ -324,5 +326,7 @@
virtual void AdjustLayout( ImplLayoutArgs& );
- virtual void ApplyDXArray( ImplLayoutArgs& );
virtual void DrawText( SalGraphics& ) const;
+ void setNeedFallback(ImplLayoutArgs& rArgs, sal_Int32 nIndex,
+ bool bRightToLeft);
diff --git a/libreoffice.spec b/libreoffice.spec
index e93f460..d7566aa 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -3,7 +3,7 @@
# 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 .beta1
+%define libo_prerelease .beta2
# rhbz#715152 state vendor
%if 0%{?rhel}
%define vendoroption --with-vendor="Red Hat, Inc."
@@ -245,16 +245,10 @@ Patch13: libreoffice-rhel6limits.patch
Patch14: libreoffice-rhel6glib.patch
%endif
Patch15: 0001-temporarily-disable-failing-test.patch
-Patch16: 0001-rhbz-961460-Don-t-needlessly-pass-URLs-through-INetU.patch
-Patch17: 0001-do-not-build-LibreOffice_Test.patch
-Patch18: 0001-disable-failing-perf-test.patch
-Patch19: 0001-fix-syntax-errors-in-python-wizards.patch
-Patch20: 0001-don-t-run-autogen.sh-if-building-from-tarballs.patch
-Patch21: 0001-autosize-the-frame-direction-listbox.patch
-Patch22: 0001-setting-max-line-count-should-allow-extra-values-to-.patch
-Patch23: 0001-Resolves-rhbz-968892-force-render-full-grapheme-with.patch
-Patch24: 0001-Related-rhbz-968892-discard-impossible-languages-for.patch
-Patch25: 0002-Related-rhbz-968892-discard-impossible-languages-for.patch
+Patch16: 0001-do-not-build-LibreOffice_Test.patch
+Patch17: 0001-Resolves-rhbz-968892-force-render-full-grapheme-with.patch
+Patch18: 0001-Related-rhbz-968892-discard-impossible-languages-for.patch
+Patch19: 0002-Related-rhbz-968892-discard-impossible-languages-for.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice
@@ -989,16 +983,10 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch14 -p1 -b .rhel6glib.patch
%endif
%patch15 -p1 -b .temporarily-disable-failing-test.patch
-%patch16 -p1 -b .rhbz-961460-Don-t-needlessly-pass-URLs-through-INetU.patch
-%patch17 -p1 -b .do-not-build-LibreOffice_Test.patch
-%patch18 -p1 -b .disable-failing-perf-test.patch
-%patch19 -p1 -b .fix-syntax-errors-in-python-wizards.patch
-%patch20 -p1 -b .don-t-run-autogen.sh-if-building-from-tarballs.patch
-%patch21 -p1 -b .autosize-the-frame-direction-listbox.patch
-%patch22 -p1 -b .setting-max-line-count-should-allow-extra-values-to-.patch
-%patch23 -p1 -b .rhbz-968892-force-render-full-grapheme-with.patch
-%patch24 -p1 -b .rhbz-968892-discard-impossible-languages-for.patch
-%patch25 -p1 -b .rhbz-968892-discard-impossible-languages-for.patch
+%patch16 -p1 -b .do-not-build-LibreOffice_Test.patch
+%patch17 -p1 -b .rhbz-968892-force-render-full-grapheme-with.patch
+%patch18 -p1 -b .rhbz-968892-discard-impossible-languages-for.patch
+%patch19 -p1 -b .rhbz-968892-discard-impossible-languages-for.patch
# TODO: check this
# these are horribly incomplete--empty translations and copied english
@@ -2062,6 +2050,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif
%changelog
+* Wed Jun 05 2013 David Tardon <dtardon at redhat.com> - 1:4.1.0.0-7.beta1
+- 4.1.0 beta2
+
* Wed Jun 05 2013 Caolán McNamara <caolanm at redhat.com> - 1:4.1.0.0-6.beta1
- Related: rhbz#968892 discard impossible languages for Oriya script
diff --git a/sources b/sources
index 0ae5570..dae34a1 100644
--- a/sources
+++ b/sources
@@ -6,6 +6,6 @@ a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.
1f24ab1d39f4a51faf22244c94a6203f 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
0168229624cfac409e766913506961a8 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
12fb8b5b0d5132726e57b9b9fc7e22c4 libreoffice-multiliblauncher.sh
-ccf58a56617b3184a547393d29844b3c libreoffice-4.1.0.0.beta1.tar.xz
-94745bc3ce9585a72cb11f9f95c1f860 libreoffice-help-4.1.0.0.beta1.tar.xz
-cfd16802227ae46b5cf04abbd95a49b8 libreoffice-translations-4.1.0.0.beta1.tar.xz
+a785e1ed4809246edc39d0b55a807cdd libreoffice-4.1.0.0.beta2.tar.xz
+96ea39853d9058cb9e98749539827187 libreoffice-help-4.1.0.0.beta2.tar.xz
+6ecbe09a87d5c2c1a186671d24643111 libreoffice-translations-4.1.0.0.beta2.tar.xz
More information about the scm-commits
mailing list