diff --git a/.gitignore b/.gitignore index f60802c..9148dc6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gtk+-3.22.10.tar.xz +SOURCES/gtk+-3.22.26.tar.xz diff --git a/.gtk3.metadata b/.gtk3.metadata index b935871..214f91e 100644 --- a/.gtk3.metadata +++ b/.gtk3.metadata @@ -1 +1 @@ -c81d94cba656e9562e99b3bd1151d5e01cbea148 SOURCES/gtk+-3.22.10.tar.xz +aa6730ac00ea2352c522c3971f63b708b971bc5f SOURCES/gtk+-3.22.26.tar.xz diff --git a/SOURCES/x11-Dont-call-XInput-API-for-core-events.patch b/SOURCES/x11-Dont-call-XInput-API-for-core-events.patch new file mode 100644 index 0000000..1305bf0 --- /dev/null +++ b/SOURCES/x11-Dont-call-XInput-API-for-core-events.patch @@ -0,0 +1,36 @@ +From 4b1c02560f0d8097bf5a11932e52fb72f3e9e94b Mon Sep 17 00:00:00 2001 +From: Benjamin Otte +Date: Mon, 12 Feb 2018 21:09:50 +0100 +Subject: [PATCH] x11: Don't call XInput API for core events + +Fixes emacs crashing with XMing. + +https://bugzilla.redhat.com/show_bug.cgi?id=1483942 +--- + gdk/x11/gdkdisplay-x11.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c +index 3e843d6..75bd34c 100644 +--- a/gdk/x11/gdkdisplay-x11.c ++++ b/gdk/x11/gdkdisplay-x11.c +@@ -3072,6 +3072,16 @@ gdk_x11_display_get_default_seat (GdkDisplay *display) + + seats = gdk_display_list_seats (display); + ++ /* Shortcut only one seat being available. ++ * This path always triggers for core events, so we can freely use XInput below. */ ++ if (g_list_length (seats) == 1) ++ { ++ GdkSeat *seat = seats->data; ++ ++ g_list_free (seats); ++ return seat; ++ } ++ + gdk_x11_display_error_trap_push (display); + result = XIGetClientPointer (GDK_DISPLAY_XDISPLAY (display), + None, &device_id); +-- +libgit2 0.26.0 + diff --git a/SPECS/gtk3.spec b/SPECS/gtk3.spec index dab10a1..e3726cc 100644 --- a/SPECS/gtk3.spec +++ b/SPECS/gtk3.spec @@ -1,8 +1,8 @@ %if 0%{?fedora} -%global with_wayland 1 %global with_broadway 1 %endif +%global with_wayland 1 %global glib2_version 2.49.4 %global pango_version 1.37.3 %global atk_version 2.15.1 @@ -10,28 +10,35 @@ %global gdk_pixbuf_version 2.30.0 %global xrandr_version 1.5.0 %global wayland_version 1.9.91 -%global wayland_protocols_version 1.7 +%global wayland_protocols_version 1.9 %global epoxy_version 1.0 %global bin_version 3.0.0 %global _changelog_trimtime %(date +%s -d "1 year ago") +# Filter provides for private modules +%global __provides_exclude_from ^%{_libdir}/gtk-3.0 + Name: gtk3 -Version: 3.22.10 -Release: 5%{?dist} -Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X +Version: 3.22.26 +Release: 3%{?dist} +Summary: GTK+ graphical user interface library License: LGPLv2+ URL: http://www.gtk.org Source0: http://download.gnome.org/sources/gtk+/3.22/gtk+-%{version}.tar.xz -source1: ja.po +Source1: ja.po # Downstream fix to filter out X-RHEL-AliasOf # https://bugzilla.redhat.com/show_bug.cgi?id=1259292 Patch18: app-chooser-fixes.patch + Patch19: 0001-gdk-Always-emit-motion-after-enter.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1483942 +Patch20: x11-Dont-call-XInput-API-for-core-events.patch + BuildRequires: pkgconfig(atk) >= %{atk_version} BuildRequires: pkgconfig(atk-bridge-2.0) BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} @@ -59,6 +66,7 @@ BuildRequires: pkgconfig(colord) BuildRequires: pkgconfig(avahi-gobject) BuildRequires: desktop-file-utils %if 0%{?with_wayland} +BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(wayland-client) >= %{wayland_version} BuildRequires: pkgconfig(wayland-cursor) >= %{wayland_version} BuildRequires: pkgconfig(wayland-egl) >= %{wayland_version} @@ -168,6 +176,7 @@ the functionality of the installed %{name} package. %setup -q -n gtk+-%{version} %patch18 -p1 %patch19 -p1 +%patch20 -p1 cp %{SOURCE1} po/ @@ -286,9 +295,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %ghost %{_libdir}/gtk-3.0/%{bin_version}/immodules.cache %{_mandir}/man1/gtk-query-immodules-3.0* %{_mandir}/man1/gtk-launch.1* -%{_datadir}/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml %{_datadir}/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml %{_datadir}/glib-2.0/schemas/org.gtk.Settings.Debug.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gtk.Settings.EmojiChooser.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml %{_datadir}/glib-2.0/schemas/org.gtk.exampleapp.gschema.xml %if 0%{?with_broadway} %{_bindir}/broadwayd @@ -358,9 +368,25 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/installed-tests %changelog -* Fri Dec 15 2017 Carlos Garnacho - 3.22.10-5 +* Tue Feb 13 2018 Ray Strode - 3.22.26-3 +- Fix emacs on Xming + Resolves: #1483942 + +* Wed Dec 06 2017 Carlos Garnacho - 3.22.26-2 - Fix touch emulated pointer motion event delivery with spice-gtk -Resolves: #1524317 +- Resolves: #1494822 + +* Tue Nov 07 2017 Kalev Lember - 3.22.26-1 +- Update to 3.22.26 +- Resolves: #1481414 + +* Wed Nov 01 2017 Kalev Lember - 3.22.25-1 +- Update to 3.22.25 +- Resolves: #1481414 + +* Thu Sep 14 2017 Olivier Fourdan - 3.22.21-1 +- Update to 3.22.21 and enable Wayland backend +Resolves: rhbz#1257171 * Tue May 30 2017 Matthias Clasen - 3.22.10-4 - Update Japanese translations