pool/gtk3
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 637219 from GNOME:Next

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/637219
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=329
This commit is contained in:
Dominique Leuenberger 2018-09-24 07:23:09 +00:00 committed by Git OBS Bridge
parent 6d3e81cabc
commit ed0f5fb0a9
6 changed files with 31 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
baselibs.conf
View File

@ -4,9 +4,9 @@ gtk3-devel
gtk3-tools gtk3-tools
+/usr/bin/gtk-query-immodules-3.0(-64)? +/usr/bin/gtk-query-immodules-3.0(-64)?
post "%if "%_lib" == "lib64"" post "%if "%_lib" == "lib64""
post "if [ $1 == 1 ]; then test -d <prefix>%{_libdir}/gtk-3.0/3.0.0; if test $? -eq 0; then <prefix>%{_bindir}/gtk-query-immodules-3.0-64 --update-cache; fi; fi" post "if [ $1 == 1 ]; then test -d <prefix>%{_libdir}/gtk-3.0/3.0.0 && <prefix>%{_bindir}/gtk-query-immodules-3.0-64 --update-cache; fi"
post "%else" post "%else"
post "if [ $1 == 1 ]; then test -d <prefix>%{_libdir}/gtk-3.0/3.0.0; if test $? -eq 0; then <prefix>%{_bindir}/gtk-query-immodules-3.0 --update-cache; fi; fi" post "if [ $1 == 1 ]; then test -d <prefix>%{_libdir}/gtk-3.0/3.0.0 && <prefix>%{_bindir}/gtk-query-immodules-3.0 --update-cache; fi"
post "%endif" post "%endif"
libgtk-3-0 libgtk-3-0
requires "gtk3-tools-<targettype>" requires "gtk3-tools-<targettype>"

3
gtk+-3.23.3.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:52ccc4f29fd883f755a5a097e04fae7c8c7ac1287fdc321f1257ee3ff60464bf
size 19231248

3
gtk+-3.24.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:68387be307b99aadcdc653561d7a2a7f0113b93561fb18ded7075ec9ced5b02f
size 19307612

19
gtk3-imwayland-clearing-preedit-text.patch
View File

@ -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;
}

24
gtk3.changes
View File

@ -3,6 +3,20 @@ Fri Sep 21 07:31:21 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
- Avoid em dash summaries - 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 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. - focus chains in GtkContainer.
- stepper sensitivity in GtkRange. - stepper sensitivity in GtkRange.
+ Allow picking colors under kwin. + Allow picking colors under kwin.
+ Bugs/issues fixed: glgo#GNOME/gtk+#404, glgo#GNOME/gtk+#770, + 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#1263, glgo#GNOME/gtk#134, glgo#GNOME/gtk#432,
glgo#GNOME/gtk+#574, glgo#GNOME/gtk+#579, glgo#GNOME/gtk+#878, 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#844, glgo#GNOME/gtk#2393, glgo#GNOME/gtk#125,
glgo#GNOME/gtk+!290, glgo#GNOME/gtk+!172. glgo#GNOME/gtk!290, glgo#GNOME/gtk!172.
+ Updated translations. + Updated translations.
------------------------------------------------------------------- -------------------------------------------------------------------

20
gtk3.spec
View File

@ -2,7 +2,7 @@
# spec file for package gtk3 # spec file for package gtk3
# #
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -22,13 +22,13 @@
%define _name gtk+ %define _name gtk+
%bcond_without broadway %bcond_without broadway
Name: gtk3 Name: gtk3
Version: 3.23.3 Version: 3.24.1
Release: 0 Release: 0
Summary: The GTK+ toolkit library (version 3) Summary: The GTK+ toolkit library (version 3)
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
Group: Development/Libraries/X11 Group: Development/Libraries/X11
URL: https://www.gtk.org/ 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 Source1: README.SUSE
Source2: settings.ini Source2: settings.ini
Source3: macros.gtk3 Source3: macros.gtk3
@ -37,8 +37,6 @@ Source99: baselibs.conf
Patch0: gtk3-GTK_PATH64.patch 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 # 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 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: cups-devel >= 1.2
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
@ -58,8 +56,8 @@ BuildRequires: pkgconfig(colord) >= 0.1.9
BuildRequires: pkgconfig(epoxy) >= 1.4 BuildRequires: pkgconfig(epoxy) >= 1.4
BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.30.0 BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.30.0
BuildRequires: pkgconfig(gio-2.0) >= 2.49.4 BuildRequires: pkgconfig(gio-2.0) >= 2.53.4
BuildRequires: pkgconfig(gio-unix-2.0) >= 2.49.4 BuildRequires: pkgconfig(gio-unix-2.0) >= 2.53.4
BuildRequires: pkgconfig(glib-2.0) >= 2.49.4 BuildRequires: pkgconfig(glib-2.0) >= 2.49.4
BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gmodule-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.39.0 BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.39.0
@ -370,7 +368,6 @@ cp -a %{SOURCE1} .
%patch0 -p1 %patch0 -p1
%endif %endif
%patch1 -p1 %patch1 -p1
%patch2 -p1
%build %build
%configure \ %configure \
@ -384,7 +381,7 @@ cp -a %{SOURCE1} .
--enable-explicit-deps=yes \ --enable-explicit-deps=yes \
--enable-colord \ --enable-colord \
%{nil} %{nil}
make %{?_smp_mflags} make %{?_smp_mflags} V=1
%install %install
%make_install %make_install
@ -475,10 +472,7 @@ fi
# gtk-query-immodules-3.0 couldn't run there. # gtk-query-immodules-3.0 couldn't run there.
%endif %endif
if [ $1 = 1 ]; then if [ $1 = 1 ]; then
test -d %{_libdir}/gtk-3.0/%{gtk_binary_version} test -d %{_libdir}/gtk-3.0/%{gtk_binary_version} && %{_gtk_query_immodules_update_cache}
if test $? -eq 0; then
%{_gtk_query_immodules_update_cache}
fi
fi fi
%if 0 %if 0
# If the gtk-update-icon-cache group is in automatic mode, then this will also # If the gtk-update-icon-cache group is in automatic mode, then this will also