From 59117c382d57c8a3291241b5fc9a549e4dfd80ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Fri, 12 Aug 2011 09:51:13 +0100 Subject: [PATCH] sync --- .gitignore | 81 ------------------- ...225-avoid-segv-in-ld-this-was-set-to.patch | 25 ++++++ libreoffice.spec | 9 ++- 3 files changed, 32 insertions(+), 83 deletions(-) create mode 100644 0001-Related-rhbz-730225-avoid-segv-in-ld-this-was-set-to.patch diff --git a/.gitignore b/.gitignore index 6c9c416..c668617 100644 --- a/.gitignore +++ b/.gitignore @@ -9,87 +9,6 @@ /b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 /185d60944ea767075d27247c3162b3bc-unowinreg.dll /redhat-langpacks.tar.gz -/libreoffice-artwork-3.4.1.2.tar.bz2 -/libreoffice-base-3.4.1.2.tar.bz2 -/libreoffice-bootstrap-3.4.1.2.tar.bz2 -/libreoffice-calc-3.4.1.2.tar.bz2 -/libreoffice-components-3.4.1.2.tar.bz2 -/libreoffice-extensions-3.4.1.2.tar.bz2 -/libreoffice-extras-3.4.1.2.tar.bz2 -/libreoffice-filters-3.4.1.2.tar.bz2 -/libreoffice-help-3.4.1.2.tar.bz2 -/libreoffice-impress-3.4.1.2.tar.bz2 -/libreoffice-libs-core-3.4.1.2.tar.bz2 -/libreoffice-libs-extern-3.4.1.2.tar.bz2 -/libreoffice-libs-extern-sys-3.4.1.2.tar.bz2 -/libreoffice-libs-gui-3.4.1.2.tar.bz2 -/libreoffice-postprocess-3.4.1.2.tar.bz2 -/libreoffice-sdk-3.4.1.2.tar.bz2 -/libreoffice-testing-3.4.1.2.tar.bz2 -/libreoffice-translations-3.4.1.2.tar.bz2 -/libreoffice-ure-3.4.1.2.tar.bz2 -/libreoffice-writer-3.4.1.2.tar.bz2 -/libreoffice-artwork-3.4.1.3.tar.bz2 -/libreoffice-base-3.4.1.3.tar.bz2 -/libreoffice-bootstrap-3.4.1.3.tar.bz2 -/libreoffice-calc-3.4.1.3.tar.bz2 -/libreoffice-components-3.4.1.3.tar.bz2 -/libreoffice-extensions-3.4.1.3.tar.bz2 -/libreoffice-extras-3.4.1.3.tar.bz2 -/libreoffice-filters-3.4.1.3.tar.bz2 -/libreoffice-help-3.4.1.3.tar.bz2 -/libreoffice-impress-3.4.1.3.tar.bz2 -/libreoffice-libs-core-3.4.1.3.tar.bz2 -/libreoffice-libs-extern-3.4.1.3.tar.bz2 -/libreoffice-libs-extern-sys-3.4.1.3.tar.bz2 -/libreoffice-libs-gui-3.4.1.3.tar.bz2 -/libreoffice-postprocess-3.4.1.3.tar.bz2 -/libreoffice-sdk-3.4.1.3.tar.bz2 -/libreoffice-testing-3.4.1.3.tar.bz2 -/libreoffice-translations-3.4.1.3.tar.bz2 -/libreoffice-ure-3.4.1.3.tar.bz2 -/libreoffice-writer-3.4.1.3.tar.bz2 -/libreoffice-artwork-3.4.2.1.tar.bz2 -/libreoffice-base-3.4.2.1.tar.bz2 -/libreoffice-libs-core-3.4.2.1.tar.bz2 -/libreoffice-libs-extern-3.4.2.1.tar.bz2 -/libreoffice-libs-extern-sys-3.4.2.1.tar.bz2 -/libreoffice-libs-gui-3.4.2.1.tar.bz2 -/libreoffice-postprocess-3.4.2.1.tar.bz2 -/libreoffice-sdk-3.4.2.1.tar.bz2 -/libreoffice-testing-3.4.2.1.tar.bz2 -/libreoffice-ure-3.4.2.1.tar.bz2 -/libreoffice-writer-3.4.2.1.tar.bz2 -/libreoffice-translations-3.4.2.1.tar.bz2 -/libreoffice-bootstrap-3.4.2.1.tar.bz2 -/libreoffice-multiliblauncher.sh -/libreoffice-calc-3.4.2.1.tar.bz2 -/libreoffice-components-3.4.2.1.tar.bz2 -/libreoffice-extensions-3.4.2.1.tar.bz2 -/libreoffice-extras-3.4.2.1.tar.bz2 -/libreoffice-filters-3.4.2.1.tar.bz2 -/libreoffice-help-3.4.2.1.tar.bz2 -/libreoffice-impress-3.4.2.1.tar.bz2 -/libreoffice-artwork-3.4.2.2.tar.bz2 -/libreoffice-base-3.4.2.2.tar.bz2 -/libreoffice-libs-core-3.4.2.2.tar.bz2 -/libreoffice-libs-extern-3.4.2.2.tar.bz2 -/libreoffice-libs-extern-sys-3.4.2.2.tar.bz2 -/libreoffice-libs-gui-3.4.2.2.tar.bz2 -/libreoffice-postprocess-3.4.2.2.tar.bz2 -/libreoffice-sdk-3.4.2.2.tar.bz2 -/libreoffice-testing-3.4.2.2.tar.bz2 -/libreoffice-ure-3.4.2.2.tar.bz2 -/libreoffice-writer-3.4.2.2.tar.bz2 -/libreoffice-translations-3.4.2.2.tar.bz2 -/libreoffice-bootstrap-3.4.2.2.tar.bz2 -/libreoffice-calc-3.4.2.2.tar.bz2 -/libreoffice-components-3.4.2.2.tar.bz2 -/libreoffice-extensions-3.4.2.2.tar.bz2 -/libreoffice-extras-3.4.2.2.tar.bz2 -/libreoffice-filters-3.4.2.2.tar.bz2 -/libreoffice-help-3.4.2.2.tar.bz2 -/libreoffice-impress-3.4.2.2.tar.bz2 /libreoffice-artwork-3.4.2.3.tar.bz2 /libreoffice-base-3.4.2.3.tar.bz2 /libreoffice-libs-core-3.4.2.3.tar.bz2 diff --git a/0001-Related-rhbz-730225-avoid-segv-in-ld-this-was-set-to.patch b/0001-Related-rhbz-730225-avoid-segv-in-ld-this-was-set-to.patch new file mode 100644 index 0000000..6abf3f7 --- /dev/null +++ b/0001-Related-rhbz-730225-avoid-segv-in-ld-this-was-set-to.patch @@ -0,0 +1,25 @@ +From 761d4c5487570b9c1b37ac4ea13d86fcdb244f65 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Fri, 12 Aug 2011 09:44:45 +0100 +Subject: [PATCH] Related: rhbz#730225 avoid segv in ld, this was set to -O0 + around 2000 + +--- + sd/Library_sdfilt.mk | 12 +----------- + 1 files changed, 1 insertions(+), 11 deletions(-) + +diff --git a/sd/source/filter/eppt/makefile.mk b/sd/source/filter/eppt/makefile.mk +index 2a91103..7871436 100644 +--- a/sd/source/filter/eppt/makefile.mk ++++ b/sd/source/filter/eppt/makefile.mk +@@ -37,10 +37,6 @@ VISIBILITY_HIDDEN=TRUE + + # --- Files -------------------------------------------------------- + +-.IF "$(COM)"=="GCC" +-NOOPTFILES= $(SLO)$/epptso.obj +-.ENDIF +- + SLOFILES = $(SLO)$/eppt.obj \ + $(SLO)$/epptso.obj \ + $(SLO)$/escherex.obj \ diff --git a/libreoffice.spec b/libreoffice.spec index 21bcaea..b44b9da 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -27,7 +27,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: 3.4.2.3 -Release: 2%{?dist} +Release: 3%{?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 @@ -67,7 +67,7 @@ Source29: http://hg.services.openoffice.org/binaries/18f577b374d60b3c760a3 Source30: http://hg.services.openoffice.org/binaries/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip Source31: http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 BuildRequires: zip, findutils, autoconf, flex, bison, icu, gperf, gcc-c++ -BuildRequires: binutils, java-devel >= 1.6.0, boost-devel, zlib-devel +BuildRequires: binutils, java-1.6.0-devel, 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 @@ -119,6 +119,7 @@ Patch24: 0001-Resolves-rhbz-715549-use-fontconfig-s-detected-forma.patch Patch25: 0001-this-is-definitely-not-present-in-qt-4.8.0-beta1.patch Patch26: 0001-Resolves-rhbz-725144-wrong-csh-syntax.patch Patch27: 0001-Resolves-rhbz-693265-fix-crash-from-unhandled-except.patch +Patch28: 0001-Related-rhbz-730225-avoid-segv-in-ld-this-was-set-to.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -748,6 +749,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch25 -p1 -b .this-is-definitely-not-present-in-qt-4.8.0-beta1.patch %patch26 -p1 -b .rhbz725144-wrong-csh-syntax.patch %patch27 -p1 -b .rhbz693265-fix-crash-from-unhandled-except.patch +%patch28 -p1 -b .rhbz730225-avoid-segv-in-ld-this-was-set-to.patch # these are horribly incomplete--empty translations and copied english # strings with spattering of translated strings @@ -2032,6 +2034,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %{basisinstdir}/program/kde-open-url %changelog +* Fri Aug 12 2011 Caolán McNamara - 3.4.2.3-3 +- Related: rhbz#730225 avoid segv in ld + * Tue Aug 02 2011 Caolán McNamara - 3.4.2.3-2 - Resolves: rhbz#693265 fix crash from unhandled exception