From 191902336d6562c899c8b7ab69f66d46316b322e Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 13 Jul 2015 20:23:24 -0700 Subject: some upstream backports to fix a couple of openQA issues --- gtk3.spec | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'gtk3.spec') diff --git a/gtk3.spec b/gtk3.spec index 3a28879..5c933e4 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -18,13 +18,21 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk3 Version: 3.17.4 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org #VCS: git:git://git.gnome.org/gtk+ Source: http://download.gnome.org/sources/gtk+/3.17/gtk+-%{version}.tar.xz +# These are all post-3.17.4 upstream backports, can be dropped with 3.17.5 +# First four fix https://bugzilla.gnome.org/show_bug.cgi?id=752247 +# Last one helps with https://bugzilla.redhat.com/show_bug.cgi?id=1241724 +Patch0: 0158-csstypes-expand-GtkCssChange-enum.patch +Patch1: 0159-cssselector-Report-finer-granularity-for-position-ch.patch +Patch2: 0160-csstypes-Change-NTH_CHILD-and-NTH_LAST_CHILD-change-.patch +Patch3: 0161-cssnode-Do-finer-grained-position-invalidation.patch +Patch4: 0186-Simplify-Xft-setting-fallback.patch BuildRequires: gnome-common autoconf automake intltool gettext BuildRequires: pkgconfig(atk) >= %{atk_version} @@ -163,6 +171,12 @@ the functionality of the installed %{name} package. %prep %setup -q -n gtk+-%{version} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 + %build @@ -350,6 +364,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/installed-tests %changelog +* Mon Jul 13 2015 Adam Williamson - 3.17.4-2 +- backport upstream CSS changes to fix BGO #752247 +- backport upstream font default changes to help with RHBZ #1241724 + * Wed Jun 24 2015 David King - 3.17.4-1 - Update to 3.17.4 -- cgit