From 9f2908946966592ea0b0e7e4c6eb91464cba83ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 30 Nov 2011 11:04:26 +0000 Subject: [PATCH 1/7] distinguish between distro options --- libreoffice.spec | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index b43b2c8..48c57f3 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -66,7 +66,7 @@ Source29: http://hg.services.openoffice.org/binaries/18f577b374d60b3c760a3 #backwards compatability. Source30: http://hg.services.openoffice.org/binaries/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip Source31: http://dev-www.libreoffice.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} < 7 Source32: http://dev-www.libreoffice.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 Source33: http://hg.services.openoffice.org/binaries/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz %endif @@ -86,11 +86,14 @@ BuildRequires: jakarta-commons-codec, jakarta-commons-httpclient, cppunit-devel BuildRequires: jakarta-commons-lang, poppler-devel, fontpackages-devel BuildRequires: pentaho-reporting-flow-engine, vigra-devel, db4-devel BuildRequires: font(:lang=en) -%if 0%{?fedora} -BuildRequires: mdds-devel, mythes-devel, graphite2-devel, libwpg-devel -BuildRequires: libwps-devel, kdelibs4-devel, junit4, perl-Digest-MD5 -%else +%if 0%{?rhel} && 0%{?rhel} < 7 BuildRequires: hsqldb +%else +BuildRequires: mdds-devel, mythes-devel, graphite2-devel, libwpg-devel +BuildRequires: libwps-devel, junit4, perl-Digest-MD5 +%endif +%if 0%{!?rhel} +BuildRequires: kdelibs4-devel %endif Requires: %{name}-writer = %{epoch}:%{version}-%{release} @@ -132,7 +135,7 @@ Patch28: 0001-avoid-using-com.sun.org-apis.patch Patch29: 0001-add-Oracle-Java-1.7.0-recognition.patch Patch30: 0001-Resolves-fdo-32665-handle-that-FreeSerif-lacks-some-.patch Patch31: Backport-reading-AES-encrypted-ODF-1.2-documents.patch -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} < 7 Patch32: libreoffice-libwpd08-1.patch Patch33: libreoffice-libwpd08-2.patch Patch34: 0001-wpsimport-writerperfect.diff-WPS-Import-filter-core-.patch @@ -517,7 +520,7 @@ A plug-in for LibreOffice that enables it to function without an X server. It implements the -headless command line option and allows LibreOffice to be used as a backend server for e.g. document conversion. -%if 0%{?fedora} +%if 0%{!?rhel} %package kde Summary: LibreOffice KDE integration plug-in Group: Applications/Productivity @@ -821,7 +824,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch29 -p1 -b .add-Oracle-Java-1.7.0-recognition.patch %patch30 -p1 -b .fdo32665-handle-that-FreeSerif-lacks-some-.patch %patch31 -p1 -b .Backport-reading-AES-encrypted-ODF-1.2-documents.patch -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} < 7 %patch32 -p1 -b .libwpd08-1.patch %patch33 -p1 -R -b .libreoffice-libwpd08-2.patch %patch34 -p1 -R -b .wpsimport @@ -854,10 +857,12 @@ if [ $SMP_MFLAGS -lt 2 ]; then SMP_MFLAGS=2; fi NDMAKES=`dc -e "$SMP_MFLAGS v p"` NBUILDS=`dc -e "$SMP_MFLAGS $NDMAKES / p"` +%if 0%{!?rhel} # KDE bits export QT4DIR=%{_qt4_prefix} export KDE4DIR=%{_kde4_prefix} export PATH=$QT4DIR/bin:$PATH +%endif #use the RPM_OPT_FLAGS but remove the OOo overridden ones for i in $RPM_OPT_FLAGS; do @@ -871,8 +876,12 @@ export CFLAGS=$ARCH_FLAGS export CXXFLAGS=$ARCH_FLAGS %if 0%{?rhel} +%if 0%{?rhel} < 7 %define distrooptions --disable-graphite --without-system-mythes --without-system-mdds --without-junit %else +%define distrooptions --without-system-hsqldb +%endif +%else %define distrooptions --without-system-hsqldb --enable-kde4 %endif @@ -909,7 +918,7 @@ cp %{SOURCE28} ext_sources cp %{SOURCE29} ext_sources cp %{SOURCE30} ext_sources cp %{SOURCE31} ext_sources -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} < 7 cp %{SOURCE32} ext_sources cp %{SOURCE33} ext_sources %endif @@ -1340,7 +1349,7 @@ cd ../smoketestoo_native unset WITH_LANG #JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY="1" works around flawed accessibility check #SAL_USE_VCLPLUGIN="svp" uses the headless plugin for these tests -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} < 7 unset SOLAR_JAVA JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY="1" SAL_USE_VCLPLUGIN="svp" timeout 2h build.pl %else @@ -1546,7 +1555,7 @@ rm -rf $RPM_BUILD_ROOT %{basisinstdir}/program/libvbahelper%{SOPOST}.so %{basisinstdir}/program/libvclplug_gen%{SOPOST}.so %{basisinstdir}/program/libvclplug_gtk%{SOPOST}.so -%if 0%{?fedora} +%if 0%{!?rhel} || 0%{?rhel} >= 7 %{basisinstdir}/program/libwpgimport%{SOPOST}.so %endif %{basisinstdir}/program/libxmlfa%{SOPOST}.so @@ -1811,7 +1820,7 @@ done %{basisinstdir}/help/en/sdatabase.* %dir %{basisinstdir}/program %dir %{basisinstdir}/program/classes -%if 0%{?fedora} +%if 0%{!?rhel} || 0%{?rhel} >= 7 %{basisinstdir}/program/classes/hsqldb.jar %endif %{basisinstdir}/program/classes/sdbc_hsqldb.jar @@ -1964,7 +1973,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %{basisinstdir}/program/libhwp.so %{basisinstdir}/program/liblwpft%{SOPOST}.so %{basisinstdir}/program/libmsword%{SOPOST}.so -%if 0%{?fedora} +%if 0%{!?rhel} || 0%{?rhel} >= 7 %{basisinstdir}/program/libmsworks%{SOPOST}.so %endif %{basisinstdir}/program/libswd%{SOPOST}.so @@ -2126,7 +2135,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %{baseinstdir}/share/extensions/script-provider-for-python %{basisinstdir}/share/registry/pyuno.xcd -%if 0%{?fedora} +%if 0%{!?rhel} %files kde %defattr(-,root,root,-) %dir %{basisinstdir} From 8838b6f53ff7e21d04c09dc161db8453b8d228e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 30 Nov 2011 12:15:45 +0000 Subject: [PATCH 2/7] can't read these conditional --- libreoffice.spec | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 48c57f3..0e29204 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -66,7 +66,7 @@ Source29: http://hg.services.openoffice.org/binaries/18f577b374d60b3c760a3 #backwards compatability. Source30: http://hg.services.openoffice.org/binaries/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip Source31: http://dev-www.libreoffice.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 -%if 0%{?rhel} && 0%{?rhel} < 7 +%if %{defined rhel} && 0%{?rhel} < 7 Source32: http://dev-www.libreoffice.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 Source33: http://hg.services.openoffice.org/binaries/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz %endif @@ -86,13 +86,13 @@ BuildRequires: jakarta-commons-codec, jakarta-commons-httpclient, cppunit-devel BuildRequires: jakarta-commons-lang, poppler-devel, fontpackages-devel BuildRequires: pentaho-reporting-flow-engine, vigra-devel, db4-devel BuildRequires: font(:lang=en) -%if 0%{?rhel} && 0%{?rhel} < 7 +%if %{defined rhel} && 0%{?rhel} < 7 BuildRequires: hsqldb %else BuildRequires: mdds-devel, mythes-devel, graphite2-devel, libwpg-devel BuildRequires: libwps-devel, junit4, perl-Digest-MD5 %endif -%if 0%{!?rhel} +%if %{undefined rhel} BuildRequires: kdelibs4-devel %endif @@ -135,7 +135,7 @@ Patch28: 0001-avoid-using-com.sun.org-apis.patch Patch29: 0001-add-Oracle-Java-1.7.0-recognition.patch Patch30: 0001-Resolves-fdo-32665-handle-that-FreeSerif-lacks-some-.patch Patch31: Backport-reading-AES-encrypted-ODF-1.2-documents.patch -%if 0%{?rhel} && 0%{?rhel} < 7 +%if %{defined rhel} && 0%{?rhel} < 7 Patch32: libreoffice-libwpd08-1.patch Patch33: libreoffice-libwpd08-2.patch Patch34: 0001-wpsimport-writerperfect.diff-WPS-Import-filter-core-.patch @@ -520,7 +520,7 @@ A plug-in for LibreOffice that enables it to function without an X server. It implements the -headless command line option and allows LibreOffice to be used as a backend server for e.g. document conversion. -%if 0%{!?rhel} +%if %{undefined rhel} %package kde Summary: LibreOffice KDE integration plug-in Group: Applications/Productivity @@ -824,7 +824,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch29 -p1 -b .add-Oracle-Java-1.7.0-recognition.patch %patch30 -p1 -b .fdo32665-handle-that-FreeSerif-lacks-some-.patch %patch31 -p1 -b .Backport-reading-AES-encrypted-ODF-1.2-documents.patch -%if 0%{?rhel} && 0%{?rhel} < 7 +%if %{defined rhel} && 0%{?rhel} < 7 %patch32 -p1 -b .libwpd08-1.patch %patch33 -p1 -R -b .libreoffice-libwpd08-2.patch %patch34 -p1 -R -b .wpsimport @@ -857,7 +857,7 @@ if [ $SMP_MFLAGS -lt 2 ]; then SMP_MFLAGS=2; fi NDMAKES=`dc -e "$SMP_MFLAGS v p"` NBUILDS=`dc -e "$SMP_MFLAGS $NDMAKES / p"` -%if 0%{!?rhel} +%if %{undefined rhel} # KDE bits export QT4DIR=%{_qt4_prefix} export KDE4DIR=%{_kde4_prefix} @@ -875,7 +875,7 @@ export ARCH_FLAGS export CFLAGS=$ARCH_FLAGS export CXXFLAGS=$ARCH_FLAGS -%if 0%{?rhel} +%if %{defined rhel} %if 0%{?rhel} < 7 %define distrooptions --disable-graphite --without-system-mythes --without-system-mdds --without-junit %else @@ -918,7 +918,7 @@ cp %{SOURCE28} ext_sources cp %{SOURCE29} ext_sources cp %{SOURCE30} ext_sources cp %{SOURCE31} ext_sources -%if 0%{?rhel} && 0%{?rhel} < 7 +%if %{defined rhel} && 0%{?rhel} < 7 cp %{SOURCE32} ext_sources cp %{SOURCE33} ext_sources %endif @@ -1349,7 +1349,7 @@ cd ../smoketestoo_native unset WITH_LANG #JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY="1" works around flawed accessibility check #SAL_USE_VCLPLUGIN="svp" uses the headless plugin for these tests -%if 0%{?rhel} && 0%{?rhel} < 7 +%if %{defined rhel} && 0%{?rhel} < 7 unset SOLAR_JAVA JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY="1" SAL_USE_VCLPLUGIN="svp" timeout 2h build.pl %else @@ -1555,7 +1555,7 @@ rm -rf $RPM_BUILD_ROOT %{basisinstdir}/program/libvbahelper%{SOPOST}.so %{basisinstdir}/program/libvclplug_gen%{SOPOST}.so %{basisinstdir}/program/libvclplug_gtk%{SOPOST}.so -%if 0%{!?rhel} || 0%{?rhel} >= 7 +%if %{undefined rhel} || 0%{?rhel} >= 7 %{basisinstdir}/program/libwpgimport%{SOPOST}.so %endif %{basisinstdir}/program/libxmlfa%{SOPOST}.so @@ -1820,7 +1820,7 @@ done %{basisinstdir}/help/en/sdatabase.* %dir %{basisinstdir}/program %dir %{basisinstdir}/program/classes -%if 0%{!?rhel} || 0%{?rhel} >= 7 +%if %{undefined rhel} || 0%{?rhel} >= 7 %{basisinstdir}/program/classes/hsqldb.jar %endif %{basisinstdir}/program/classes/sdbc_hsqldb.jar @@ -1973,7 +1973,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %{basisinstdir}/program/libhwp.so %{basisinstdir}/program/liblwpft%{SOPOST}.so %{basisinstdir}/program/libmsword%{SOPOST}.so -%if 0%{!?rhel} || 0%{?rhel} >= 7 +%if %{undefined rhel} || 0%{?rhel} >= 7 %{basisinstdir}/program/libmsworks%{SOPOST}.so %endif %{basisinstdir}/program/libswd%{SOPOST}.so @@ -2135,7 +2135,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %{baseinstdir}/share/extensions/script-provider-for-python %{basisinstdir}/share/registry/pyuno.xcd -%if 0%{!?rhel} +%if %{undefined rhel} %files kde %defattr(-,root,root,-) %dir %{basisinstdir} From 718909023a430ffc9a1df954a1f5791faeb5576f Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 5 Dec 2011 10:33:12 +0100 Subject: [PATCH 3/7] follow packaging guidelines for requiring perl modules --- libreoffice.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 0e29204..a524f57 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -80,7 +80,7 @@ BuildRequires: sane-backends-devel, libicu-devel, libXinerama-devel BuildRequires: freetype-devel, gtk2-devel, desktop-file-utils, hyphen-devel BuildRequires: evolution-data-server-devel, libtextcat-devel, nss-devel BuildRequires: gstreamer-devel, gstreamer-plugins-base-devel, openssl-devel -BuildRequires: lpsolve-devel, bsh, lucene, lucene-contrib, perl-Archive-Zip +BuildRequires: lpsolve-devel, bsh, lucene, lucene-contrib, perl(Archive::Zip) BuildRequires: mesa-libGLU-devel, redland-devel, ant, ant-apache-regexp, rsync BuildRequires: jakarta-commons-codec, jakarta-commons-httpclient, cppunit-devel BuildRequires: jakarta-commons-lang, poppler-devel, fontpackages-devel @@ -90,7 +90,7 @@ BuildRequires: font(:lang=en) BuildRequires: hsqldb %else BuildRequires: mdds-devel, mythes-devel, graphite2-devel, libwpg-devel -BuildRequires: libwps-devel, junit4, perl-Digest-MD5 +BuildRequires: libwps-devel, junit4, perl(Digest::MD5) %endif %if %{undefined rhel} BuildRequires: kdelibs4-devel From df327dda1cbf1a980faecff6fe1d186bae7ff2c3 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 7 Dec 2011 13:03:31 +0100 Subject: [PATCH 4/7] fix the same problem in scripting --- ...201-fedora-ant-java-1.5.0-gcj-won-t-.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/0001-Related-rhbz-753201-fedora-ant-java-1.5.0-gcj-won-t-.patch b/0001-Related-rhbz-753201-fedora-ant-java-1.5.0-gcj-won-t-.patch index a3ed7c4..c693a0e 100644 --- a/0001-Related-rhbz-753201-fedora-ant-java-1.5.0-gcj-won-t-.patch +++ b/0001-Related-rhbz-753201-fedora-ant-java-1.5.0-gcj-won-t-.patch @@ -46,3 +46,37 @@ index 220c4f4..f074fa8 100644 -- 1.7.6.4 +diff -up libreoffice-3.4.4.2/scripting/java/build.xml.dt libreoffice-3.4.4.2/scripting/java/build.xml +--- libreoffice-3.4.4.2/scripting/java/build.xml.dt 2011-12-07 12:31:17.491262301 +0100 ++++ libreoffice-3.4.4.2/scripting/java/build.xml 2011-12-07 12:32:04.561151965 +0100 +@@ -42,9 +42,6 @@ + Not needed in default build --> + + +- +- +- + + + +@@ -52,7 +49,7 @@ + + + +- ++ + + + +diff -up libreoffice-3.4.4.2/scripting/java/makefile.mk.dt libreoffice-3.4.4.2/scripting/java/makefile.mk +--- libreoffice-3.4.4.2/scripting/java/makefile.mk.dt 2011-12-07 12:31:11.820396072 +0100 ++++ libreoffice-3.4.4.2/scripting/java/makefile.mk 2011-12-07 12:31:28.111011791 +0100 +@@ -29,6 +29,8 @@ PRJ=.. + PRJNAME=scripting + TARGET=scriptruntimeforjava + ++ANT_FLAGS := -DBSH_JAR="$(BSH_JAR)" ++ + .INCLUDE : ant.mk + + .IF "$(L10N_framework)"=="" From e09904554e4a2d71f4d2c098200899de5dd57c51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 7 Dec 2011 12:36:23 +0000 Subject: [PATCH 5/7] Resolves: rhbz#759647 dispose clears mpPresTimer --- ...9647-dispose-clears-mpPresTimer-befo.patch | 34 +++++++++++++++++++ libreoffice.spec | 7 +++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 0001-Resolves-rhbz-759647-dispose-clears-mpPresTimer-befo.patch diff --git a/0001-Resolves-rhbz-759647-dispose-clears-mpPresTimer-befo.patch b/0001-Resolves-rhbz-759647-dispose-clears-mpPresTimer-befo.patch new file mode 100644 index 0000000..c309f44 --- /dev/null +++ b/0001-Resolves-rhbz-759647-dispose-clears-mpPresTimer-befo.patch @@ -0,0 +1,34 @@ +From d57887eaad534ca51fc4975918fab66b2f93633d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Tue, 6 Dec 2011 16:26:05 +0000 +Subject: [PATCH] Resolves: rhbz#759647 ::dispose clears mpPresTimer before + releaseTimer called + +--- + slideshow/source/engine/slideshowimpl.cxx | 8 ++++++-- + 1 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx +index 5be3b62..4277280 100644 +--- a/slideshow/source/engine/slideshowimpl.cxx ++++ b/slideshow/source/engine/slideshowimpl.cxx +@@ -2025,10 +2025,14 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout ) + // that have zero delay. While the timer is stopped these events + // are processed in the same run. + { ++ //Get a shared-ptr that outlives the scope-guard which will ++ //ensure that the pointed-to-item exists in the case of a ++ //::dispose clearing mpPresTimer ++ boost::shared_ptr xTimer(mpPresTimer); + comphelper::ScopeGuard scopeGuard( + boost::bind( &canvas::tools::ElapsedTime::releaseTimer, +- boost::cref(mpPresTimer) ) ); +- mpPresTimer->holdTimer(); ++ boost::cref(xTimer) ) ); ++ xTimer->holdTimer(); + + // process queues + maEventQueue.process(); +-- +1.7.6.4 + diff --git a/libreoffice.spec b/libreoffice.spec index a524f57..c542e8c 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -27,7 +27,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: 3.4.4.2 -Release: 5%{?dist} +Release: 6%{?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 @@ -149,6 +149,7 @@ Patch40: solenv.fix.mk.inheritance.patch Patch41: libreoffice-ppc64.patch Patch42: 0001-Resolves-rhbz-751290-KDE-black-on-dark-tooltips.patch Patch43: 0001-gtk3-fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch +Patch44: 0001-Resolves-rhbz-759647-dispose-clears-mpPresTimer-befo.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -838,6 +839,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch41 -p1 -b .libreoffice-ppc64.patch %patch42 -p1 -b .rhbz751290-KDE-black-on-dark-tooltips.patch %patch43 -p1 -b .fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch +%patch44 -p1 -b .rhbz759647-dispose-clears-mpPresTimer-befo.patch # these are horribly incomplete--empty translations and copied english # strings with spattering of translated strings @@ -2146,6 +2148,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Wed Dec 07 2011 Caolán McNamara - 3.4.4.2-6 +- Resolves: rhbz#759647 dispose clears mpPresTimer + * Tue Nov 29 2011 Caolán McNamara - 3.4.4.2-5 - Resolves: rhbz#757653 fix headless crash with cairo canvas From 69cff118342a35db55d05d89fe509918fbe80e29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Fri, 9 Dec 2011 12:09:25 +0000 Subject: [PATCH 6/7] Resolves: rhbz#761558 center-across-selection fix --- ...e-logic-straight-for-center-across-s.patch | 38 +++++++++++++++++++ libreoffice.spec | 7 +++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 0001-fdo-43308-Set-the-logic-straight-for-center-across-s.patch diff --git a/0001-fdo-43308-Set-the-logic-straight-for-center-across-s.patch b/0001-fdo-43308-Set-the-logic-straight-for-center-across-s.patch new file mode 100644 index 0000000..ada6b94 --- /dev/null +++ b/0001-fdo-43308-Set-the-logic-straight-for-center-across-s.patch @@ -0,0 +1,38 @@ +From 17c7711948f8157478dc3abe9c52b8078fd8b5a9 Mon Sep 17 00:00:00 2001 +From: Kohei Yoshida +Date: Wed, 7 Dec 2011 10:38:25 -0500 +Subject: [PATCH] fdo#43308: Set the logic straight for "center across + selection" setting. + +Another unfortunate logic change introduced via DECLARE_LIST removal. +Reverting the logic to the original one. +--- + sc/source/filter/excel/xistyle.cxx | 12 +++--------- + 1 files changed, 3 insertions(+), 9 deletions(-) + +diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx +index d2d4467..2131095 100644 +--- a/sc/source/filter/excel/xistyle.cxx ++++ b/sc/source/filter/excel/xistyle.cxx +@@ -1824,15 +1824,9 @@ void XclImpXFRangeBuffer::SetXF( const ScAddress& rScPos, sal_uInt16 nXFIndex, X + if( pXF && ((pXF->GetHorAlign() == EXC_XF_HOR_CENTER_AS) || (pXF->GetHorAlign() == EXC_XF_HOR_FILL)) ) + { + // expand last merged range if this attribute is set repeatedly +- if ( !maMergeList.empty() ) +- { +- ScRange* pRange = maMergeList.back(); +- if( (pRange->aEnd.Row() == nScRow) +- && (pRange->aEnd.Col() + 1 == nScCol) +- && (eMode == xlXFModeBlank) +- ) +- pRange->aEnd.IncCol(); +- } ++ ScRange* pRange = maMergeList.empty() ? NULL : maMergeList.back(); ++ if (pRange && (pRange->aEnd.Row() == nScRow) && (pRange->aEnd.Col() + 1 == nScCol) && (eMode == xlXFModeBlank)) ++ pRange->aEnd.IncCol(); + else if( eMode != xlXFModeBlank ) // do not merge empty cells + SetMerge( nScCol, nScRow ); + } +-- +1.7.6.4 + diff --git a/libreoffice.spec b/libreoffice.spec index c542e8c..f0ad520 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -27,7 +27,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: 3.4.4.2 -Release: 6%{?dist} +Release: 7%{?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 @@ -150,6 +150,7 @@ Patch41: libreoffice-ppc64.patch Patch42: 0001-Resolves-rhbz-751290-KDE-black-on-dark-tooltips.patch Patch43: 0001-gtk3-fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch Patch44: 0001-Resolves-rhbz-759647-dispose-clears-mpPresTimer-befo.patch +Patch45: 0001-fdo-43308-Set-the-logic-straight-for-center-across-s.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -840,6 +841,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch42 -p1 -b .rhbz751290-KDE-black-on-dark-tooltips.patch %patch43 -p1 -b .fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch %patch44 -p1 -b .rhbz759647-dispose-clears-mpPresTimer-befo.patch +%patch45 -p1 -b .fdo43308-Set-the-logic-straight-for-center-across-s.patch # these are horribly incomplete--empty translations and copied english # strings with spattering of translated strings @@ -2148,6 +2150,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Fri Dec 09 2011 Caolán McNamara - 3.4.4.2-7 +- Resolves: rhbz#761558 center-across-selection fix + * Wed Dec 07 2011 Caolán McNamara - 3.4.4.2-6 - Resolves: rhbz#759647 dispose clears mpPresTimer From 9390cab8ee795c1ba6f66d6adf9c774c4eeabf3b Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 11 Dec 2011 17:28:39 +0100 Subject: [PATCH 7/7] fix java-devel dep --- ...9647-dispose-clears-mpPresTimer-befo.patch | 34 ----------------- ...e-logic-straight-for-center-across-s.patch | 38 ------------------- libreoffice.spec | 14 +------ 3 files changed, 2 insertions(+), 84 deletions(-) delete mode 100644 0001-Resolves-rhbz-759647-dispose-clears-mpPresTimer-befo.patch delete mode 100644 0001-fdo-43308-Set-the-logic-straight-for-center-across-s.patch diff --git a/0001-Resolves-rhbz-759647-dispose-clears-mpPresTimer-befo.patch b/0001-Resolves-rhbz-759647-dispose-clears-mpPresTimer-befo.patch deleted file mode 100644 index c309f44..0000000 --- a/0001-Resolves-rhbz-759647-dispose-clears-mpPresTimer-befo.patch +++ /dev/null @@ -1,34 +0,0 @@ -From d57887eaad534ca51fc4975918fab66b2f93633d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Tue, 6 Dec 2011 16:26:05 +0000 -Subject: [PATCH] Resolves: rhbz#759647 ::dispose clears mpPresTimer before - releaseTimer called - ---- - slideshow/source/engine/slideshowimpl.cxx | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx -index 5be3b62..4277280 100644 ---- a/slideshow/source/engine/slideshowimpl.cxx -+++ b/slideshow/source/engine/slideshowimpl.cxx -@@ -2025,10 +2025,14 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout ) - // that have zero delay. While the timer is stopped these events - // are processed in the same run. - { -+ //Get a shared-ptr that outlives the scope-guard which will -+ //ensure that the pointed-to-item exists in the case of a -+ //::dispose clearing mpPresTimer -+ boost::shared_ptr xTimer(mpPresTimer); - comphelper::ScopeGuard scopeGuard( - boost::bind( &canvas::tools::ElapsedTime::releaseTimer, -- boost::cref(mpPresTimer) ) ); -- mpPresTimer->holdTimer(); -+ boost::cref(xTimer) ) ); -+ xTimer->holdTimer(); - - // process queues - maEventQueue.process(); --- -1.7.6.4 - diff --git a/0001-fdo-43308-Set-the-logic-straight-for-center-across-s.patch b/0001-fdo-43308-Set-the-logic-straight-for-center-across-s.patch deleted file mode 100644 index ada6b94..0000000 --- a/0001-fdo-43308-Set-the-logic-straight-for-center-across-s.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 17c7711948f8157478dc3abe9c52b8078fd8b5a9 Mon Sep 17 00:00:00 2001 -From: Kohei Yoshida -Date: Wed, 7 Dec 2011 10:38:25 -0500 -Subject: [PATCH] fdo#43308: Set the logic straight for "center across - selection" setting. - -Another unfortunate logic change introduced via DECLARE_LIST removal. -Reverting the logic to the original one. ---- - sc/source/filter/excel/xistyle.cxx | 12 +++--------- - 1 files changed, 3 insertions(+), 9 deletions(-) - -diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx -index d2d4467..2131095 100644 ---- a/sc/source/filter/excel/xistyle.cxx -+++ b/sc/source/filter/excel/xistyle.cxx -@@ -1824,15 +1824,9 @@ void XclImpXFRangeBuffer::SetXF( const ScAddress& rScPos, sal_uInt16 nXFIndex, X - if( pXF && ((pXF->GetHorAlign() == EXC_XF_HOR_CENTER_AS) || (pXF->GetHorAlign() == EXC_XF_HOR_FILL)) ) - { - // expand last merged range if this attribute is set repeatedly -- if ( !maMergeList.empty() ) -- { -- ScRange* pRange = maMergeList.back(); -- if( (pRange->aEnd.Row() == nScRow) -- && (pRange->aEnd.Col() + 1 == nScCol) -- && (eMode == xlXFModeBlank) -- ) -- pRange->aEnd.IncCol(); -- } -+ ScRange* pRange = maMergeList.empty() ? NULL : maMergeList.back(); -+ if (pRange && (pRange->aEnd.Row() == nScRow) && (pRange->aEnd.Col() + 1 == nScCol) && (eMode == xlXFModeBlank)) -+ pRange->aEnd.IncCol(); - else if( eMode != xlXFModeBlank ) // do not merge empty cells - SetMerge( nScCol, nScRow ); - } --- -1.7.6.4 - diff --git a/libreoffice.spec b/libreoffice.spec index f0ad520..273653e 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -27,7 +27,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: 3.4.4.2 -Release: 7%{?dist} +Release: 5%{?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 @@ -71,7 +71,7 @@ Source32: http://dev-www.libreoffice.org/src/0ff7d225d087793c8c2c680d77aac Source33: http://hg.services.openoffice.org/binaries/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz %endif BuildRequires: zip, findutils, autoconf, flex, bison, icu, gperf, gcc-c++ -BuildRequires: binutils, java-devel <= 1.6.0, boost-devel, zlib-devel +BuildRequires: binutils, java-devel < 1.7.0, boost-devel, zlib-devel BuildRequires: python-devel, expat-devel, libxml2-devel, libxslt-devel, bc BuildRequires: neon-devel, libcurl-devel, libidn-devel, pam-devel, cups-devel BuildRequires: libXext-devel, libXt-devel, libICE-devel, libjpeg-devel, make @@ -149,8 +149,6 @@ Patch40: solenv.fix.mk.inheritance.patch Patch41: libreoffice-ppc64.patch Patch42: 0001-Resolves-rhbz-751290-KDE-black-on-dark-tooltips.patch Patch43: 0001-gtk3-fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch -Patch44: 0001-Resolves-rhbz-759647-dispose-clears-mpPresTimer-befo.patch -Patch45: 0001-fdo-43308-Set-the-logic-straight-for-center-across-s.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -840,8 +838,6 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch41 -p1 -b .libreoffice-ppc64.patch %patch42 -p1 -b .rhbz751290-KDE-black-on-dark-tooltips.patch %patch43 -p1 -b .fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch -%patch44 -p1 -b .rhbz759647-dispose-clears-mpPresTimer-befo.patch -%patch45 -p1 -b .fdo43308-Set-the-logic-straight-for-center-across-s.patch # these are horribly incomplete--empty translations and copied english # strings with spattering of translated strings @@ -2150,12 +2146,6 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog -* Fri Dec 09 2011 Caolán McNamara - 3.4.4.2-7 -- Resolves: rhbz#761558 center-across-selection fix - -* Wed Dec 07 2011 Caolán McNamara - 3.4.4.2-6 -- Resolves: rhbz#759647 dispose clears mpPresTimer - * Tue Nov 29 2011 Caolán McNamara - 3.4.4.2-5 - Resolves: rhbz#757653 fix headless crash with cairo canvas