Add patch to build with glib-2.32. #422781

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

4 files changed, 65 insertions, 10 deletions

diff --git a/app-i18n/tomoe/ChangeLog b/app-i18n/tomoe/ChangeLog
index 690c57c0c017..b7e3f849955c 100644
--- a/app-i18n/tomoe/ChangeLog
+++ b/app-i18n/tomoe/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/tomoe
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/tomoe/ChangeLog,v 1.16 2012/06/08 11:52:50 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/tomoe/ChangeLog,v 1.17 2012/06/22 02:13:29 naota Exp $
+
+  22 Jun 2012; Naohiro Aota <naota@gentoo.org> +files/tomoe-0.6.0-glib232.patch,
+  tomoe-0.6.0-r1.ebuild:
+  Add patch to build with glib-2.32. #422781
 
   08 Jun 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> tomoe-0.6.0-r1.ebuild:
   x86 stable wrt bug #418593
diff --git a/app-i18n/tomoe/Manifest b/app-i18n/tomoe/Manifest
index c7ba19233fde..cdf1680ffc67 100644
--- a/app-i18n/tomoe/Manifest
+++ b/app-i18n/tomoe/Manifest
@@ -1,17 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX tomoe-0.6.0-export-symbols.patch 8483 RMD160 4eec71775db1d82443a74caf774507fd3cf45f48 SHA1 db74edecb40e3eb9b898f6466cdd410b45779211 SHA256 7d7c6462e0998fb96828da8358a8d35f0082f875ff6ff6f47a05105aa6ef3308
+AUX tomoe-0.6.0-glib232.patch 935 RMD160 451302ff47f4c0dceed3e8cb72e2039a0dcbffb2 SHA1 8f84ebd26292fda6342902042186f1cb348bacd9 SHA256 fab62803fceffdd843971d261004d53ae483d7ab1d709e25f948d74067ae02a0
 AUX tomoe-0.6.0-ldflags.patch 977 RMD160 7c900564a7336f65fc00ec1e69263dea528bf821 SHA1 7774b317f2d4117a30d444ee6ee9cd5989ce6df9 SHA256 088ebcb0b7d870d463ca4da0d3f46d242af448da806c405623272507dc54255f
 DIST tomoe-0.6.0.tar.gz 4918949 RMD160 fc8e799c4b845e9c4b41879980fecc9d9dc77c69 SHA1 0ab5b4fd4609d0439f90010c35305595522f54f2 SHA256 ee600f97fa434c13f6c41a1db9e03eccd551151ed48ece9c56cd9e828228ea1e
-EBUILD tomoe-0.6.0-r1.ebuild 1995 RMD160 81c80a645824a144e414d02f5892d20734501f77 SHA1 34cda5f97c013097202824b19c1645338e2f2d58 SHA256 a2eafebd9a883ecff42f61e2470b01a9312568d16d198396ac17149ab82afcd4
+EBUILD tomoe-0.6.0-r1.ebuild 2027 RMD160 08414db549feb70baca54d2ed30b1fc6a5dcf016 SHA1 83001ce59aafc144c15d59b74b9a8c0d681768d7 SHA256 559499538f935aeff2ba691a57ab7208bef52f59ed812c069e78f511d9a2f105
 EBUILD tomoe-0.6.0.ebuild 1030 RMD160 5761cad2b6d0d0480cf1bd2ab592f1c7cabd2360 SHA1 9ed35459df1b2e2cfe117c369183b46653e068db SHA256 b99a3f4254739c57f8a5fd34d4c1cc56aa0503f1eb09fe9baf5d1b26a5f2f1c5
-MISC ChangeLog 2378 RMD160 68798cb8a20e74938875e9d263f1a4165f96e8f0 SHA1 5715f23d1c4ec729825524d7f6b350d6f09e2643 SHA256 7d7fe3ed5e3b90e56452901742d1905491a1716ba6dc0a829fbc9ad5cdbcd592
+MISC ChangeLog 2525 RMD160 d5b7357ad55f8b92ca4112a12b5ebe76d040c661 SHA1 e5555b4f2f124a615be8c32f004c599f131d6702 SHA256 fe45f4c1caac92261a3c4e52c8403d98a8a6f788afb30d668d856e8d1168516f
 MISC metadata.xml 262 RMD160 e58b285a87176394371a0acd3f91ad2526d17879 SHA1 1eb03c87b512496e53fe5bb71252623d7176df25 SHA256 636fb99d93f0677bcea4b14829bbba99a7301cff0b373c6b742ffdce02534e9c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk/R55gACgkQuUQtlDBCeQJBuwCcCAccPlksWD/7AXGGdS7jSbWU
