patch to compile under gtk2.4. thanks to Krist <klen@pandora.be> (#46676)

4 files changed, 96 insertions, 4 deletions

diff --git a/net-wireless/gnome-bluetooth/ChangeLog b/net-wireless/gnome-bluetooth/ChangeLog
index 05b76bc986a1..fae721f3ba6b 100644
--- a/net-wireless/gnome-bluetooth/ChangeLog
+++ b/net-wireless/gnome-bluetooth/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/gnome-bluetooth
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.4 2004/02/12 18:39:31 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.5 2004/04/10 14:59:44 liquidx Exp $
+
+  10 Apr 2004; Alastair Tse <liquidx@gentoo.org> gnome-bluetooth-0.4.1.ebuild,
+  files/gnome-bluetooth-0.4.1-gtk24.patch:
+  patch to compile under gtk2.4. thanks to Krist <klen@pandora.be> (#46676)
 
   12 Feb 2004; Ciaran McCreesh <ciaranm@gentoo.org>
   gnome-bluetooth-0.4.1.ebuild:
diff --git a/net-wireless/gnome-bluetooth/Manifest b/net-wireless/gnome-bluetooth/Manifest
index 59f6f60d7c85..ddd8d38f8ccc 100644
--- a/net-wireless/gnome-bluetooth/Manifest
+++ b/net-wireless/gnome-bluetooth/Manifest
@@ -1,4 +1,5 @@
-MD5 773b4cb0d3fa4fa1b0fa66ec164c8ddd ChangeLog 847
-MD5 224be052f8696d31c69ddbb6b8eafd5c gnome-bluetooth-0.4.1.ebuild 1045
+MD5 3f1d5c476d2ab41e5ecefa493cf738c9 ChangeLog 1046
+MD5 4825309dd4d510c42e834e73fc3363f7 gnome-bluetooth-0.4.1.ebuild 1207
 MD5 7a66fef4deb08f29b7cf0de1c2e3a4de metadata.xml 254
 MD5 ff63b2b07eb50db8962f544a45028bee files/digest-gnome-bluetooth-0.4.1 73
+MD5 9c859b033ee9e338893bc5bc3ea21d5a files/gnome-bluetooth-0.4.1-gtk24.patch 2340
diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-0.4.1-gtk24.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-0.4.1-gtk24.patch
new file mode 100644
index 000000000000..1c88209f8bef
--- /dev/null
+++ b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-0.4.1-gtk24.patch
@@ -0,0 +1,80 @@
+--- Makefile.am	2003-04-03 22:37:46.000000000 +0200
++++ Makefile.am.new	2004-04-10 12:56:54.363579296 +0200
+@@ -4,7 +4,6 @@
+ INCLUDES = \
+   $(EGG_CFLAGS)  \
+   -DEGG_COMPILATION  \
+-  -DGTK_DISABLE_DEPRECATED \
+   -DGDK_DISABLE_DEPRECATED \
+   -DG_DISABLE_DEPRECATED
+ 
+--- Makefile.in	2003-06-07 00:33:17.000000000 +0200
++++ Makefile.in.new	2004-04-10 12:57:01.234534752 +0200
+@@ -147,7 +147,6 @@
+ INCLUDES = \
+   $(EGG_CFLAGS)  \
+   -DEGG_COMPILATION  \
+-  -DGTK_DISABLE_DEPRECATED \
+   -DGDK_DISABLE_DEPRECATED \
+   -DG_DISABLE_DEPRECATED
+ 
+--- menu/Makefile.in	2003-06-07 00:33:17.000000000 +0200
++++ menu/Makefile.in.new	2004-04-10 12:57:09.445286528 +0200
+@@ -145,7 +145,6 @@
+ INCLUDES = \
+   $(EGG_CFLAGS) \
+   -DEGG_COMPILATION \
+-  -DGTK_DISABLE_DEPRECATED \
+   -DGDK_DISABLE_DEPRECATED \
+   -DG_DISABLE_DEPRECATED
+ 
+--- menu/Makefile.am	2003-04-03 22:36:55.000000000 +0200
++++ menu/Makefile.am.new	2004-04-10 12:57:14.629498408 +0200
+@@ -2,7 +2,6 @@
+ INCLUDES = \
+   $(EGG_CFLAGS) \
+   -DEGG_COMPILATION \
+-  -DGTK_DISABLE_DEPRECATED \
+   -DGDK_DISABLE_DEPRECATED \
+   -DG_DISABLE_DEPRECATED
+ 
+--- toolbar/Makefile.am	2003-04-03 22:37:46.000000000 +0200
++++ toolbar/Makefile.am.new	2004-04-10 12:57:32.690752680 +0200
+@@ -2,7 +2,6 @@
+ INCLUDES = \
+   $(EGG_CFLAGS) \
+   -DEGG_COMPILATION \
+-  -DGTK_DISABLE_DEPRECATED \
+   -DGDK_DISABLE_DEPRECATED \
+   -DG_DISABLE_DEPRECATED \
+   -I$(top_builddir)/libegg/util
+--- toolbar/Makefile.in	2003-06-07 00:33:18.000000000 +0200
++++ toolbar/Makefile.in.new	2004-04-10 12:57:42.295292568 +0200
+@@ -145,7 +145,6 @@
+ INCLUDES = \
+   $(EGG_CFLAGS) \
+   -DEGG_COMPILATION \
+-  -DGTK_DISABLE_DEPRECATED \
+   -DGDK_DISABLE_DEPRECATED \
+   -DG_DISABLE_DEPRECATED \
+   -I$(top_builddir)/libegg/util
+--- tray/Makefile.in	2003-06-07 00:33:19.000000000 +0200
++++ tray/Makefile.in.new	2004-04-10 12:57:55.464290576 +0200
+@@ -146,7 +146,6 @@
+   $(EGG_CFLAGS) \
+   -I$(top_srcdir)/libegg/util \
+   -DEGG_COMPILATION \
+-  -DGTK_DISABLE_DEPRECATED \
+   -DGDK_DISABLE_DEPRECATED \
+   -DG_DISABLE_DEPRECATED
+ 
+--- tray/Makefile.am	2003-04-03 22:37:51.000000000 +0200
++++ tray/Makefile.am.new	2004-04-10 12:58:05.573753704 +0200
+@@ -3,7 +3,6 @@
+   $(EGG_CFLAGS) \
+   -I$(top_srcdir)/libegg/util \
+   -DEGG_COMPILATION \
+-  -DGTK_DISABLE_DEPRECATED \
+   -DGDK_DISABLE_DEPRECATED \
+   -DG_DISABLE_DEPRECATED
+ 
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-0.4.1.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-0.4.1.ebuild
index a712accaf70b..a6d0a4827c82 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-0.4.1.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-0.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-0.4.1.ebuild,v 1.7 2004/02/12 18:39:31 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-0.4.1.ebuild,v 1.8 2004/04/10 14:59:44 liquidx Exp $
 
 inherit gnome2
 
@@ -36,3 +36,10 @@ DEPEND="${RDEPEND}
 
 DOCS="README NEWS AUTHORS COPYING ChangeLog"
 MAKEOPTS="${MAKEOPTS} -j1"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/libegg/libegg
+	epatch ${FILESDIR}/${P}-gtk24.patch
+	cp ${S}/libegg/libegg/util/eggmarshelers.h ${S}/libegg/libegg/toolbar
+}