Fix for GTK+-2.8.x. Thanks to Hiroyuki Ikezoe <poincare@ikezoe.net> for providing a patch. This closes bug #109654.

Package-Manager: portage-2.1.1

5 files changed, 60 insertions, 16 deletions

diff --git a/app-dicts/ebview/ChangeLog b/app-dicts/ebview/ChangeLog
index c12a9822265e..aa1fea190028 100644
--- a/app-dicts/ebview/ChangeLog
+++ b/app-dicts/ebview/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-dicts/ebview
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/ebview/ChangeLog,v 1.19 2005/01/01 12:51:15 eradicator Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/ebview/ChangeLog,v 1.20 2006/11/04 16:53:27 usata Exp $
+
+  04 Nov 2006; Mamoru KOMACHI <usata@gentoo.org>
+  +files/ebview-0.3.6-gtk28.diff, ebview-0.3.6.ebuild:
+  Fix for GTK+-2.8.x. Thanks to Hiroyuki Ikezoe <poincare@ikezoe.net> for
+  providing a patch. This closes bug #109654.
 
   23 Nov 2004; Mamoru KOMACHI <usata@gentoo.org>
   +files/ebview-0.3.6-destdir.diff, -files/ebview-eb4-gentoo.diff,
diff --git a/app-dicts/ebview/Manifest b/app-dicts/ebview/Manifest
index cd1be45d4fa1..78f5758afddd 100644
--- a/app-dicts/ebview/Manifest
+++ b/app-dicts/ebview/Manifest
@@ -2,23 +2,27 @@ AUX ebview-0.3.6-destdir.diff 4870 RMD160 92bb6f1a563cc9267dd691c391703b7e3b8c3b
 MD5 fb381a5265f238aa735b72c0cdec3738 files/ebview-0.3.6-destdir.diff 4870
 RMD160 92bb6f1a563cc9267dd691c391703b7e3b8c3b27 files/ebview-0.3.6-destdir.diff 4870
 SHA256 63b9e2de733fe16fcc90ce819d3f94f83fa3d4137ff01488e585604175006962 files/ebview-0.3.6-destdir.diff 4870
+AUX ebview-0.3.6-gtk28.diff 925 RMD160 ee93bc350055a0777005ce37ca48e6a524ab7d52 SHA1 8010dcc33b38757c680558c13c1a90f79b761afa SHA256 04c97ab871652133d88fb2cce42f7ee2f84c7f4e95502ca32a86d4b00bfe2357
+MD5 ec126a65436bb7fe9e071775a4b975f9 files/ebview-0.3.6-gtk28.diff 925
+RMD160 ee93bc350055a0777005ce37ca48e6a524ab7d52 files/ebview-0.3.6-gtk28.diff 925
+SHA256 04c97ab871652133d88fb2cce42f7ee2f84c7f4e95502ca32a86d4b00bfe2357 files/ebview-0.3.6-gtk28.diff 925
 AUX ebview-gettext-0.12-gentoo.diff 371 RMD160 fe0c0e4650b1ce39204df2804bdff6a1ee65d994 SHA1 faf8956d4c34a55f752760fdc33317655b5f7a7b SHA256 239d5d066809e31960982baf103e95d3b0020446eb0e3c4409e933370820c888
 MD5 669a87056e662de95352ff0a7386f940 files/ebview-gettext-0.12-gentoo.diff 371
 RMD160 fe0c0e4650b1ce39204df2804bdff6a1ee65d994 files/ebview-gettext-0.12-gentoo.diff 371
 SHA256 239d5d066809e31960982baf103e95d3b0020446eb0e3c4409e933370820c888 files/ebview-gettext-0.12-gentoo.diff 371
