rpms
/
libreoffice
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 3.4 beta4

Browse Source
f41
David Tardon 14 years ago
parent e3dcceb101
commit 78e2eae7e2
5 changed files with 61 additions and 95 deletions
Show Stats Download Patch File Download Diff File

21
.gitignore vendored
Unescape View File

@ -49,3 +49,24 @@
/libreoffice-translations-3.3.99.1.tar.bz2
/libreoffice-ure-3.3.99.1.tar.bz2
/libreoffice-writer-3.3.99.1.tar.bz2
/libreoffice-artwork-3.3.99.4.tar.bz2
/libreoffice-base-3.3.99.4.tar.bz2
/libreoffice-bootstrap-3.3.99.4.tar.bz2
/libreoffice-calc-3.3.99.4.tar.bz2
/libreoffice-components-3.3.99.4.tar.bz2
/libreoffice-extensions-3.3.99.4.tar.bz2
/libreoffice-extras-3.3.99.4.tar.bz2
/libreoffice-filters-3.3.99.4.tar.bz2
/libreoffice-help-3.3.99.4.tar.bz2
/libreoffice-impress-3.3.99.4.tar.bz2
/libreoffice-libs-core-3.3.99.4.tar.bz2
/libreoffice-libs-extern-3.3.99.4.tar.bz2
/libreoffice-libs-extern-sys-3.3.99.4.tar.bz2
/libreoffice-libs-gui-3.3.99.4.tar.bz2
/libreoffice-postprocess-3.3.99.4.tar.bz2
/libreoffice-sdk-3.3.99.4.tar.bz2
/libreoffice-testing-3.3.99.4.tar.bz2
/libreoffice-translations-3.3.99.4.tar.bz2
/libreoffice-ure-3.3.99.4.tar.bz2
/libreoffice-writer-3.3.99.4.tar.bz2
/libreoffice-multiliblauncher.sh

57
0001-Removed-duplicate-code-block-mis-merge-prolly.patch
Unescape View File

