[packages/gtk+3] fix broken fribidi version in pc file
atler
atler at pld-linux.org
Thu Mar 14 00:29:08 CET 2019
commit 70dc837adc4f7257ae91ea09782cbab9294db20a
Author: Jan Palus <atler at pld-linux.org>
Date: Thu Mar 14 00:28:43 2019 +0100
fix broken fribidi version in pc file
gtk+3-cloudproviders.patch | 4 ++--
gtk+3-fribidi.patch | 12 ++++++++++++
gtk+3.spec | 4 +++-
3 files changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/gtk+3.spec b/gtk+3.spec
index fec43cc..a7b73bd 100644
--- a/gtk+3.spec
+++ b/gtk+3.spec
@@ -28,7 +28,8 @@ Source0: http://ftp.gnome.org/pub/GNOME/sources/gtk+/3.24/gtk+-%{version}.tar.xz
# Source0-md5: 378d327eeb24580fcbc941003de547b9
Patch0: %{name}-papi.patch
Patch1: typeahead.patch
-Patch2: %{name}-cloudproviders.patch
+Patch2: %{name}-fribidi.patch
+Patch3: %{name}-cloudproviders.patch
URL: http://www.gtk.org/
BuildRequires: at-spi2-atk-devel >= 2.6.0
BuildRequires: atk-devel >= 1:2.16.0
@@ -290,6 +291,7 @@ Moduł GTK+ do drukowania przez PAPI.
%patch1 -p1
%endif
%patch2 -p1
+%patch3 -p1
# for packaging clean examples
# TODO: add am patch to do it like demos/gtk-demo via some configurable dir
diff --git a/gtk+3-cloudproviders.patch b/gtk+3-cloudproviders.patch
index d2dd5da..365bef3 100644
--- a/gtk+3-cloudproviders.patch
+++ b/gtk+3-cloudproviders.patch
@@ -14,8 +14,8 @@ diff -urN gtk+-3.24.7.orig/configure.ac gtk+-3.24.7/configure.ac
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 fribidi >= fribidi_required_dep"
-+GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version fribidi >= fribidi_required_dep $CLOUDPROVIDER_PACKAGES"
+-GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version fribidi >= fribidi_required_version"
++GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version fribidi >= fribidi_required_version $CLOUDPROVIDER_PACKAGES"
if test "x$enable_x11_backend" = xyes -o "x$enable_wayland_backend" = xyes; then
GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
fi
diff --git a/gtk+3-fribidi.patch b/gtk+3-fribidi.patch
new file mode 100644
index 0000000..9e5ff71
--- /dev/null
+++ b/gtk+3-fribidi.patch
@@ -0,0 +1,12 @@
+diff -urN gtk+-3.24.7.orig/configure.ac gtk+-3.24.7/configure.ac
+--- gtk+-3.24.7.orig/configure.ac 2019-03-13 23:01:14.537215653 +0100
++++ gtk+-3.24.7/configure.ac 2019-03-13 23:02:04.326913648 +0100
+@@ -1411,7 +1411,7 @@
+ 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 fribidi >= fribidi_required_dep"
++GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version fribidi >= fribidi_required_version"
+ if test "x$enable_x11_backend" = xyes -o "x$enable_wayland_backend" = xyes; then
+ GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
+ fi
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gtk+3.git/commitdiff/70dc837adc4f7257ae91ea09782cbab9294db20a
More information about the pld-cvs-commit
mailing list