summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2010-02-22 10:11:18 +0000
committerAndreas Proschofsky <suka@gentoo.org>2010-02-22 10:11:18 +0000
commitc38b657ed892187ca03ca28d881c7c4f779ea87c (patch)
tree30f28fefddda4d51791ca31e3c7f998757247059 /app-office
parentForgot to set QT4LIB, see bug #306135 (diff)
downloadgentoo-2-c38b657ed892187ca03ca28d881c7c4f779ea87c.tar.gz
gentoo-2-c38b657ed892187ca03ca28d881c7c4f779ea87c.tar.bz2
gentoo-2-c38b657ed892187ca03ca28d881c7c4f779ea87c.zip
hardcode native Qt graphics backend, doesn't startup otherwise, bug
(Portage version: 2.2_rc63/cvs/Linux i686)
Diffstat (limited to 'app-office')
-rw-r--r--app-office/openoffice/ChangeLog7
-rw-r--r--app-office/openoffice/files/qt-use-native-backend.diff10
-rw-r--r--app-office/openoffice/openoffice-3.2.0.ebuild3
3 files changed, 18 insertions, 2 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 44892023c7cb..35bb7a8f31a3 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-office/openoffice
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.510 2010/02/22 10:01:40 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.511 2010/02/22 10:11:17 suka Exp $
+
+ 22 Feb 2010; Andreas Proschofsky <suka@gentoo.org>
+ openoffice-3.2.0.ebuild, +files/qt-use-native-backend.diff:
+ hardcode native Qt graphics backend, doesn't startup otherwise, bug
+ #306211
22 Feb 2010; Andreas Proschofsky <suka@gentoo.org>
openoffice-3.2.0.ebuild:
diff --git a/app-office/openoffice/files/qt-use-native-backend.diff b/app-office/openoffice/files/qt-use-native-backend.diff
new file mode 100644
index 000000000000..3834970262e0
--- /dev/null
+++ b/app-office/openoffice/files/qt-use-native-backend.diff
@@ -0,0 +1,10 @@
+*** vcl/unx/kde4/KDEXLib.cxx_ 2010-02-21 22:34:18.917502324 +0200
+--- vcl/unx/kde4/KDEXLib.cxx 2010-02-21 22:35:29.642770570 +0200
+***************
+*** 134,137 ****
+--- 134,138 ----
+ KCmdLineArgs::init( m_nFakeCmdLineArgs, m_pAppCmdLineArgs, kAboutData );
+
++ KApplication::setGraphicsSystem( "native" );
+ m_pApplication = new VCLKDEApplication();
+ kapp->disableSessionManagement();
diff --git a/app-office/openoffice/openoffice-3.2.0.ebuild b/app-office/openoffice/openoffice-3.2.0.ebuild
index ba649278b617..6de73ac5f9ac 100644
--- a/app-office/openoffice/openoffice-3.2.0.ebuild
+++ b/app-office/openoffice/openoffice-3.2.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.4 2010/02/22 10:01:40 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.5 2010/02/22 10:11:17 suka Exp $
WANT_AUTOMAKE="1.9"
EAPI="2"
@@ -224,6 +224,7 @@ src_prepare() {
epatch "${FILESDIR}/gentoo-pythonpath.diff"
epatch "${FILESDIR}/ooo-env_log.diff"
cp -f "${FILESDIR}/boost-undefined-references.diff" "${S}/patches/hotfixes" || die
+ cp -f "${FILESDIR}/qt-use-native-backend.diff" "${S}/patches/hotfixes" || die
#Use flag checks
if use java ; then