Patch from upstream to fix building with USE="pch contrib" and new glib

versions. (bug #307603)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 58 insertions, 6 deletions

diff --git a/dev-util/codeblocks/ChangeLog b/dev-util/codeblocks/ChangeLog
index 2cb77541c644..0f41195c960b 100644
--- a/dev-util/codeblocks/ChangeLog
+++ b/dev-util/codeblocks/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/codeblocks
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/codeblocks/ChangeLog,v 1.16 2010/01/24 23:12:00 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/codeblocks/ChangeLog,v 1.17 2010/05/06 06:08:10 dirtyepic Exp $
+
+  06 May 2010; Ryan Hill <dirtyepic@gentoo.org> codeblocks-8.02-r1.ebuild,
+  +files/codeblocks-8.02-gsocket.patch, metadata.xml:
+  Patch from upstream to fix building with USE="pch contrib" and new glib
+  versions. (bug #307603)
 
   24 Jan 2010; Brent Baude <ranger@gentoo.org> codeblocks-8.02-r1.ebuild:
   keyworded ~arch for ppc, bug 295271
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 116586336757..47aad541cbbc 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -1,12 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 8.02-version.patch 345 RMD160 4e871fb354dc3d68cac84c7791facbc1cd0c8ea9 SHA1 e89bfc45b1d831dcbc4fc5f18d2a8219daf66c55 SHA256 cd7d28a0ec35f8013103feacdc29b5a82f36f7af24793e764eb26fa998d45c8d
 AUX codeblocks-8.02-gcc43.patch 472 RMD160 558a7c577f78159fa82fe86b1af6502c4f62c2ac SHA1 7b5b5af288fc165f9b67aadf9d60f27315fb2b9f SHA256 7326f738027eebdb1a2037a4e5536f52c612e9ab6f82a4d738e295c3239ad293
 AUX codeblocks-8.02-gcc44.patch 4372 RMD160 db150c9fa9571f5da338b443a909fda4a8049f05 SHA1 fe55cb17fc0452875762e09cbf92347acdd9d453 SHA256 24ec7c52a63507191abf083a0d69f3a3766dbefbdf0dd352c190f8d9b9748f49
+AUX codeblocks-8.02-gsocket.patch 1261 RMD160 161f424a1ac01c48777ee5527e9603dc6c56c294 SHA1 b3378b9c6938c926048e4479eed982cc687c0383 SHA256 e188b1871a208667dfd3fa1df099d5e26d66cc5c82a1dd82e2f66e3ad3cee5f3
 DIST codeblocks-1.0_pre20070618.tar.bz2 8564270 RMD160 643deba773f3a873c19c3b89fbb4866b106ff457 SHA1 4ec7c2cd364b3fe0cb2172bd48e6c2569479e3b5 SHA256 19d54866991ccbfe7a4b9921f85d6289b1c948931040bf2462b92ddf8e2d8db9
 DIST codeblocks-1.0_pre20071215.tar.bz2 11131352 RMD160 e8a43ff768512b79072c53d276cbe37badfe07bb SHA1 6760ad7b8688226f455a2bfb40d7e368273df5a2 SHA256 66f42142675ca80f5e50717aa9cb46ba2dc5bd8a1d4e8d1259514a64b9a67e9e
 DIST codeblocks-8.02-src.tar.bz2 6839711 RMD160 88451f42ac4de2b98d57416a3cea1a0647344b30 SHA1 078932cfd4fee2066ec931cb6dfa8079235c1237 SHA256 5a6e9184b5edc991b59dadbf87bf4584ed6c30e7097c572149cc1b2085b3080f
 EBUILD codeblocks-1.0_pre20070618.ebuild 1322 RMD160 cf02ce1b9bef067b17f2ae64045fa6acc7caa3d6 SHA1 06d4c682adb936d39d3d98dae7e7e7bf2b4bfe72 SHA256 679fb3638f2560f54232d597752e638ebb0f214971047d15fa3bc78b63bcd84f
 EBUILD codeblocks-1.0_pre20071215.ebuild 1293 RMD160 37c48b5aff4cba248c30bde2bec76f273e4035e5 SHA1 0b8dc999e8124166e01230188a767ada6928bdbf SHA256 5ce78e25596d7af29e584f68f4824127ca398589901389826cea2fc2c4040819
-EBUILD codeblocks-8.02-r1.ebuild 2236 RMD160 95b422ef689679ed20b335575952e72661e32a11 SHA1 a58bd1b6427292e34a377a485396299ad982b277 SHA256 7834c708103cb35a1ff5a9c1cc701ea9579487b98b63cfacac86cda1d473ec66
+EBUILD codeblocks-8.02-r1.ebuild 2280 RMD160 4894f97a0674d0a79b6361500cbf04722bd97ea5 SHA1 50aae96e8b9c02fa5fbcefc2d7128c81a0642c82 SHA256 e2fb2d47e9ca4c0becf142c58058d5baeed600eae35c749518de8e15cc410e86
 EBUILD codeblocks-8.02.ebuild 2265 RMD160 67d25e3d672bbd88c815559f54ca3af8941e443e SHA1 594312adf2eef2205dccb4eaee2973db3a99a65c SHA256 4855c536a2c7371e1a1bd1c99e14872fae7a0762a4ae694df2c771d02c4473ef
-MISC ChangeLog 2802 RMD160 6c8495ea024b2a5762236ba964bcc4d0363116ea SHA1 af62b4aad3ddf3003fbed10843808598b19dc9f9 SHA256 d6c2bf0b7d0631de6cef97ca9b49f83acd2a5a3d23fe33bc960ec46da656afd6
-MISC metadata.xml 347 RMD160 71d5ad7d9a84e8176377b9747a37d89c59146894 SHA1 bbe2552bedb698bda0b892d124a11341e83ee9c8 SHA256 aa3e08078960eef1da419865574bd70e2aee2f9e6550eb65a1795a2e78cf7d2f
+MISC ChangeLog 3035 RMD160 6d8fd882098995dea5af7acc05eb4ce0ad38b6d1 SHA1 389d49b8d9de88aeea646dfb1b49e98fd7cb9c61 SHA256 327141d17c2b5e4b6e1642919079c17b23dc9db45c29a6d8139496d58b797401
+MISC metadata.xml 349 RMD160 1e3aff8d622e33b681522ae83d9b2ccf4750c746 SHA1 9b7e9a2300e05bf52a1a1f739206b3a30038a2c4 SHA256 205d971ea7fcdbae6e44da8ef478ef43bb0b58d258c6fa45cf027d172852a5d8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkviXYUACgkQiqiDRvmkBmKAkACg6TOAH/Xi3NdgmE9Tk0050K/T
+xIwAniJqblpiV8tkn/FBHRMzx8OGWcjK
+=4ARB
+-----END PGP SIGNATURE-----
diff --git a/dev-util/codeblocks/codeblocks-8.02-r1.ebuild b/dev-util/codeblocks/codeblocks-8.02-r1.ebuild
index bbef30182b33..55290709a75f 100644
--- a/dev-util/codeblocks/codeblocks-8.02-r1.ebuild
+++ b/dev-util/codeblocks/codeblocks-8.02-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/codeblocks/codeblocks-8.02-r1.ebuild,v 1.2 2010/01/24 23:12:00 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/codeblocks/codeblocks-8.02-r1.ebuild,v 1.3 2010/05/06 06:08:10 dirtyepic Exp $
 
 inherit autotools wxwidgets flag-o-matic eutils
 
@@ -35,6 +35,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-gcc44.patch
 	#epatch "${FILESDIR}/${PV}-install-plugins.patch"
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gsocket.patch
 	find src/plugins -name Makefile.am -exec \
 		sed -i -e 's#^libdir#pluginsdir#' \
 			   -e 's#^lib_LTLIBRARIES#plugins_LTLIBRARIES#' \
diff --git a/dev-util/codeblocks/files/codeblocks-8.02-gsocket.patch b/dev-util/codeblocks/files/codeblocks-8.02-gsocket.patch
new file mode 100644
index 000000000000..57072e5168f7
--- /dev/null
+++ b/dev-util/codeblocks/files/codeblocks-8.02-gsocket.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/307603
+http://svn.berlios.de/wsvn/codeblocks/?op=comp&compare[]=%2Ftrunk%2Fsrc%2Fplugins%2Fcontrib%2Fcodesnippets@5713&compare[]=%2Ftrunk%2Fsrc%2Fplugins%2Fcontrib%2Fcodesnippets@5716
+
+--- a/src/plugins/contrib/codesnippets/codesnippets.cpp
++++ b/src/plugins/contrib/codesnippets/codesnippets.cpp
+@@ -52,8 +52,12 @@
+ #include "memorymappedfile.h"
+ 

+ #if defined(__WXGTK__)

++	 // hack to avoid name-conflict between wxWidgets GSocket and the one defined
++	// in newer glib-headers
++	#define GSocket GLibSocket
++	#include <gdk/gdkx.h>
++	#undef GSocket
+     #include "wx/gtk/win_gtk.h"

+-    #include <gdk/gdkx.h>

+ #endif

+ 

+ // The plugin needs a flag ON to enable some code for the plugin

+--- a/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp
++++ b/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp
+@@ -49,8 +49,12 @@
+ #include "menuidentifiers.h"

+ #include "editsnippetframe.h"

+ #if defined(__WXGTK__)
++	 // hack to avoid name-conflict between wxWidgets GSocket and the one defined
++	// in newer glib-headers
++	#define GSocket GLibSocket
++	#include <gdk/gdkx.h>
++	#undef GSocket
+     #include "wx/gtk/win_gtk.h"

+-    #include <gdk/gdkx.h>

+ #endif

+ 
+ IMPLEMENT_DYNAMIC_CLASS(CodeSnippetsTreeCtrl, wxTreeCtrl)

diff --git a/dev-util/codeblocks/metadata.xml b/dev-util/codeblocks/metadata.xml
index 7cc466e8d38a..f3cd9a6101fc 100644
--- a/dev-util/codeblocks/metadata.xml
+++ b/dev-util/codeblocks/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>no-herd</herd>
+  <herd>wxwidgets</herd>
   <maintainer>
     <email>jurek@gentoo.org</email>
     <name>Jurek Bartuszek</name>