From ed0f5fb0a9fa26cb29cb4979c8848a6b5d0d1f8d103e559420ee97df951a9ce5 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 24 Sep 2018 07:23:09 +0000 Subject: [PATCH] Accepting request 637219 from GNOME:Next OBS-URL: https://build.opensuse.org/request/show/637219 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=329 --- baselibs.conf | 4 ++-- gtk+-3.23.3.tar.xz | 3 --- gtk+-3.24.1.tar.xz | 3 +++ gtk3-imwayland-clearing-preedit-text.patch | 19 ----------------- gtk3.changes | 24 +++++++++++++++++----- gtk3.spec | 20 +++++++----------- 6 files changed, 31 insertions(+), 42 deletions(-) delete mode 100644 gtk+-3.23.3.tar.xz create mode 100644 gtk+-3.24.1.tar.xz delete mode 100644 gtk3-imwayland-clearing-preedit-text.patch diff --git a/baselibs.conf b/baselibs.conf index 94150d1..60a3192 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -4,9 +4,9 @@ gtk3-devel gtk3-tools +/usr/bin/gtk-query-immodules-3.0(-64)? post "%if "%_lib" == "lib64"" - post "if [ $1 == 1 ]; then test -d %{_libdir}/gtk-3.0/3.0.0; if test $? -eq 0; then %{_bindir}/gtk-query-immodules-3.0-64 --update-cache; fi; fi" + post "if [ $1 == 1 ]; then test -d %{_libdir}/gtk-3.0/3.0.0 && %{_bindir}/gtk-query-immodules-3.0-64 --update-cache; fi" post "%else" - post "if [ $1 == 1 ]; then test -d %{_libdir}/gtk-3.0/3.0.0; if test $? -eq 0; then %{_bindir}/gtk-query-immodules-3.0 --update-cache; fi; fi" + post "if [ $1 == 1 ]; then test -d %{_libdir}/gtk-3.0/3.0.0 && %{_bindir}/gtk-query-immodules-3.0 --update-cache; fi" post "%endif" libgtk-3-0 requires "gtk3-tools-" diff --git a/gtk+-3.23.3.tar.xz b/gtk+-3.23.3.tar.xz deleted file mode 100644 index 69b2e04..0000000 --- a/gtk+-3.23.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:52ccc4f29fd883f755a5a097e04fae7c8c7ac1287fdc321f1257ee3ff60464bf -size 19231248 diff --git a/gtk+-3.24.1.tar.xz b/gtk+-3.24.1.tar.xz new file mode 100644 index 0000000..6a3a082 --- /dev/null +++ b/gtk+-3.24.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68387be307b99aadcdc653561d7a2a7f0113b93561fb18ded7075ec9ced5b02f +size 19307612 diff --git a/gtk3-imwayland-clearing-preedit-text.patch b/gtk3-imwayland-clearing-preedit-text.patch deleted file mode 100644 index 08bec79..0000000 --- a/gtk3-imwayland-clearing-preedit-text.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/modules/input/imwayland.c b/modules/input/imwayland.c -index 11d09d20077a47654a7e048ab5078c8ffe20b8f9..25144f314cc0a4f542d3588c60ba8ed7e32dd15c 100644 ---- a/modules/input/imwayland.c -+++ b/modules/input/imwayland.c -@@ -654,8 +654,11 @@ gtk_im_context_wayland_focus_out (GtkIMContext *context) - commit_state (context_wayland); - - /* after disable, incoming state changes won't take effect anyway */ -- text_input_preedit (global, global->text_input, "", 0, 0); -- text_input_preedit_apply (global); -+ if (context_wayland->current_preedit.text) -+ { -+ text_input_preedit (global, global->text_input, NULL, 0, 0); -+ text_input_preedit_apply (global); -+ } - - global->current = NULL; - } - diff --git a/gtk3.changes b/gtk3.changes index ebe04aa..ef36c08 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -3,6 +3,20 @@ Fri Sep 21 07:31:21 UTC 2018 - Jan Engelhardt - Avoid em dash summaries +------------------------------------------------------------------- +Wed Sep 19 01:04:50 UTC 2018 - luc14n0@linuxmail.org + +- Update to version 3.24.1: + + Adwaita: Improvements to headerbar styling. + + Wayland: Fix handling of preedit text. + + Windows: Implement smooth scrolling. + + Fix critical warnings on shutdown. + + Updated translations. +- Changes from version 3.24.0: + + GtkApplication can now track screensaver state. + + Updated translations. +- Drop gtk3-imwayland-clearing-preedit-text.patch: fixed upstream. + ------------------------------------------------------------------- Sun Sep 16 14:55:55 UTC 2018 - badshah400@gmail.com @@ -18,11 +32,11 @@ Wed Aug 29 16:51:05 UTC 2018 - bjorn.lie@gmail.com - focus chains in GtkContainer. - stepper sensitivity in GtkRange. + Allow picking colors under kwin. - + Bugs/issues fixed: glgo#GNOME/gtk+#404, glgo#GNOME/gtk+#770, - glgo#GNOME/gtk+#1263, glgo#GNOME/gtk+#134, glgo#GNOME/gtk+#432, - glgo#GNOME/gtk+#574, glgo#GNOME/gtk+#579, glgo#GNOME/gtk+#878, - glgo#GNOME/gtk+#844, glgo#GNOME/gtk+#2393, glgo#GNOME/gtk+#125, - glgo#GNOME/gtk+!290, glgo#GNOME/gtk+!172. + + Bugs/issues fixed: glgo#GNOME/gtk#404, glgo#GNOME/gtk#770, + glgo#GNOME/gtk#1263, glgo#GNOME/gtk#134, glgo#GNOME/gtk#432, + glgo#GNOME/gtk#574, glgo#GNOME/gtk#579, glgo#GNOME/gtk#878, + glgo#GNOME/gtk#844, glgo#GNOME/gtk#2393, glgo#GNOME/gtk#125, + glgo#GNOME/gtk!290, glgo#GNOME/gtk!172. + Updated translations. ------------------------------------------------------------------- diff --git a/gtk3.spec b/gtk3.spec index 08db228..38a28e3 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -2,7 +2,7 @@ # spec file for package gtk3 # # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2010 Dominique Leuenebrger, Amsterdam, Netherlands +# Copyright (c) 2010 Dominique Leuenberger, Amsterdam, Netherlands # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,13 +22,13 @@ %define _name gtk+ %bcond_without broadway Name: gtk3 -Version: 3.23.3 +Version: 3.24.1 Release: 0 Summary: The GTK+ toolkit library (version 3) License: LGPL-2.1-or-later Group: Development/Libraries/X11 URL: https://www.gtk.org/ -Source0: https://download.gnome.org/sources/gtk+/3.23/%{_name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/gtk+/3.24/%{_name}-%{version}.tar.xz Source1: README.SUSE Source2: settings.ini Source3: macros.gtk3 @@ -37,8 +37,6 @@ Source99: baselibs.conf Patch0: gtk3-GTK_PATH64.patch # PATCH-FIX-OPENSUSE gtk3-revert-forced-xftdpi.patch fvogt@opensuse.org -- Revert very controversal commit on GTK3, forcing DPI to 96 Patch1: gtk3-revert-forced-xftdpi.patch -# PATCH-FIX-UPSTREAM gtk3-imwayland-clearing-preedit-text.patch glgo#GNOME/gtk#1316 -- Fix regression causing imwayland preedit text to be not cleared the right way on focus out; patch taken from upstream git -Patch2: gtk3-imwayland-clearing-preedit-text.patch BuildRequires: cups-devel >= 1.2 BuildRequires: docbook-xsl-stylesheets @@ -58,8 +56,8 @@ BuildRequires: pkgconfig(colord) >= 0.1.9 BuildRequires: pkgconfig(epoxy) >= 1.4 BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.30.0 -BuildRequires: pkgconfig(gio-2.0) >= 2.49.4 -BuildRequires: pkgconfig(gio-unix-2.0) >= 2.49.4 +BuildRequires: pkgconfig(gio-2.0) >= 2.53.4 +BuildRequires: pkgconfig(gio-unix-2.0) >= 2.53.4 BuildRequires: pkgconfig(glib-2.0) >= 2.49.4 BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.39.0 @@ -370,7 +368,6 @@ cp -a %{SOURCE1} . %patch0 -p1 %endif %patch1 -p1 -%patch2 -p1 %build %configure \ @@ -384,7 +381,7 @@ cp -a %{SOURCE1} . --enable-explicit-deps=yes \ --enable-colord \ %{nil} -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install %make_install @@ -475,10 +472,7 @@ fi # gtk-query-immodules-3.0 couldn't run there. %endif if [ $1 = 1 ]; then - test -d %{_libdir}/gtk-3.0/%{gtk_binary_version} - if test $? -eq 0; then - %{_gtk_query_immodules_update_cache} - fi + test -d %{_libdir}/gtk-3.0/%{gtk_binary_version} && %{_gtk_query_immodules_update_cache} fi %if 0 # If the gtk-update-icon-cache group is in automatic mode, then this will also