[libreoffice] fix breakage in KDE4 plugin
David Tardon
dtardon at fedoraproject.org
Fri Jul 22 06:08:29 UTC 2011
commit c25104492395db6795d22d2bfad91735c5744bd7
Author: David Tardon <dtardon at redhat.com>
Date: Fri Jul 22 08:07:44 2011 +0200
fix breakage in KDE4 plugin
...-definitely-not-present-in-qt-4.8.0-beta1.patch | 25 ++++++++++++++++++++
libreoffice.spec | 3 ++
2 files changed, 28 insertions(+), 0 deletions(-)
---
diff --git a/0001-this-is-definitely-not-present-in-qt-4.8.0-beta1.patch b/0001-this-is-definitely-not-present-in-qt-4.8.0-beta1.patch
new file mode 100644
index 0000000..cccc6da
--- /dev/null
+++ b/0001-this-is-definitely-not-present-in-qt-4.8.0-beta1.patch
@@ -0,0 +1,25 @@
+From 7de616ff995c687e820e08c63350b908f45cdf85 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Fri, 22 Jul 2011 08:04:07 +0200
+Subject: [PATCH] this is definitely not present in Qt 4.8.0 beta1
+
+---
+ vcl/unx/kde4/KDEXLib.cxx | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
+index 73021f4..357d1dc 100644
+--- a/vcl/unx/kde4/KDEXLib.cxx
++++ b/vcl/unx/kde4/KDEXLib.cxx
+@@ -57,7 +57,7 @@
+
+ #include <stdio.h>
+
+-#if QT_VERSION >= QT_VERSION_CHECK( 4, 8, 0 )
++#if QT_VERSION >= QT_VERSION_CHECK( 4, 8, 1 )
+ #define QT_UNIX_EVENT_LOOP_SUPPORT
+ #ifdef KDE_HAVE_GLIB
+ #define GLIB_EVENT_LOOP_SUPPORT
+--
+1.7.6
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 65647b5..f9119d8 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -116,6 +116,7 @@ Patch21: 0001-rhbz-667082-do-not-crash-importing-section-containin.patch
Patch22: 0001-Related-rhbz-718976-crash-in-SwTxtSizeInfo-GetMultiC.patch
Patch23: libreoffice-poppler-0.17.0.patch
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
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@@ -742,6 +743,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch22 -p1 -b .rhbz718976-crash-in-SwTxtSizeInfo-GetMultiC.patch
%patch23 -p1 -b .poppler-0.17.0.patch
%patch24 -p1 -b .rhbz-715549-use-fontconfig-s-detected-forma.patch
+%patch25 -p1 -b .this-is-definitely-not-present-in-qt-4.8.0-beta1.patch
# these are horribly incomplete--empty translations and copied english
# strings with spattering of translated strings
@@ -2028,6 +2030,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%changelog
* Wed Jul 20 2011 David Tardon <dtardon at redhat.com> - 3.4.2.2-1
- 3.4.2 rc2
+- fix breakage in KDE4 plugin
* Tue Jul 19 2011 Caolán McNamara <caolanm at redhat.com> - 3.4.2.1-3
- Resolves: rhbz#715549 use fontconfig's detected format
More information about the scm-commits
mailing list