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

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

7 files changed, 37 insertions, 104 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/Manifest b/x11-themes/baghira/Manifest
index e8a4d7a0eb2b..029168fd73df 100644
--- a/x11-themes/baghira/Manifest
+++ b/x11-themes/baghira/Manifest
@@ -1,18 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX baghira-0.6e-drop_resize_handle.patch 1175 RMD160 e2680d1d92f907b0fe605599e429682ef21d25b3 SHA1 499488fe503ca1e5be29db4f3c0c1ab356ddb45f SHA256 3ccb3e7502305ed2a8b0132e6fc6efe08e79c52736034aa06be614718040b33b
-AUX baghira-0.7-gcc41.patch 913 RMD160 1e8f24e78c3e496c4a5cd5914eed546895fd420e SHA1 67b1276177ba03df7dfff9393d1adf7ff40ecf07 SHA256 de43770942aa693f11ced1b9f9a58151af04b0ecb6b9ce94c9f332b8dcb6e248
-DIST baghira-0.7.tar.bz2 846152 RMD160 e85f6f7144b8549bdc023db26eeb6d0edea82267 SHA1 958c48a0be2ad6cecf86714da68354a593cc740a SHA256 4088ba3fb51561cef0346ec13628abcb20e10f3a372d1a9e3a1a9ed20219f1fa
+AUX baghira-0.8-glibc-2.10.patch 389 RMD160 b409e031b5c757388a9c3b9cb48cdf8951bc00fc SHA1 8419d9f4a7f3b3ae7ecf97323c79de559e8224e2 SHA256 99848313e057c7c27ac54367c9bd950dfdd5192451d6b0a67012e661617de2bb
 DIST baghira-0.8.tar.bz2 916658 RMD160 3458651180f8b890c4537a880fd37e674e902344 SHA1 ce6e60bee947801297e450964791827cfdeac1c5 SHA256 d348f8c7ebcd98f6e4174496425ed641b45a4891dbbf78f504d6b9a95d2ded37
-EBUILD baghira-0.7.ebuild 666 RMD160 33aac5192e671bb71548ad8acdb60e4880ca935e SHA1 fa0d5fb2a34b489d54c0e5945ca8c65dbd5081c6 SHA256 5a713a9101111ee4c0e8672cbf1b8d9251067ad9ecdfa72a9017e6f9ec0edee3
-EBUILD baghira-0.8.ebuild 601 RMD160 b4a89ea97cfc6610afb34f15e5783ff474b173fa SHA1 80ae7f480d89f3ba89703b7c519a9c054fb1ea96 SHA256 9c708f2883f831b08ccc5e3238f0b5602380badfbe41d908235ca9487ca95695
-MISC ChangeLog 8722 RMD160 12b94b0f7b2087ee471d9365f37c8ba24149c9c7 SHA1 1508d0eb632d722ccebc760a9d5ac0d4b8d7fe00 SHA256 0036eb1c32dae2629c590246b9dc629449830425e973514b0c720c5d13a657e3
+EBUILD baghira-0.8.ebuild 694 RMD160 5c14c5abde4caeb32cb1f1f5d231c3319b1f8bc0 SHA1 8c7677e9a72add6cf70b571bac282e3b3b5ec17e SHA256 9e37157ca0c386ebca8d0963efe4b33fd2c383cb5246e8d37b5fa9bc44fe82d3
+MISC ChangeLog 8906 RMD160 0915bf2902f904105287c547ba6463c25ad25918 SHA1 1d8c0dd48767bf2268e4e90cc43e58fc534c055e SHA256 4fd6cdc73b2c6c4c6820d566420c5ba789019cea6d3396a7a51c1684d9dd23bc
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHutuAB18eXLOpYdkRAkSfAJ44uYrimujMUZVJNv9e1GdPTaMzXwCfXNr2
-H3e1IubwKOUhBR9BVAsGKT8=
-=1HYj
------END PGP SIGNATURE-----
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) {