Add new Version and patch from homepage. Fixes Bug 81230.

Package-Manager: portage-2.0.51-r15

5 files changed, 217 insertions, 17 deletions

diff --git a/x11-themes/baghira/ChangeLog b/x11-themes/baghira/ChangeLog
index ca2632ba2393..3290954670c6 100644
--- a/x11-themes/baghira/ChangeLog
+++ b/x11-themes/baghira/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-themes/baghira
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/baghira/ChangeLog,v 1.26 2005/02/01 15:46:45 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/baghira/ChangeLog,v 1.27 2005/02/14 14:23:31 centic Exp $
+
+*baghira-0.6b (14 Feb 2005)
+
+  14 Feb 2005; Dominik Stadler <centic@gentoo.org>
+  +files/baghira-0.6b-3.3.patch, +baghira-0.6b.ebuild:
+  Add Version 0.6b with patch suggested in Bug 81230
 
   01 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> baghira-0.5a.ebuild,
   baghira-0.5h-r1.ebuild, baghira-0.5h.ebuild, baghira-0.6.ebuild,
diff --git a/x11-themes/baghira/Manifest b/x11-themes/baghira/Manifest
index 9909c20de3ff..725fbc7b8853 100644
--- a/x11-themes/baghira/Manifest
+++ b/x11-themes/baghira/Manifest
@@ -1,23 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e2f9f854708b4e2367d6221e8af7106e baghira-0.5h.ebuild 589
+MD5 195695ab63833d88c52da4ae691281a4 ChangeLog 5027
+MD5 35abfff905901cb76fd0f3564e1a470e baghira-0.6b.ebuild 633
 MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 1e4c94c9d3969c79d36c74850331f50f ChangeLog 4840
-MD5 7722992d5e288343b92c091c4856c893 baghira-0.5h-r1.ebuild 692
-MD5 d7f208eccd3cbfb8b78da4bc86aa8f38 baghira-0.6.ebuild 720
 MD5 25a91b16215abdc1a484c5c48142cf47 baghira-0.6a.ebuild 533
 MD5 acd9d8e7589cbadd9b47c30938650ec0 baghira-0.5a.ebuild 588
+MD5 e2f9f854708b4e2367d6221e8af7106e baghira-0.5h.ebuild 589
+MD5 7722992d5e288343b92c091c4856c893 baghira-0.5h-r1.ebuild 692
+MD5 d7f208eccd3cbfb8b78da4bc86aa8f38 baghira-0.6.ebuild 720
 MD5 b5731b1b1a55c04b91821bbbf39037b3 files/digest-baghira-0.6 64
-MD5 8cb20294cb456e1d964dea305c62d001 files/digest-baghira-0.5a 65
-MD5 eb9cfc658932affe09a33b70035d99fa files/baghira-ximian_fix.patch 1041
+MD5 7aeaf68dc69f1775d8b58913114f14ed files/digest-baghira-0.6b 65
 MD5 80787ea911552a0915fc3cfa6a9ea3c5 files/digest-baghira-0.6a 65
