From: Andreas Proschofsky Date: Mon, 22 Feb 2010 10:11:18 +0000 (+0000) Subject: hardcode native Qt graphics backend, doesn't startup otherwise, bug X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=63916c122173021782930606901504ffec9fdd0a;p=gentoo.git hardcode native Qt graphics backend, doesn't startup otherwise, bug Package-Manager: portage-2.2_rc63/cvs/Linux i686 --- 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 + 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 openoffice-3.2.0.ebuild: diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index 5532afeba7ea..88fabb0f4b0d 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -6,6 +6,7 @@ AUX gentoo-3.2.0.diff 554 RMD160 9e226cf6dd9b2123685c3ca20e304eb0834f381b SHA1 8 AUX gentoo-pythonpath.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1430513326652f7b09eb04ee8f420532ac60b5c2 SHA256 de9316222af0f197a11041ba1105bfd070ba31cbcc1a2a212641d911b728ed5a AUX nocairofonts.diff 437 RMD160 56d7929870c122b228a1e673f4743cf91958753b SHA1 6a7e0a92155ad33e255d17961a2121857bf8a1fe SHA256 8afc0dee4778a46198ae95699243749cc62ee943229e42f0b827b55aa52c89a9 AUX ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1 +AUX qt-use-native-backend.diff 391 RMD160 602d444e9768c1bb0a8f2ad36567c8ab571bc569 SHA1 148a3431222e7405eb16c42330da7f0a2f01e1eb SHA256 f3ba5e9390f47d42acb955c04f5ef62a5b62a5776bd9d5d3226d5034fafe6be9 DIST OOo_3.2.0_src_binfilter.tar.bz2 6485071 RMD160 1a92582f7e9dc4c3dd57be6db0519f5d53e0b9ad SHA1 ef1041645ae444395f004eef4dbe31c472501476 SHA256 2acbd583f8b090e0fbdb5ea01d5362ad467b713299d29344fc7c80e5ff5083ca DIST OOo_3.2.0_src_core.tar.bz2 214923121 RMD160 2535240f28aa99777ca3768c366d5a465e044f72 SHA1 0246b77b0cb8445eb0c3ee9fb43f6e00ca54a61b SHA256 b44ab94c75b89c9354531ddba9c211374567535e147308a934e8c35d7b26814a DIST OOo_3.2.0_src_extensions.tar.bz2 13921000 RMD160 a274fabcc76bcc39640fe0c47a4ab008baffbcfd SHA1 860262cc0f3c6bf0e49d34ad495b956512265ad3 SHA256 6862b728fb1b5946399ddc1c7a3735a9ab84b696309a3af6c28cba7b885f5dd0 @@ -48,6 +49,6 @@ DIST ooo_oxygen_images-2009-06-17.tar.gz 14296938 RMD160 355b7d43aff12578fc0af6c DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766eedfb1a63 SHA1 7ad9c3396c3b1b9ac63274eb53818ba2d0a9f70c SHA256 865ac491bfbc7d4cc66b51fff78f3962a0a91efba1a8b5cc0bf5cf36be60e193 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c EBUILD openoffice-3.1.1.ebuild 13586 RMD160 f09fb2f1ae5b2692758bd148a0bd1ecaa9c261b7 SHA1 d60f323041fb5e6a46fa383f5d3325fd5ab448be SHA256 216a9487563b78614d57e6464cc3d493357d5b6bf34f23d84255611e6859f39c -EBUILD openoffice-3.2.0.ebuild 12760 RMD160 72db5eaa8a0d81fcc409169ced9f213ccab93b8a SHA1 eb71bcbf2376587d64fc87de0e24b926f2f09df1 SHA256 56a42b8433e92c409e4482fbcbe22724a9a14c490ee9b802c7df3033b8c6d2a9 -MISC ChangeLog 105360 RMD160 c5182056b4f13ce3134b6cb8bac39e02d4ebfce6 SHA1 05533e6767186053c6a8f65245568bb7c8885a1b SHA256 06c73e9720383545aaeacec42f0ecd30cc1d8f8cdefd426afe0f5d000da5b3b4 +EBUILD openoffice-3.2.0.ebuild 12839 RMD160 68992c1312d7a8b9b59d1a5aeff5b47d225fedc5 SHA1 90ed3fe10396e43f3f8fc70c665faf4fdd29d245 SHA256 98fec8cc3d52cc623eb99a1a22b85ef2a3c25d1b856f5b6b9bebd1b4682860a5 +MISC ChangeLog 105557 RMD160 7c907fbc9ef7688bfbe97effc65a9b891805ae51 SHA1 c0f56ef44d8cdec7b2e5a30eb939fab23ec5ecb5 SHA256 15642bb473f22321d4639e1995981ac53021c5448b1a01c9cd0d298c9f76791a MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78 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