-DIST ebview-0.3.6.tar.gz 564915
-EBUILD ebview-0.3.6.ebuild 906 RMD160 b3e8b75f58ea0360f06a9f262cc800e4611eba7e SHA1 c42748a4385e23eb2798d5cd2a383bcbd3b7baeb SHA256 df0f8931988efb3979035676324ed4274713a49afa9274fc68f56b682c68bb06
-MD5 1ab801a66c587f4416ef28b6a582d4ff ebview-0.3.6.ebuild 906
-RMD160 b3e8b75f58ea0360f06a9f262cc800e4611eba7e ebview-0.3.6.ebuild 906
-SHA256 df0f8931988efb3979035676324ed4274713a49afa9274fc68f56b682c68bb06 ebview-0.3.6.ebuild 906
-MISC ChangeLog 2490 RMD160 221c982e9d061776a5c76913f66f9b000e9284ef SHA1 d294c411ccdcc38ac392e119ed8938c8e2d39a31 SHA256 db08d222626e018de7bff83c718301c5096c635f1d36f66a34f8f602111d1826
-MD5 51ff72ae11f994adfc466f2ab92e3cd1 ChangeLog 2490
-RMD160 221c982e9d061776a5c76913f66f9b000e9284ef ChangeLog 2490
-SHA256 db08d222626e018de7bff83c718301c5096c635f1d36f66a34f8f602111d1826 ChangeLog 2490
+DIST ebview-0.3.6.tar.gz 564915 RMD160 c32de00be68c13794f2c1d9c08edc34fc5dcb613 SHA1 47b63fb2f265c83cc5bf7aeb92f96d0e1cc7f9af SHA256 4c8ce9d9b1567b5dd7c23cb157a864f99ee8266637ab0b8c99f3dfcd963133b1
+EBUILD ebview-0.3.6.ebuild 946 RMD160 3308b3e23918a39ede9c214809799e74ff9420f9 SHA1 4411f23fd5cdcd349af55191399396690a797976 SHA256 6c431aa85a1ba8f2f8fa09fe423b3fc83da26f5534641145c4d6f4d29df98a57
+MD5 48378541f4f7a5ad1e1f167a84580544 ebview-0.3.6.ebuild 946
+RMD160 3308b3e23918a39ede9c214809799e74ff9420f9 ebview-0.3.6.ebuild 946
+SHA256 6c431aa85a1ba8f2f8fa09fe423b3fc83da26f5534641145c4d6f4d29df98a57 ebview-0.3.6.ebuild 946
+MISC ChangeLog 2710 RMD160 9a10d33a9b79835c550e3b7aef52e5c5a116e737 SHA1 d80d3b684489d1301772b239a1975c43c457a79e SHA256 9d49a5ba9b7af68517db08b952362707d260e1787e60885db30f8b2684646a8c
+MD5 9aa99ce7f1a21a0480b48bfb90aa3e9e ChangeLog 2710
+RMD160 9a10d33a9b79835c550e3b7aef52e5c5a116e737 ChangeLog 2710
+SHA256 9d49a5ba9b7af68517db08b952362707d260e1787e60885db30f8b2684646a8c ChangeLog 2710
 MISC metadata.xml 251 RMD160 f203a44718ac53354efe30524db51954bbc4366b SHA1 63a30fa3e56d0063f6628f20f0a291d9bac4d62a SHA256 efc59f0d07df204d925b6320737a66e642f369c9823591f1eccb9ab22cbb45f1
 MD5 d1411e42201207c6fd5ce3c1e9c37483 metadata.xml 251
 RMD160 f203a44718ac53354efe30524db51954bbc4366b metadata.xml 251
 SHA256 efc59f0d07df204d925b6320737a66e642f369c9823591f1eccb9ab22cbb45f1 metadata.xml 251
