gtk+3/patches/no-fribidi.patch

   1 diff --git a/gdk/gdk.c b/gdk/gdk.c
   2 index f0869a6..2f3c039 100644
   3 --- a/gdk/gdk.c
   4 +++ b/gdk/gdk.c
   5 @@ -44,7 +44,6 @@
   6  #include <string.h>
   7  #include <stdlib.h>
   8
   9 -#include <fribidi.h>
  10
  11
  12  /**
  13 @@ -1118,17 +1117,6 @@ gdk_disable_multidevice (void)
  14  PangoDirection
  15  gdk_unichar_direction (gunichar ch)
  16  {
  17 -  FriBidiCharType fribidi_ch_type;
  18 -
  19 -  G_STATIC_ASSERT (sizeof (FriBidiChar) == sizeof (gunichar));
  20 -
  21 -  fribidi_ch_type = fribidi_get_bidi_type (ch);
  22 -
  23 -  if (!FRIBIDI_IS_STRONG (fribidi_ch_type))
  24 -    return PANGO_DIRECTION_NEUTRAL;
  25 -  else if (FRIBIDI_IS_RTL (fribidi_ch_type))
  26 -    return PANGO_DIRECTION_RTL;
  27 -  else
  28      return PANGO_DIRECTION_LTR;
  29  }
  30
  31 diff --git a/gtk/gtkpango.c b/gtk/gtkpango.c
  32 index aaac4cc..a76ad57 100644
  33 --- a/gtk/gtkpango.c
  34 +++ b/gtk/gtkpango.c
  35 @@ -25,7 +25,6 @@
  36  #include "config.h"
  37  #include "gtkpango.h"
  38  #include <pango/pangocairo.h>
  39 -#include <fribidi.h>
  40  #include "gtkintl.h"
  41
  42  #define GTK_TYPE_FILL_LAYOUT_RENDERER            (_gtk_fill_layout_renderer_get_type())
  43 @@ -1326,17 +1325,6 @@ _gtk_pango_attr_list_merge (PangoAttrList *into,
  44  PangoDirection
  45  _gtk_pango_unichar_direction (gunichar ch)
  46  {
  47 -  FriBidiCharType fribidi_ch_type;
  48 -
  49 -  G_STATIC_ASSERT (sizeof (FriBidiChar) == sizeof (gunichar));
  50 -
  51 -  fribidi_ch_type = fribidi_get_bidi_type (ch);
  52 -
  53 -  if (!FRIBIDI_IS_STRONG (fribidi_ch_type))
  54 -    return PANGO_DIRECTION_NEUTRAL;
  55 -  else if (FRIBIDI_IS_RTL (fribidi_ch_type))
  56 -    return PANGO_DIRECTION_RTL;
  57 -  else
  58      return PANGO_DIRECTION_LTR;
  59  }
  60