[libreoffice/f15] Resolves: rhbz#757653 fix headless crash with cairo canvas
Caolán McNamara
caolanm at fedoraproject.org
Tue Nov 29 10:20:24 UTC 2011
commit aabbc3f431e9467b2b3db108abd22d02214b5721
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Nov 29 10:20:19 2011 +0000
Resolves: rhbz#757653 fix headless crash with cairo canvas
.gitignore | 20 --------------------
libreoffice.spec | 5 ++++-
2 files changed, 4 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6251829..40f9d92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,26 +8,6 @@
/cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2
/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
/redhat-langpacks.tar.gz
-/libreoffice-artwork-3.3.3.1.tar.bz2
-/libreoffice-base-3.3.3.1.tar.bz2
-/libreoffice-bootstrap-3.3.3.1.tar.bz2
-/libreoffice-calc-3.3.3.1.tar.bz2
-/libreoffice-components-3.3.3.1.tar.bz2
-/libreoffice-extensions-3.3.3.1.tar.bz2
-/libreoffice-extras-3.3.3.1.tar.bz2
-/libreoffice-filters-3.3.3.1.tar.bz2
-/libreoffice-help-3.3.3.1.tar.bz2
-/libreoffice-impress-3.3.3.1.tar.bz2
-/libreoffice-l10n-3.3.3.1.tar.bz2
-/libreoffice-libs-core-3.3.3.1.tar.bz2
-/libreoffice-libs-extern-3.3.3.1.tar.bz2
-/libreoffice-libs-extern-sys-3.3.3.1.tar.bz2
-/libreoffice-libs-gui-3.3.3.1.tar.bz2
-/libreoffice-postprocess-3.3.3.1.tar.bz2
-/libreoffice-sdk-3.3.3.1.tar.bz2
-/libreoffice-testing-3.3.3.1.tar.bz2
-/libreoffice-ure-3.3.3.1.tar.bz2
-/libreoffice-writer-3.3.3.1.tar.bz2
/libreoffice-artwork-3.3.4.1.tar.bz2
/libreoffice-base-3.3.4.1.tar.bz2
/libreoffice-libs-core-3.3.4.1.tar.bz2
diff --git a/libreoffice.spec b/libreoffice.spec
index b818da9..b871111 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -165,6 +165,7 @@ Patch73: 0001-On-recovery-from-an-autosave-file-use-DefaultFilter-.patch
Patch74: 0001-Fix-for-fdo-35513-avoid-crash-while-processing-incor.patch
Patch75: 0001-let-Qt-call-XInitThreads-so-that-it-knows-it-s-been-.patch
Patch76: gdb-pretty-printers.patch
+Patch77: 0001-gtk3-fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@@ -881,6 +882,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch74 -p1 -b .fdo-35513-avoid-crash-while-processing-incor.patch
%patch75 -p1 -b .let-Qt-call-XInitThreads-so-that-it-knows-it-s-been-.patch
%patch76 -p1 -b .gdb-pretty-printers.patch
+%patch77 -p1 -b .gtk3-fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch
touch scripting/source/pyprov/delzip
touch scripting/util/provider/beanshell/delzip
@@ -2242,10 +2244,11 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%{basisinstdir}/program/kde-open-url
%changelog
-* Fri Nov 11 2011 David Tardon <dtardon at redhat.com> 1:3.3.4.1-1-UNBUILT
+* Tue Nov 29 2011 David Tardon <dtardon at redhat.com> 1:3.3.4.1-1-UNBUILT
- Resolves: rhbz#747356 let Qt call XInitThreads
- new upstream version 3.3.4
- add gdb pretty printers
+- Resolves: rhbz#757653 fix headless crash with cairo canvas
* Wed Oct 05 2011 Caolán McNamara <caolanm at redhat.com> 1:3.3.3.1-7
- Resolves: CVE-2011-2713, binary .doc parsing fixes
More information about the scm-commits
mailing list