Fix building with GLIBC 2.10+ wrt #273274, thanks to Petr Behan.

(Portage version: 2.2_rc40/cvs/Linux x86_64)

6 files changed, 34 insertions, 88 deletions

diff --git a/x11-themes/baghira/ChangeLog b/x11-themes/baghira/ChangeLog
index 56d46ffb013b..ecb8cb7c3c71 100644
--- a/x11-themes/baghira/ChangeLog
+++ b/x11-themes/baghira/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-themes/baghira
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/baghira/ChangeLog,v 1.55 2008/02/19 13:38:04 ingmar Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/baghira/ChangeLog,v 1.56 2009/09/04 08:24:10 ssuominen Exp $
+
+  04 Sep 2009; Samuli Suominen <ssuominen@gentoo.org>
+  baghira-0.8.ebuild, +files/baghira-0.8-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #273274, thanks to Petr Behan.
 
   19 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> baghira-0.7.ebuild,
   baghira-0.8.ebuild:
diff --git a/x11-themes/baghira/baghira-0.7.ebuild b/x11-themes/baghira/baghira-0.7.ebuild
deleted file mode 100644
index d2c793c63861..000000000000
--- a/x11-themes/baghira/baghira-0.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/baghira/baghira-0.7.ebuild,v 1.12 2008/02/19 13:38:04 ingmar 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"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="|| ( =kde-base/kwin-3.5* =kde-base/kdebase-3.5* )
-	|| ( =kde-base/konqueror-3.5* =kde-base/kdebase-3.5* )"
-
-need-kde 3.3
-
-S="${WORKDIR}/${PN}-release"
-
-PATCHES="${FILESDIR}/${P}-gcc41.patch"
diff --git a/x11-themes/baghira/baghira-0.8.ebuild b/x11-themes/baghira/baghira-0.8.ebuild
index 6b749058cb82..30edd8c5d50f 100644
--- a/x11-themes/baghira/baghira-0.8.ebuild
+++ b/x11-themes/baghira/baghira-0.8.ebuild
@@ -1,19 +1,23 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/baghira/baghira-0.8.ebuild,v 1.3 2008/02/19 13:38:04 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/baghira/baghira-0.8.ebuild,v 1.4 2009/09/04 08:24:10 ssuominen Exp $
 
+ARTS_REQUIRED=never
 inherit kde
 
 DESCRIPTION="Baghira - an OS-X like style for KDE"
 HOMEPAGE="http://baghira.sourceforge.net/"
 SRC_URI="mirror://sourceforge/baghira/${P}.tar.bz2"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND="|| ( =kde-base/kwin-3.5* =kde-base/kdebase-3.5* )
+RDEPEND="|| ( =kde-base/kwin-3.5* =kde-base/kdebase-3.5* )
 	|| ( =kde-base/konqueror-3.5* =kde-base/kdebase-3.5* )"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-glibc-2.10.patch" )
 
-need-kde 3.3
+need-kde 3.5
diff --git a/x11-themes/baghira/files/baghira-0.6e-drop_resize_handle.patch b/x11-themes/baghira/files/baghira-0.6e-drop_resize_handle.patch
deleted file mode 100644
index e989ad7c97ca..000000000000
--- a/x11-themes/baghira/files/baghira-0.6e-drop_resize_handle.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- baghiraclient.h.orig	2005-03-22 13:11:10.174799822 +0300
-+++ baghiraclient.h	2005-03-22 13:11:24.254841399 +0300
-@@ -105,26 +105,6 @@
- 
- class BaghiraClient;
- 
--#if KDE_IS_VERSION(3,3,91)
--class ResizeHandle : public QWidget
--{
--friend class BaghiraClient;
--    Q_OBJECT
--public:
--    ResizeHandle(BaghiraClient *parent);
--protected:
--    virtual void mousePressEvent ( QMouseEvent * );
--    virtual void mouseReleaseEvent ( QMouseEvent * );
--    virtual void paintEvent ( QPaintEvent * );
--    void updateLook(bool rp = FALSE);
--private:
--    bool eventFilter(QObject *obj, QEvent *e);
--    void shape();
--    BaghiraClient *client;
--    QPixmap pix;
--};
--#endif
--
- class DeMaximizer : public QWidget
- {
- friend class BaghiraClient;
-@@ -384,7 +364,6 @@
- class BaghiraClient : public KDecoration
- {
- friend class BaghiraButton;
--friend class ResizeHandle;
-     Q_OBJECT
- public:
-     BaghiraClient(KDecorationBridge *b, KDecorationFactory *f);
-@@ -457,7 +436,6 @@
- //    QWidget *inactiveOverlay;
-     QHBoxLayout *windowlayout;
-     int ICONX, ICONY;
--    ResizeHandle *grip;
- //    QSizeGrip *grip;
- //    KDecorationBridge *myBridge_;
- //    QImage* ActiveDecoImage_;
diff --git a/x11-themes/baghira/files/baghira-0.7-gcc41.patch b/x11-themes/baghira/files/baghira-0.7-gcc41.patch
deleted file mode 100644
index 96a97d8b1d00..000000000000
--- a/x11-themes/baghira/files/baghira-0.7-gcc41.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- deco/baghiraclient.h.orig	2006-03-17 12:49:33.000000000 +0100
-+++ deco/baghiraclient.h	2006-03-17 12:52:47.000000000 +0100
-@@ -159,8 +159,8 @@
-     virtual KDecoration *createDecoration(KDecorationBridge *b);
-     virtual bool reset(unsigned long changed);
-     virtual QValueList<BorderSize> borderSizes() const;
--    static QPixmap &BaghiraFactory::ButtonPixmap(Baghira::WindowState wState, Baghira::ButtonType type, Baghira::ButtonState state, int current, bool small);
--    QImage* BaghiraFactory::DecoImage(QPixmap *pix, int x, int y, int width, int height);
-+    static QPixmap &ButtonPixmap(Baghira::WindowState wState, Baghira::ButtonType type, Baghira::ButtonState state, int current, bool small);
-+    QImage* DecoImage(QPixmap *pix, int x, int y, int width, int height);
- 
-     static QBitmap helpMask, jaguarDownMask, jaguarMenuDownMask,
-             jaguarMenuMask, jaguarMask, milkMenuDownMask,
diff --git a/x11-themes/baghira/files/baghira-0.8-glibc-2.10.patch b/x11-themes/baghira/files/baghira-0.8-glibc-2.10.patch
new file mode 100644
index 000000000000..ba3f93162a82
--- /dev/null
+++ b/x11-themes/baghira/files/baghira-0.8-glibc-2.10.patch
@@ -0,0 +1,19 @@
+*** sessionapplet/dmctl.cpp.orig	Mon Aug 10 11:04:01 2009
+--- sessionapplet/dmctl.cpp	Mon Aug 10 11:01:51 2009
+*************** static const char *ctl, *dpy;
+*** 37,43 ****
+  
+  DM::DM() : fd( -1 )
+  {
+! 	char *ptr;
+  	struct sockaddr_un sa;
+  
+  	if (DMType == Dunno) {
+--- 37,43 ----
+  
+  DM::DM() : fd( -1 )
+  {
+! 	const char *ptr;
+  	struct sockaddr_un sa;
+  
+  	if (DMType == Dunno) {