Update to 3.22.0
This commit is contained in:
parent
3dd4051455
commit
dd70072291
1
.gitignore
vendored
1
.gitignore
vendored
@ -142,3 +142,4 @@ gtk+-2.90.5.tar.bz2
|
|||||||
/gtk+-3.21.4.tar.xz
|
/gtk+-3.21.4.tar.xz
|
||||||
/gtk+-3.21.5.tar.xz
|
/gtk+-3.21.5.tar.xz
|
||||||
/gtk+-3.21.6.tar.xz
|
/gtk+-3.21.6.tar.xz
|
||||||
|
/gtk+-3.22.0.tar.xz
|
||||||
|
@ -1,50 +0,0 @@
|
|||||||
From f3920d571e5bdb2568e9169c5a732e24db9419ef Mon Sep 17 00:00:00 2001
|
|
||||||
From: Olivier Fourdan <ofourdan@redhat.com>
|
|
||||||
Date: Mon, 19 Sep 2016 16:11:54 +0200
|
|
||||||
Subject: [PATCH] gtkwindow: Update shadow size on state change
|
|
||||||
|
|
||||||
Otherwise, with CSD, we could have a discrepancy where gtk uses the
|
|
||||||
right values for the shadows whereas the gdk backend still uses the old
|
|
||||||
values, leading in some cases to invalid or negative min size being
|
|
||||||
computed (which, in Wayland, leads a protocol error).
|
|
||||||
|
|
||||||
https://bugzilla.gnome.org/show_bug.cgi?id=771561
|
|
||||||
---
|
|
||||||
gtk/gtkwindow.c | 14 ++++++++++++++
|
|
||||||
1 file changed, 14 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
|
|
||||||
index fc1e050..9808475 100644
|
|
||||||
--- a/gtk/gtkwindow.c
|
|
||||||
+++ b/gtk/gtkwindow.c
|
|
||||||
@@ -7529,6 +7529,19 @@ update_window_style_classes (GtkWindow *window)
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
+update_window_borders (GtkWindow *window)
|
|
||||||
+{
|
|
||||||
+ GtkWindowPrivate *priv = window->priv;
|
|
||||||
+ GtkBorder window_border = { 0 };
|
|
||||||
+
|
|
||||||
+ if (priv->client_decorated && priv->use_client_shadow)
|
|
||||||
+ {
|
|
||||||
+ get_shadow_width (window, &window_border);
|
|
||||||
+ update_shadow_width (window, &window_border);
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void
|
|
||||||
popover_size_allocate (GtkWidget *widget,
|
|
||||||
GtkWindowPopover *popover,
|
|
||||||
GtkWindow *window)
|
|
||||||
@@ -7798,6 +7811,7 @@ gtk_window_state_event (GtkWidget *widget,
|
|
||||||
{
|
|
||||||
update_window_style_classes (window);
|
|
||||||
update_window_buttons (window);
|
|
||||||
+ update_window_borders (window);
|
|
||||||
gtk_widget_queue_resize (widget);
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
2.9.3
|
|
||||||
|
|
15
gtk3.spec
15
gtk3.spec
@ -9,7 +9,7 @@
|
|||||||
%global cairo_version 1.14.0
|
%global cairo_version 1.14.0
|
||||||
%global gdk_pixbuf_version 2.30.0
|
%global gdk_pixbuf_version 2.30.0
|
||||||
%global wayland_version 1.9.91
|
%global wayland_version 1.9.91
|
||||||
%global wayland_protocols_version 1.6
|
%global wayland_protocols_version 1.7
|
||||||
%global epoxy_version 1.0
|
%global epoxy_version 1.0
|
||||||
|
|
||||||
%global bin_version 3.0.0
|
%global bin_version 3.0.0
|
||||||
@ -17,16 +17,13 @@
|
|||||||
%global _changelog_trimtime %(date +%s -d "1 year ago")
|
%global _changelog_trimtime %(date +%s -d "1 year ago")
|
||||||
|
|
||||||
Name: gtk3
|
Name: gtk3
|
||||||
Version: 3.21.6
|
Version: 3.22.0
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
|
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
|
||||||
|
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: http://www.gtk.org
|
URL: http://www.gtk.org
|
||||||
Source0: http://download.gnome.org/sources/gtk+/3.21/gtk+-%{version}.tar.xz
|
Source0: http://download.gnome.org/sources/gtk+/3.22/gtk+-%{version}.tar.xz
|
||||||
|
|
||||||
# https://bugzilla.gnome.org/show_bug.cgi?id=771561
|
|
||||||
Patch0: 0001-gtkwindow-Update-shadow-size-on-state-change.patch
|
|
||||||
|
|
||||||
BuildRequires: pkgconfig(atk) >= %{atk_version}
|
BuildRequires: pkgconfig(atk) >= %{atk_version}
|
||||||
BuildRequires: pkgconfig(atk-bridge-2.0)
|
BuildRequires: pkgconfig(atk-bridge-2.0)
|
||||||
@ -160,7 +157,6 @@ the functionality of the installed %{name} package.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n gtk+-%{version}
|
%setup -q -n gtk+-%{version}
|
||||||
%patch0 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
@ -334,6 +330,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
|
|||||||
%{_datadir}/installed-tests
|
%{_datadir}/installed-tests
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Sep 20 2016 Kalev Lember <klember@redhat.com> - 3.22.0-1
|
||||||
|
- Update to 3.22.0
|
||||||
|
|
||||||
* Mon Sep 19 2016 Kalev Lember <klember@redhat.com> - 3.21.6-2
|
* Mon Sep 19 2016 Kalev Lember <klember@redhat.com> - 3.21.6-2
|
||||||
- gtkwindow: Update shadow size on state change (#1377313)
|
- gtkwindow: Update shadow size on state change (#1377313)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user