added fix for ximian's openoffice apps

5 files changed, 48 insertions, 2 deletions

diff --git a/x11-themes/baghira/ChangeLog b/x11-themes/baghira/ChangeLog
index f252c4ebdc5b..5651c5657eb1 100644
--- a/x11-themes/baghira/ChangeLog
+++ b/x11-themes/baghira/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-themes/baghira
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/baghira/ChangeLog,v 1.16 2004/09/28 18:50:15 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/baghira/ChangeLog,v 1.17 2004/10/07 15:40:11 voxus Exp $
+
+*baghira-0.5h-r1 (07 Oct 2004)
+
+  07 Oct 2004; Konstantin Arkhipov <voxus@gentoo.org> +baghira-0.5h-r1.ebuild,
+  +files/baghira-ximian_fix.patch:
+  Added patch, which prevents ximian's openoffice from crashing, when
+  baghira style is used. Thanks to Mathew Hennessy <hennessy@thoughtcrime.com>
+  for pointing to patch.
 
 *baghira-0.5h (28 Sep 2004)
 
diff --git a/x11-themes/baghira/Manifest b/x11-themes/baghira/Manifest
index 81273d3f899d..1f5e45472564 100644
--- a/x11-themes/baghira/Manifest
+++ b/x11-themes/baghira/Manifest
@@ -6,7 +6,8 @@ MD5 77a747b5fbf7edf698a0c698141ecf02 metadata.xml 163
 MD5 92a862a42e40c25b0a2698d82825997c baghira-0.5.ebuild 545
 MD5 dc556fcc7bcedee9380d2b447399fa9f baghira-0.5a.ebuild 553
 MD5 80a7d17950d2f5d144e4ad620e27c8ea baghira-0.5h.ebuild 551
-MD5 dfbf58865f98572072a075f07f4c5e3f ChangeLog 2993
+MD5 7428f03d5db690fdf7777d20b5486ca9 baghira-0.5h-r1.ebuild 645
+MD5 fc3b94c5f828be47b5077159c81fa59b ChangeLog 3314
 MD5 1abb328b1d75150a4f2275db2cd634a6 files/digest-baghira-0.3r 65
 MD5 4e0249b66e7688f90353f3a3fd4f3e19 files/digest-baghira-0.4 64
 MD5 8059cc03ed0b17d80519bc48e39fb0b2 files/digest-baghira-0.4c 65
@@ -15,3 +16,5 @@ MD5 96f7dee65dcd1e12c813b5e149ff5588 files/gcc34-baghira-03r.patch 1048
 MD5 e6be1454433cd6ccf91aa2190ab7a6aa files/digest-baghira-0.5 64
 MD5 8cb20294cb456e1d964dea305c62d001 files/digest-baghira-0.5a 65
 MD5 691364364acad0a765bf32167748acb0 files/digest-baghira-0.5h 65
+MD5 eb9cfc658932affe09a33b70035d99fa files/baghira-ximian_fix.patch 1041
+MD5 691364364acad0a765bf32167748acb0 files/digest-baghira-0.5h-r1 65
diff --git a/x11-themes/baghira/baghira-0.5h-r1.ebuild b/x11-themes/baghira/baghira-0.5h-r1.ebuild
new file mode 100644
index 000000000000..37c7ecd9f8a7
--- /dev/null
+++ b/x11-themes/baghira/baghira-0.5h-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/baghira/baghira-0.5h-r1.ebuild,v 1.1 2004/10/07 15:40:11 voxus Exp $
+
+inherit kde eutils
+
+DESCRIPTION="Baghira - an OS-X like style for KDE-3.2"
+HOMEPAGE="http://www.kde-look.org/content/show.php?content=8692"
+SRC_URI="mirror://sourceforge/baghira/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+IUSE=""
+
+DEPEND=">=kde-base/kdebase-3.2"
+RDEPEND=">=kde-base/kdebase-3.2"
+need-kde 3.2
+
+src_unpack() {
+	unpack ${A}
+	cd ${S} && epatch ${FILESDIR}/baghira-ximian_fix.patch
+}
diff --git a/x11-themes/baghira/files/baghira-ximian_fix.patch b/x11-themes/baghira/files/baghira-ximian_fix.patch
new file mode 100644
index 000000000000..88dfaf46f036
--- /dev/null
+++ b/x11-themes/baghira/files/baghira-ximian_fix.patch
@@ -0,0 +1,11 @@
+--- style/baghira.cpp.orig	2004-10-07 11:00:54.027113928 +0200
++++ style/baghira.cpp	2004-10-07 11:01:11.712425352 +0200
+@@ -2033,7 +2033,7 @@
+ 				QPen oldPen( p->pen() );
+ 				if ( controls & SC_ComboBoxArrow ) {
+                                     if ( controls & SC_ComboBoxEditField && ( ( const QComboBox * ) widget ) ->editable()) { // editable?
+-                                        if (widget->parentWidget() && ::qt_cast<QToolBar*>(widget->parentWidget()) || widget->parentWidget()->inherits("KPanelApplet")){ // toolbar combo?
++                                        if (widget->parentWidget() && ( ::qt_cast<QToolBar*>(widget->parentWidget()) || widget->parentWidget()->inherits("KPanelApplet") ) ){ // toolbar combo?
+                                             drawRoundFrame( p, r, cg, (flags & Style_HasFocus) || sunken , widget->backgroundOffset());
+                                             p->setPen(cg.mid());
+                                             p->drawPixmap(r.right() - 16, r.height()/2 - 2, *sbDown);
diff --git a/x11-themes/baghira/files/digest-baghira-0.5h-r1 b/x11-themes/baghira/files/digest-baghira-0.5h-r1
new file mode 100644
index 000000000000..fe5bd5803b29
--- /dev/null
+++ b/x11-themes/baghira/files/digest-baghira-0.5h-r1
@@ -0,0 +1 @@
+MD5 eac4696c0d66b172aac0dd037e60b4b7 baghira-0.5h.tar.bz2 965221