ebview/ebview-0.3.6-gentoo.diff

   1 diff -Naur ebview-0.3.6~/po/Makefile.in.in ebview-0.3.6/po/Makefile.in.in
   2 --- ebview-0.3.6~/po/Makefile.in.in     2009-11-21 18:52:15.000000000 -0600
   3 +++ ebview-0.3.6/po/Makefile.in.in      2009-11-21 18:52:42.000000000 -0600
   4 @@ -32,7 +32,7 @@
   5  GENCAT = @GENCAT@
   6  GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
   7  MSGFMT = @MSGFMT@
   8 -XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
   9 +XGETTEXT = PATH=../src:$$PATH @XGETTEXT@ --from-code=EUC-JP
  10  MSGMERGE = PATH=../src:$$PATH msgmerge
  11
  12  DEFS = @DEFS@
  13 diff -Naur ebview-0.3.6~/src/ebview.c ebview-0.3.6/src/ebview.c
  14 --- ebview-0.3.6~/src/ebview.c  2009-11-21 18:52:15.000000000 -0600
  15 +++ ebview-0.3.6/src/ebview.c   2009-11-21 18:52:24.000000000 -0600
  16 @@ -15,7 +15,7 @@
  17   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  18  */
  19
  20 -#define GTK_DISABLE_DEPRECATED 1
  21 +//#define GTK_DISABLE_DEPRECATED 1
  22
  23  #define _GLOBAL
  24  #include <signal.h>
  25 diff -Naur ebview-0.3.6~/src/preference.c ebview-0.3.6/src/preference.c
  26 --- ebview-0.3.6~/src/preference.c      2009-11-21 18:52:15.000000000 -0600
  27 +++ ebview-0.3.6/src/preference.c       2009-11-21 18:52:33.000000000 -0600
  28 @@ -400,7 +400,7 @@
  29         PangoFontDescription* desc;
  30         PangoLanguage* lang;
  31         PangoFontMap* fontmap;
  32 -#ifndef __WIN32__
  33 +#if !GTK_CHECK_VERSION(2,8,0) && !defined(__WIN32__)
  34         Display *display;
  35  #endif
  36         PangoContext *context;
  37 @@ -420,6 +420,9 @@
  38         desc = pango_font_description_from_string(fontset_normal);
  39         lang =  pango_language_from_string("ja");
  40
  41 +#if GTK_CHECK_VERSION(2,8,0)
  42 +       fontmap = pango_cairo_font_map_get_default();
  43 +#else
  44  #ifdef __WIN32__
  45         fontmap = pango_win32_font_map_for_display();
  46  #else
  47 @@ -430,7 +433,8 @@
  48         }
  49
  50         fontmap = pango_x_font_map_for_display(display);
  51 -#endif
  52 +#endif /* __WIN32__ */
  53 +#endif /* GTK_CHECK_VERSION(2,8,0) */
  54
  55         if(fontmap == NULL){
  56                 LOG(LOG_INFO, "fontmap == NULL");