-MD5 3112c347e1311fdd7da16d107a11c45f files/digest-ebview-0.3.6 64
-RMD160 614dad609db1316104c8423d90f0c6bf969f37aa files/digest-ebview-0.3.6 64
-SHA256 55b76a5430acd4510f7eaf4793b87efd45be5d9c37ae6e979466cb4bd5ba3a09 files/digest-ebview-0.3.6 64
+MD5 bac741172b7a93d5bb928f44616e2fcb files/digest-ebview-0.3.6 238
+RMD160 a9c0c808e3f2c0db1adbe050ce4f04a1ca071fa7 files/digest-ebview-0.3.6 238
+SHA256 b866e94499c8c7c9f5e1392f9b80435109125c0313504e7878f9b8d30a9598a5 files/digest-ebview-0.3.6 238
diff --git a/app-dicts/ebview/ebview-0.3.6.ebuild b/app-dicts/ebview/ebview-0.3.6.ebuild
index fe936152e903..dd0df969b816 100644
--- a/app-dicts/ebview/ebview-0.3.6.ebuild
+++ b/app-dicts/ebview/ebview-0.3.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/ebview/ebview-0.3.6.ebuild,v 1.4 2005/01/01 12:51:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/ebview/ebview-0.3.6.ebuild,v 1.5 2006/11/04 16:53:27 usata Exp $
 
 inherit eutils
 
@@ -22,7 +22,9 @@ src_unpack() {
 
 	unpack ${A}
 
+	cd ${S}
 	epatch ${FILESDIR}/${P}-destdir.diff
+	epatch ${FILESDIR}/${P}-gtk28.diff
 	if has_version '>=sys-devel/gettext-0.12' ; then
 		cd ${S}/po
 		epatch ${FILESDIR}/${PN}-gettext-0.12-gentoo.diff
diff --git a/app-dicts/ebview/files/digest-ebview-0.3.6 b/app-dicts/ebview/files/digest-ebview-0.3.6
index 269e6d2fa3e1..b801ef148865 100644
--- a/app-dicts/ebview/files/digest-ebview-0.3.6
+++ b/app-dicts/ebview/files/digest-ebview-0.3.6
@@ -1 +1,3 @@
 MD5 223f679a6b54bc32cb6d44f54909d049 ebview-0.3.6.tar.gz 564915
+RMD160 c32de00be68c13794f2c1d9c08edc34fc5dcb613 ebview-0.3.6.tar.gz 564915
+SHA256 4c8ce9d9b1567b5dd7c23cb157a864f99ee8266637ab0b8c99f3dfcd963133b1 ebview-0.3.6.tar.gz 564915
diff --git a/app-dicts/ebview/files/ebview-0.3.6-gtk28.diff b/app-dicts/ebview/files/ebview-0.3.6-gtk28.diff
new file mode 100644
index 000000000000..d0c0c6f9a054
--- /dev/null
+++ b/app-dicts/ebview/files/ebview-0.3.6-gtk28.diff
@@ -0,0 +1,31 @@
+--- src/preference.c.orig	2005-10-05 09:41:23.000000000 +0900
++++ src/preference.c	2005-10-05 10:11:16.000000000 +0900
+@@ -400,7 +400,7 @@ void  calculate_font_size(){
+ 	PangoFontDescription* desc;
+ 	PangoLanguage* lang;
+ 	PangoFontMap* fontmap;
+-#ifndef __WIN32__
++#if !GTK_CHECK_VERSION(2,8,0) && !defined(__WIN32__)
+ 	Display *display;
+ #endif
+ 	PangoContext *context;
+@@ -420,6 +420,9 @@ void  calculate_font_size(){
+ 	desc = pango_font_description_from_string(fontset_normal);
+ 	lang =  pango_language_from_string("ja");
+ 
++#if GTK_CHECK_VERSION(2,8,0)
++	fontmap = pango_cairo_font_map_get_default();
++#else
+ #ifdef __WIN32__
+ 	fontmap = pango_win32_font_map_for_display();
+ #else
+@@ -430,7 +433,8 @@ void  calculate_font_size(){
+ 	}
+ 
+ 	fontmap = pango_x_font_map_for_display(display);
+-#endif
++#endif /* __WIN32__ */
++#endif /* GTK_CHECK_VERSION(2,8,0) */
+ 
+ 	if(fontmap == NULL){
+ 		LOG(LOG_INFO, "fontmap == NULL");