+MD5 e81a1a485bc82e84d638e2c8b25eeb6f files/baghira-0.6b-3.3.patch 7795
+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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB/6RpKRy60XGEcJIRApknAKCFP3Q/4MNMmGEsiJjlPZVJkLdafACdEh8d
-CN/w1DCdulipljSMdFu4shM=
-=hkt6
------END PGP SIGNATURE-----
diff --git a/x11-themes/baghira/baghira-0.6b.ebuild b/x11-themes/baghira/baghira-0.6b.ebuild
new file mode 100644
index 000000000000..53a38d7ab4d5
--- /dev/null
+++ b/x11-themes/baghira/baghira-0.6b.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/baghira/baghira-0.6b.ebuild,v 1.1 2005/02/14 14:23:31 centic Exp $
+
+inherit kde
+
+DESCRIPTION="Baghira - an OS-X like style for KDE"
+HOMEPAGE="http://baghira.sourceforge.net/"
+SRC_URI="mirror://sourceforge/baghira/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~alpha"
+IUSE=""
+
+DEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3.3 )"
+need-kde 3.3
+
+src_unpack() {
+	unpack ${A}
+	# small deco patch for 0.6b
+	epatch ${FILESDIR}/${P}-3.3.patch || die
+}
diff --git a/x11-themes/baghira/files/baghira-0.6b-3.3.patch b/x11-themes/baghira/files/baghira-0.6b-3.3.patch
new file mode 100644
index 000000000000..ba2039f3e895
--- /dev/null
+++ b/x11-themes/baghira/files/baghira-0.6b-3.3.patch
@@ -0,0 +1,177 @@
+
+
+
+diff -updr -x '*~' -x '*.in' -x '*.moc' -x '*.la' -x '*.o' -x '*.lo' -x Makefile -x '*.orig' -x '.*' baghira-0.6b/bab/bab.h baghira-ng/bab/bab.h
+--- baghira-0.6b/bab/bab.h	2005-02-07 18:05:51.000000000 +0100
++++ baghira-ng/bab/bab.h	2005-02-08 21:18:53.000000000 +0100
+@@ -108,9 +108,9 @@ private slots:
+ class Corner : public QWidget
+ {
+     Q_OBJECT
+-public:
+-    enum Side {left = 0, right};
+-    Corner(Side side);
++    public:
++        enum Side {left = 0, right};
++        Corner(Side side);
+ };
+-   
++
+ #endif // _BAB_H_
+
+
+diff -updr -x '*~' -x '*.in' -x '*.moc' -x '*.la' -x '*.o' -x '*.lo' -x Makefile -x '*.orig' -x '.*' baghira-0.6b/bab/main.cpp baghira-ng/bab/main.cpp
+--- baghira-0.6b/bab/main.cpp	2005-02-07 18:05:51.000000000 +0100
++++ baghira-ng/bab/main.cpp	2005-02-11 17:02:10.000000000 +0100
+@@ -435,7 +435,6 @@ void BabSwitcher::paintEvent(QPaintEvent
+ 
+ Corner::Corner(Side side) : QWidget(0, (side == left)?"left_corner":"right_corner", Qt::WType_TopLevel | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop | Qt::WX11BypassWM )
+ {
+-    
+     if (side == left) {
+         setFixedSize(5,4);
+         move(0,0);
+@@ -457,9 +456,9 @@ Corner::Corner(Side side) : QWidget(0, (
+         xrects[ 3 ].x = 0;
+         xrects[ 3 ].y = 3;
+         xrects[ 3 ].width = 1;
+-        xrects[ 3 ].height = 2;                
++        xrects[ 3 ].height = 2;
+         XShapeCombineRectangles( qt_xdisplay(), winId(), ShapeBounding, 0, 0,
+-            xrects, 4, ShapeSet, 0 );
++                                 xrects, 4, ShapeSet, 0 );
+         delete[] xrects;
+     }
+     else {
+@@ -483,9 +482,9 @@ Corner::Corner(Side side) : QWidget(0, (
+         xrects[ 3 ].x = 4;
+         xrects[ 3 ].y = 3;
+         xrects[ 3 ].width = 1;
+-        xrects[ 3 ].height = 2;          
++        xrects[ 3 ].height = 2;
+         XShapeCombineRectangles( qt_xdisplay(), winId(), ShapeBounding, 0, 0,
+-            xrects, 4, ShapeSet, 0 );
++                                 xrects, 4, ShapeSet, 0 );
+         delete[] xrects;
+     }
+ }
+
+
+
+
+
+
+
+
+
+
+diff -updr -x '*~' -x '*.in' -x '*.moc' -x '*.la' -x '*.o' -x '*.lo' -x Makefile -x '*.orig' -x '.*' baghira-0.6b/deco/baghiraclient.cc baghira-ng/deco/baghiraclient.cc
+--- baghira-0.6b/deco/baghiraclient.cc	2005-02-07 18:05:51.000000000 +0100
++++ baghira-ng/deco/baghiraclient.cc	2005-02-08 21:19:46.000000000 +0100
+@@ -1573,8 +1573,10 @@ bool BaghiraClient::eventFilter( QObject
+ 	case QEvent::MouseButtonPress: {
+             if (titlebar_->geometry().contains( static_cast<QMouseEvent *>(e)->pos() ) && static_cast<QMouseEvent *>(e)->state() == Qt::ControlButton){
+                 currentStyle < 2 ? currentStyle++ : currentStyle = 0;
++#if KDE_IS_VERSION(3,3,91)
+                 unsigned long wmDesign = currentStyle;
+                 XChangeProperty(qt_xdisplay(), windowId(), baghira_deco_design, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &wmDesign, 1L);
++#endif
+                 widget()->repaint();
+                 QBitmap *m = NULL;
+                 QBitmap *mn = NULL;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+diff -updr -x '*~' -x '*.in' -x '*.moc' -x '*.la' -x '*.o' -x '*.lo' -x Makefile -x '*.orig' -x '.*' baghira-0.6b/kickermenu/menuapplet.cpp baghira-ng/kickermenu/menuapplet.cpp
+--- baghira-0.6b/kickermenu/menuapplet.cpp	2005-02-07 18:05:51.000000000 +0100
++++ baghira-ng/kickermenu/menuapplet.cpp	2005-02-08 20:17:10.000000000 +0100
+@@ -147,12 +147,15 @@ void Applet::windowAdded( WId w_P )
+         title = new QString( classHint.res_class );
+         XFree( classHint.res_name );
+         XFree( classHint.res_class );
++        if (title->contains("SDL_App"))
++            goto titlejump; //sorry - mainly for scummvm apps
+         windowTitleDict.insert(w_P, title);
+     }
+     else
+     { //fallback
+     // for windowindicator
+     if (!windowTitleDict[w_P] && w_P != qt_xrootwin()){
++titlejump:
+        KWin::WindowInfo tmpInfo = KWin::windowInfo( w_P, NET::WMName );
+         //generate title:
+         title = new QString(tmpInfo.name());
+
+
+
+
+
+diff -updr -x '*~' -x '*.in' -x '*.moc' -x '*.la' -x '*.o' -x '*.lo' -x Makefile -x '*.orig' -x '.*' baghira-0.6b/style/baghira.cpp baghira-ng/style/baghira.cpp
+--- baghira-0.6b/style/baghira.cpp	2005-02-07 18:05:52.000000000 +0100
++++ baghira-ng/style/baghira.cpp	2005-02-08 14:38:15.000000000 +0100
+@@ -1168,9 +1168,10 @@ void LiquidStyle::drawPrimitive( Primiti
+ // 				break;
+ 				}
+ 			case PE_Separator:
+-			/*case PE_DockWindowSeparator:*/ {
++			case PE_DockWindowSeparator: {
++                            break; //don't draw anything
+                                 //qWarning("%s",p->device()->className());
+-                                if (!(p->device() && p->device()->devType() == QInternal::Widget && ::qt_cast<QToolBar*>((QWidget*)p->device()) /*((QWidget*)p->device())->inherits("QToolBar")*/)){
++                                if (!(p->device() && p->device()->devType() == QInternal::Widget && ::qt_cast<QToolBar*>((QWidget*)p->device()))){
+ 				if ( !( flags & Style_Horizontal ) ) {
+ 					p->setPen( cg.mid() );
+ 					p->drawLine( 4, r.height() / 2, r.width() - 5, r.height() / 2 );
+@@ -1997,8 +1998,8 @@ void LiquidStyle::drawComplexControl( Co
+ 				if ( widget == highlightWidget )
+ 					bflags |= Style_MouseOver;
+ 				if ( controls & SC_ToolButton ) {
+-					bool sunken = mflags & ( Style_Down | Style_On );
+-					bool hover = bflags & Style_MouseOver;
++                                    bool sunken = mflags & ( Style_Down /*| Style_On*/ );
++                                        bool hover = bflags & (Style_MouseOver | Style_On );
+                                         
+                                         if ( !optionHandler->useToolButtonFrame() || !(toolbutton->parentWidget() && ( ::qt_cast<QToolBar*>(toolbutton->parentWidget()) || toolbutton->parentWidget()->inherits("KonqFrameTabs")))) {
+                                             if (!(hover || sunken) && toolbutton->parentWidget() && !::qt_cast<QToolBar*>(toolbutton->parent()) && toolbutton->parentWidget()->paletteBackgroundPixmap() && !toolbutton->parentWidget()->paletteBackgroundPixmap()->isNull()) {
+
+
+diff -updr -x '*~' -x '*.in' -x '*.moc' -x '*.la' -x '*.o' -x '*.lo' -x Makefile -x '*.orig' -x '.*' baghira-0.6b/style/optionHandler.cpp baghira-ng/style/optionHandler.cpp
+--- baghira-0.6b/style/optionHandler.cpp	2005-02-07 18:05:52.000000000 +0100
++++ baghira-ng/style/optionHandler.cpp	2005-02-11 19:58:46.000000000 +0100
+@@ -168,7 +168,7 @@ void OptionHandler::reloadSettings() {
+ 	animateSlider = config.readBoolEntry( "Special_AnimateSlider", true );
+ 	// toolbar
+         int utb = config.readNumEntry( "Special_UnhoveredToolButtons", 2 );
+-        tbFrame = utb == 2 || (brushMe && utb == 1) || (!brushMe && utb == 0);
++        tbFrame = (utb == 2) || (brushMe && (utb == 1)) || (!brushMe && (utb == 0));
+ 
+ 	// tweaks
+ 	centerTabs = config.readBoolEntry( "Design_CenterTabs", true);
+
+diff -updr -x '*~' -x '*.in' -x '*.moc' -x '*.la' -x '*.o' -x '*.lo' -x Makefile -x '*.orig' -x '.*' baghira-0.6b/style/polish.cpp baghira-ng/style/polish.cpp
+--- baghira-0.6b/style/polish.cpp	2005-02-07 18:05:52.000000000 +0100
++++ baghira-ng/style/polish.cpp	2005-02-10 22:03:26.000000000 +0100
+@@ -910,10 +910,12 @@ void LiquidStyle::unPolish( QWidget *w )
+                     if (w->inherits( "QPushButton" ))
+                     {
+                         ButtonFadeInfo *bfi_ = bfi[w->winId()];
++                        if (bfi_){
+                         if (bfi_->timerId != 0)
+                             w->killTimer(bfi_->timerId);
+                         bfi.setAutoDelete(TRUE);
+                         bfi.remove(w->winId());
++                        }
+                     }
+ 		  w->setBackgroundMode( QWidget::PaletteButton );
+ 		} else if ( w->inherits( "QScrollBar" ) ) {
diff --git a/x11-themes/baghira/files/digest-baghira-0.6b b/x11-themes/baghira/files/digest-baghira-0.6b
new file mode 100644
index 000000000000..2e67005409e3
--- /dev/null
+++ b/x11-themes/baghira/files/digest-baghira-0.6b
@@ -0,0 +1 @@
+MD5 2030c443a52cb0c988f792b09ac26574 baghira-0.6b.tar.bz2 932735