gtk+3: remove fribidi dependency

This commit is contained in:
Dylan Araps 2021-07-07 18:42:01 +03:00
parent 92f6a37b6f
commit bebc3382da
No known key found for this signature in database
GPG Key ID: 13295DAC2CF13B5C
6 changed files with 69 additions and 4 deletions

View File

@ -1,7 +1,11 @@
#!/bin/sh -e
# Remove configure check for atk-bridge.
sed 's/\(ATK_PACKAGES="atk\) atk-bridge-2.0"/\1"/' configure > _
patch -p1 < no-fribidi.patch
# Remove configure check for atk-bridge and fribidi.
sed -e 's/\(ATK_PACKAGES="atk\) atk-bridge-2.0"/\1"/' \
-e 's/fribidi >= 0\.19\.7//g' \
configure > _
mv -f _ configure
chmod +x configure

View File

@ -1 +1,2 @@
f57ec4ade8f15cab0c23a80dcaee85b876e70a8823d9105f067ce335a8268caa
e44b643a9ec01ea153817602241d6d7e6fd2d121b3ce4e29f99a87d8836a3ff0

View File

@ -1,5 +1,4 @@
atk
fribidi
gdk-pixbuf
libXcomposite
libXcursor

View File

@ -0,0 +1,60 @@
diff --git a/gdk/gdk.c b/gdk/gdk.c
index f0869a6..2f3c039 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -44,7 +44,6 @@
#include <string.h>
#include <stdlib.h>
-#include <fribidi.h>
/**
@@ -1118,17 +1117,6 @@ gdk_disable_multidevice (void)
PangoDirection
gdk_unichar_direction (gunichar ch)
{
- FriBidiCharType fribidi_ch_type;
-
- G_STATIC_ASSERT (sizeof (FriBidiChar) == sizeof (gunichar));
-
- fribidi_ch_type = fribidi_get_bidi_type (ch);
-
- if (!FRIBIDI_IS_STRONG (fribidi_ch_type))
- return PANGO_DIRECTION_NEUTRAL;
- else if (FRIBIDI_IS_RTL (fribidi_ch_type))
- return PANGO_DIRECTION_RTL;
- else
return PANGO_DIRECTION_LTR;
}
diff --git a/gtk/gtkpango.c b/gtk/gtkpango.c
index aaac4cc..a76ad57 100644
--- a/gtk/gtkpango.c
+++ b/gtk/gtkpango.c
@@ -25,7 +25,6 @@
#include "config.h"
#include "gtkpango.h"
#include <pango/pangocairo.h>
-#include <fribidi.h>
#include "gtkintl.h"
#define GTK_TYPE_FILL_LAYOUT_RENDERER (_gtk_fill_layout_renderer_get_type())
@@ -1326,17 +1325,6 @@ _gtk_pango_attr_list_merge (PangoAttrList *into,
PangoDirection
_gtk_pango_unichar_direction (gunichar ch)
{
- FriBidiCharType fribidi_ch_type;
-
- G_STATIC_ASSERT (sizeof (FriBidiChar) == sizeof (gunichar));
-
- fribidi_ch_type = fribidi_get_bidi_type (ch);
-
- if (!FRIBIDI_IS_STRONG (fribidi_ch_type))
- return PANGO_DIRECTION_NEUTRAL;
- else if (FRIBIDI_IS_RTL (fribidi_ch_type))
- return PANGO_DIRECTION_RTL;
- else
return PANGO_DIRECTION_LTR;
}

View File

@ -1 +1,2 @@
https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.29.tar.xz
patches/no-fribidi.patch

View File

@ -1 +1 @@
3.24.29 1
3.24.29 2