diff options
| author |   Mamoru Komachi <usata@gentoo.org> | 2006-11-04 16:53:27 +0000 |
|---|---|---|
| committer | Mamoru Komachi <usata@gentoo.org> | 2006-11-04 16:53:27 +0000 |
| commit | 4d6e68a140da008665151b0dfb908179e1ec3a8b (patch) | |
| tree | 72c92d2fbfdc4706f15afa1c90f231af78fce2cb /app-dicts | |
| parent | Version bumped. Removed old ebuild. (diff) | |
| download | gentoo-2-4d6e68a140da008665151b0dfb908179e1ec3a8b.tar.gz gentoo-2-4d6e68a140da008665151b0dfb908179e1ec3a8b.tar.bz2 gentoo-2-4d6e68a140da008665151b0dfb908179e1ec3a8b.zip | |
Fix for GTK+-2.8.x. Thanks to Hiroyuki Ikezoe <poincare@ikezoe.net> for providing a patch. This closes bug #109654.
(Portage version: 2.1.1)
Diffstat (limited to 'app-dicts')
| -rw-r--r-- | app-dicts/ebview/ChangeLog | 9 | ||||
| -rw-r--r-- | app-dicts/ebview/ebview-0.3.6.ebuild | 6 | ||||
| -rw-r--r-- | app-dicts/ebview/files/digest-ebview-0.3.6 | 2 | ||||
| -rw-r--r-- | app-dicts/ebview/files/ebview-0.3.6-gtk28.diff | 31 |
4 files changed, 44 insertions, 4 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/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"); |