-tWQAni0f/cgZ3Yer6q3nnOipdsuo1uNX
-=ZkMS
+iQIcBAEBCAAGBQJP49TWAAoJEDYO1FT4VRUUTHYQAJf++2UUUM1HJ3o/9kYr1rcI
+a1Q/nud4lJlsaB4ch3MQZz5CQiGf9SrAfmO9vNuAiJobildP2Xl4ggBpPehmRZ/S
+XhZ2OFHvqjzJaoF72CqUs4cFzOsn5q/YpBEE9gtFUgRUVywHickCi995hj6nsGt8
+u42Fo1hOx4h+b0ThzB4lnC+fjY+HLSq4HJZsJE5SIzCPfSvQ59BBN2Ee0vM0JrT7
+0YhVaG3SCuYGdVaaF1fNkIPQNZgQF/bxSb52JwrnSO8SosjxZKzOhnJemHtvl1Uk
+7TAlCd2MDrl68dxWKyeh0k8u5D21LO+K3lpC+qKOs0Ymz4TOASYBSxR2yxG/ifuF
+SkG9fhz850ZK45BN9FuDFGYGNjRVGU8FKszMgdJkmZJ5oHTW2TveLdtlRWQ3jh1h
+uT4BjNx6UE2kwoUGTrRYTnfyFH9JQG7s9QOFD0UQ6MwU3bA3a/Yei/Hz/Os/8ktX
+GSh53n46rEsQ/JfvLAA5yg/Sq2qdE5gPf8bGg5inEUEoiPd2FSyGykQZZAMFjET+
+y69010wtNS3vR7cOdUZQhEduODDEjMsjSRNyY3ptOdNi6xUbTfaASBGPraDIjvA9
+mjeaZ4CGurQp5ZHRcAJyt31dQQVtzytWNKq76/5uAaTAZ60HUu1gRRiOYK0ARZek
+8tLEyIzcO2JDwenAH4ik
+=MGV9
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/tomoe/files/tomoe-0.6.0-glib232.patch b/app-i18n/tomoe/files/tomoe-0.6.0-glib232.patch
new file mode 100644
index 000000000000..cf073d4d2cfa
--- /dev/null
+++ b/app-i18n/tomoe/files/tomoe-0.6.0-glib232.patch
@@ -0,0 +1,39 @@
+diff --git a/lib/glib-compat-key-file.h b/lib/glib-compat-key-file.h
+index 6cae16b..1fb1490 100644
+--- a/lib/glib-compat-key-file.h
++++ b/lib/glib-compat-key-file.h
+@@ -51,7 +51,7 @@
+ #ifndef __G_KEY_FILE_H__
+ #define __G_KEY_FILE_H__
+ 
+-#include <glib/gerror.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+diff --git a/lib/glib-utils.h b/lib/glib-utils.h
+index 275c96c..7afca67 100644
+--- a/lib/glib-utils.h
++++ b/lib/glib-utils.h
+@@ -28,7 +28,7 @@
+ #include "config.h"
+ #endif /* HAVE_CONFIG_H */
+ 
+-#include <glib/garray.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include "glib-compat-file-utilities.h"
+ #include "glib-compat-key-file.h"
+diff --git a/lib/tomoe.c b/lib/tomoe.c
+index 8578c27..4534017 100644
+--- a/lib/tomoe.c
++++ b/lib/tomoe.c
+@@ -26,7 +26,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <glib/garray.h>
++#include <glib.h>
+ #include "tomoe.h"
+ 
+ static gboolean initialized = FALSE;
diff --git a/app-i18n/tomoe/tomoe-0.6.0-r1.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r1.ebuild
index 3f95e264a16d..f51df28d86a4 100644
--- a/app-i18n/tomoe/tomoe-0.6.0-r1.ebuild
+++ b/app-i18n/tomoe/tomoe-0.6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/tomoe/tomoe-0.6.0-r1.ebuild,v 1.5 2012/06/08 11:52:50 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/tomoe/tomoe-0.6.0-r1.ebuild,v 1.6 2012/06/22 02:13:29 naota Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -46,7 +46,8 @@ pkg_setup() {
 src_prepare() {
 	epatch \
 		"${FILESDIR}/${P}-export-symbols.patch" \
-		"${FILESDIR}/${P}-ldflags.patch"
+		"${FILESDIR}/${P}-ldflags.patch" \
+		"${FILESDIR}/${P}-glib232.patch"
 
 	if ! use hyperestraier ; then
 		sed -i -e "s/use_est=yes/use_est=no/" configure.ac || die