@ -1,57 +0,0 @@
From ea898caa151fb8e94b6bdb00b1008b6da98fddad Mon Sep 17 00:00:00 2001
From: Katarina Machalkova <kmachalkova@suse.cz>
Date: Thu, 7 Apr 2011 13:11:00 +0200
Subject: [PATCH] Removed duplicate code block (mis-merge, prolly)
This fixes build with --enable-kde4
---
vcl/unx/kde4/KDEXLib.cxx | 10 ----------
1 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index 7757014..ca435c8 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -219,16 +219,6 @@ static bool qt_event_filter( void* m )
return false;
}
-static bool ( *old_qt_event_filter )( void* );
-static bool qt_event_filter( void* m )
-{
- if( old_qt_event_filter != NULL && old_qt_event_filter( m ))
- return true;
- if( SalKDEDisplay::self() && SalKDEDisplay::self()->checkDirectInputEvent( static_cast< XEvent* >( m )))
- return true;
- return false;
-}
-
void KDEXLib::setupEventLoop()
{
old_qt_event_filter = QAbstractEventDispatcher::instance()->setEventFilter( qt_event_filter );
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 4809b1f..5c787bb 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -439,8 +439,6 @@ void GDIMetaFile::Play( GDIMetaFile& rMtf, sal_uLong nPos )
rMtf.UseCanvas( rMtf.GetUseCanvas() || bUseCanvas );
- rMtf.UseCanvas( rMtf.GetUseCanvas() || bUseCanvas );
-
if( nPos > nObjCount )
nPos = nObjCount;
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index 6cf466d..3b9a13c 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -433,8 +433,6 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
const int width = kapp->style()->pixelMetric(QStyle::PM_ToolBarHandleExtent);
QRect rect( 0, 0, width, widgetRect.height());
clipRegion = new QRegion( widgetRect.x(), widgetRect.y(), width, widgetRect.height());
- XRectangle xRect = { widgetRect.x(), widgetRect.y(), width, widgetRect.height() };
- XUnionRectWithRegion( &xRect, pTempClipRegion, pTempClipRegion );
QStyleOption option;
option.state = QStyle::State_Horizontal;

BIN
7de0b88ce2dd932915894385b54be1897d5ee053.zip
View File

Binary file not shown.

25
libreoffice.spec
Unescape View File

@ -14,8 +14,8 @@
Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: 3.3.99.1
Release: 2%{?dist}
Version: 3.3.99.4
Release: 1%{?dist}
License: LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain
Group: Applications/Productivity
URL: http://www.documentfoundation.org/develop
@ -83,11 +83,9 @@ Patch8: openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
Patch9: libreoffice-installfix.patch
Patch10: 0001-helgrind-Related-rhbz-655686-get-order-of-shutdown-c.patch
Patch11: kde4configure.patch
Patch12: 0001-Removed-duplicate-code-block-mis-merge-prolly.patch
Patch13: 7de0b88ce2dd932915894385b54be1897d5ee053.zip
Patch14: 0001-Resolves-rhbz-695509-crash-in-RefreshDocumentLB.patch
Patch15: 0001-bubble-down-configure-test-findings-on-visibility.patch
Patch16: vbahelper.visibility.patch
Patch12: 0001-Resolves-rhbz-695509-crash-in-RefreshDocumentLB.patch
Patch13: 0001-bubble-down-configure-test-findings-on-visibility.patch
Patch14: vbahelper.visibility.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@ -703,11 +701,9 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch9 -p1 -b .libreoffice-installfix.patch
%patch10 -p1 -b .rhbz655686-get-order-of-shutdown-c.patch
%patch11 -p0 -b .kde4configure.patch
%patch12 -p1 -b .Removed-duplicate-code-block-mis-merge-prolly.patch
unzip -o %{PATCH13}
%patch14 -p1 -b .rhbz695509-crash-in-RefreshDocumentLB.patch
%patch15 -p1 -b .bubble-down-configure-test-findings-on-visibility.patch
%patch16 -p0 -b .vbahelper.visibility.patch
%patch12 -p1 -b .rhbz695509-crash-in-RefreshDocumentLB.patch
%patch13 -p1 -b .bubble-down-configure-test-findings-on-visibility.patch
%patch14 -p0 -b .vbahelper.visibility.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@ -2015,6 +2011,11 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%{basisinstdir}/program/kde-open-url
%changelog
* Sat May 07 2011 David Tardon <dtardon@redhat.com> 3.3.99.4-1
- 3.4 beta4
- drop integrated 0001-Removed-duplicate-code-block-mis-merge-prolly.patch
- drop integrated 7de0b88ce2dd932915894385b54be1897d5ee053.zip
* Mon Apr 18 2011 Caolán McNamara <caolanm@redhat.com> 3.3.99.1-2
- Resolves: rhbz#695509 crash in RefreshDocumentLB
- bubble down configure test findings on visibility

53
sources
Unescape View File

@ -1,31 +1,32 @@
18f577b374d60b3c760a3a3350407632 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
0b13a4c15ce0c447ebf141c29343d4f6 libreoffice-artwork-3.3.99.4.tar.bz2
ac21e7de6c16a3037c30cf0058ce1ee0 libreoffice-base-3.3.99.4.tar.bz2
729bbef35ed5de9c024bdf6e5a7cb606 libreoffice-libs-core-3.3.99.4.tar.bz2
f017689e83495abbf0616dca9e63a27a libreoffice-libs-extern-3.3.99.4.tar.bz2
349dbf7e9761a45556dae382769c0e29 libreoffice-libs-extern-sys-3.3.99.4.tar.bz2
7baba6423c6d23ec63a9bdf9f277d43a libreoffice-libs-gui-3.3.99.4.tar.bz2
a02f988c0ad2d99a15084d2da030f7e2 libreoffice-postprocess-3.3.99.4.tar.bz2
09f8fdccdb1ea06f0ec012a60b6c55f5 libreoffice-sdk-3.3.99.4.tar.bz2
458d7e4bb7c72a7c54527ccbb412ab72 libreoffice-testing-3.3.99.4.tar.bz2
1365ec1b5b8b0e55db798cc8713b381c libreoffice-ure-3.3.99.4.tar.bz2
1c7c0c03fcfd632dfb3d3a861f5931a3 libreoffice-writer-3.3.99.4.tar.bz2
776b2991e2f9e1f3c43e00b14e0ed454 libreoffice-translations-3.3.99.4.tar.bz2
bdeb2f96ab0fe5cac37f859c0d3cdff6 libreoffice-bootstrap-3.3.99.4.tar.bz2
185d60944ea767075d27247c3162b3bc 185d60944ea767075d27247c3162b3bc-unowinreg.dll
5786ca0be1fbbb76801de235bb4aff50 redhat-langpacks.tar.gz
74939c9ea525374776f09bf972ede99f libreoffice-multiliblauncher.sh
fdb27bfe2dbe2e7b57ae194d9bf36bab fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
1f24ab1d39f4a51faf22244c94a6203f 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
35c94d2df8893241173de1d16b6034c0 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
798b2ffdc8bcfe7bca2cf92b62caf685 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
35c94d2df8893241173de1d16b6034c0 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
ada24d37d8d638b3d8a9985e80bc2978 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
fdb27bfe2dbe2e7b57ae194d9bf36bab fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
18f577b374d60b3c760a3a3350407632 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
661b7a288052d26b9bf40ed5030071aa libreoffice-calc-3.3.99.4.tar.bz2
17410483b5b5f267aa18b7e00b65e6e0 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
b4cae0700aa1c2aef7eb7f345365e6f1 b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
185d60944ea767075d27247c3162b3bc 185d60944ea767075d27247c3162b3bc-unowinreg.dll
5786ca0be1fbbb76801de235bb4aff50 redhat-langpacks.tar.gz
3dec32be5e6d9de3c4c5d549cec6e9e3 libreoffice-artwork-3.3.99.1.tar.bz2
cb1f4e5005a2fd82a85b1982d172a8c0 libreoffice-base-3.3.99.1.tar.bz2
1840a6c219b1f68460529204bb396c7a libreoffice-bootstrap-3.3.99.1.tar.bz2
7226e5b612313b4e99ccf14cb9ef112b libreoffice-calc-3.3.99.1.tar.bz2
4fe16642e5e0c55a1e53d1b44492a905 libreoffice-components-3.3.99.1.tar.bz2
4eedbc23115d2a6ef491870b02c87953 libreoffice-extensions-3.3.99.1.tar.bz2
84a392a8e027b354cd7cf5e637599d3e libreoffice-extras-3.3.99.1.tar.bz2
e3bf7eb4b7d051ee8c7884ac3526c43f libreoffice-filters-3.3.99.1.tar.bz2
0c4267a389d99aaa7b13ba5db3385072 libreoffice-help-3.3.99.1.tar.bz2
a5ac8c59961c0f46164856b0a6885b30 libreoffice-impress-3.3.99.1.tar.bz2
2b058457f61505485aca3212cc30f842 libreoffice-libs-core-3.3.99.1.tar.bz2
c111fa94966e0dfbf8106c95a41e0d52 libreoffice-libs-extern-3.3.99.1.tar.bz2
100506fcf623bbaa650b38ee1fdd7f12 libreoffice-libs-extern-sys-3.3.99.1.tar.bz2
c226739110eb805a39b878de6f728ee3 libreoffice-libs-gui-3.3.99.1.tar.bz2
bc39162ea42554218fe0402363a8be03 libreoffice-postprocess-3.3.99.1.tar.bz2
1e5d84bc356cca313979f44a7fb323d5 libreoffice-sdk-3.3.99.1.tar.bz2
e89038bbbb4a4f728eed14e4f95b9abb libreoffice-testing-3.3.99.1.tar.bz2
487ffc59476f9e7c5940277096e42c08 libreoffice-translations-3.3.99.1.tar.bz2
ac5692709b11c061849290e31b80fbd2 libreoffice-ure-3.3.99.1.tar.bz2
659adf30d4e614d51f482947c1d1121e libreoffice-writer-3.3.99.1.tar.bz2
295f320e423b62b12ab89a2132e766e6 libreoffice-components-3.3.99.4.tar.bz2
134102097803efc07d3a6bec536af14a libreoffice-extensions-3.3.99.4.tar.bz2
fe3c6d76e6aeb07ee99692d684f3d8a9 libreoffice-extras-3.3.99.4.tar.bz2
130291ff105496b63457cd8ec2d691c7 libreoffice-filters-3.3.99.4.tar.bz2
b32259299af1f21fbaf8929df6294a89 libreoffice-help-3.3.99.4.tar.bz2
6fac8f5663977dcd542f6dba238adc97 libreoffice-impress-3.3.99.4.tar.bz2

Write Preview
Loading…
Cancel
Save