summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTing-Wei Lan2019-05-18 13:58:14 +0800
committerTing-Wei Lan2019-05-18 14:42:44 +0800
commitbc543bde14d0be0b22275be4092ba2ca541a8def (patch)
tree1b32b1dc9bc88f1055164fffec140487e0a8cffd
parentf84f754534dff4906c191cf390f439844e718199 (diff)
downloadaur-bc543bde14d0be0b22275be4092ba2ca541a8def.tar.gz
mingw-w64-gtk3: Drop unused patches
-rw-r--r--gtk3-fribidi-private-dependency.patch37
-rw-r--r--gtk3-link-gdk-against-fribidi.patch26
2 files changed, 0 insertions, 63 deletions
diff --git a/gtk3-fribidi-private-dependency.patch b/gtk3-fribidi-private-dependency.patch
deleted file mode 100644
index 98ab6cdcf757..000000000000
--- a/gtk3-fribidi-private-dependency.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 47e4a111c2666961ab47b6df48460d3c9075d92d Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Tue, 5 Feb 2019 08:04:14 -0500
-Subject: [PATCH] Try again
-
-We only want fribidi as a private dependency.
----
- configure.ac | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c591c02e89..388db32c5a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1376,8 +1376,8 @@ fi
- CFLAGS="$saved_cflags"
- LDFLAGS="$saved_ldflags"
-
--GDK_PACKAGES="$PANGO_PACKAGES fribidi >= fribidi_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version"
--GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends epoxy >= epoxy_required_version $CLOUDPROVIDER_PACKAGES"
-+GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version"
-+GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends epoxy >= epoxy_required_version $CLOUDPROVIDER_PACKAGES fribidi >= fribidi_required_version"
-
- PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES)
- GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB"
-@@ -1411,7 +1411,7 @@ fi
- PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)
-
- GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version"
--GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version"
-+GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version fribidi >= fribidi_required_dep"
- if test "x$enable_x11_backend" = xyes -o "x$enable_wayland_backend" = xyes; then
- GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
- fi
---
-2.18.1
-
diff --git a/gtk3-link-gdk-against-fribidi.patch b/gtk3-link-gdk-against-fribidi.patch
deleted file mode 100644
index dd31143159c8..000000000000
--- a/gtk3-link-gdk-against-fribidi.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f533ef8650e59f800ea4d958b16b4a6691a103ac Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Tue, 5 Feb 2019 07:17:07 -0500
-Subject: [PATCH] Link gdk against fribidi
-
-It is required now.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 447e49e0df..c591c02e89 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1376,7 +1376,7 @@ fi
- CFLAGS="$saved_cflags"
- LDFLAGS="$saved_ldflags"
-
--GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version"
-+GDK_PACKAGES="$PANGO_PACKAGES fribidi >= fribidi_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version"
- GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends epoxy >= epoxy_required_version $CLOUDPROVIDER_PACKAGES"
-
- PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES)
---
-2.18.1
-