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

Accepting request 538068 from GNOME:Factory

Browse Source 
- Update to version 3.22.25:
  + The HighContrast theme has received numerous improvements.
  + Middle-click on scrollbars jumps to the position again.
  + Wayland:
    - Terminal sizing problems are fixed.
    - The Wayland backend now implemented the KDE server-side
      decorations protocol.
  + X11: Problems with menus on several X servers are fixed.
  + Bugs fixed: bgo#701296, bgo#728452, bgo#738387, bgo#763517,
    bgo#769877, bgo#769879, bgo#771279, bgo#775217, bgo#776793,
    bgo#777072, bgo#778811, bgo#778930, bgo#780101, bgo#781909,
    bgo#782396, bgo#783995, bgo#784314, bgo#784509, bgo#786220,
    bgo#786794, bgo#787274, bgo#787669, bgo#787866, bgo#788053,
    bgo#788458, bgo#788496, bgo#788505, bgo#788516, bgo#788573,
    bgo#788574, bgo#788575, bgo#788577, bgo#788580, bgo#788614,
    bgo#788841, bgo#788905, bgo#789141, bgo#789149, bgo#789327,
    bgo#789357.
  + Updated translations.
- Drop gtk3-silence-log-spew-blank-cursors.patch: Fixed upstream.
- Add gtk3-wayland-distribute-server-decoration-xml.patch: Builds
  that include wayland fail unless
  gtk/wayland/protocol/server-decoration.xml is included in
  tarballs (bgo#789630). Patch touches Makefile.am, uncomment
  BuildRequires: gnome-common and ./autogen.sh before configure. (forwarded request 537877 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/538068
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtk3?expand=0&rev=120
This commit is contained in:
Dominique Leuenberger 2017-11-03 18:05:38 +00:00 committed by Git OBS Bridge
commit 274992264a
6 changed files with 165 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk+-3.22.24.tar.xz
View File

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

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

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

54
gtk3-silence-log-spew-blank-cursors.patch
View File

@ -1,54 +0,0 @@
From 56714ffa0d61512bc249b481fc43e0bc118f47d7 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 12 Apr 2017 13:56:49 -0400
Subject: [PATCH] wayland: Don't spew warnings for blank cursors
We were unnecessarily spewing warnings when blank cursors
were getting a new scale set. Standardize on "none" as the
name for blank cursors, and avoid the warning.
https://bugzilla.gnome.org/show_bug.cgi?id=775217
---
gdk/wayland/gdkcursor-wayland.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/gdk/wayland/gdkcursor-wayland.c b/gdk/wayland/gdkcursor-wayland.c
index ab50755873..bffeff8884 100644
--- a/gdk/wayland/gdkcursor-wayland.c
+++ b/gdk/wayland/gdkcursor-wayland.c
@@ -308,6 +308,10 @@ _gdk_wayland_cursor_set_scale (GdkCursor *cursor,
wayland_cursor->scale = scale;
+ /* Blank cursor case */
+ if (g_str_equal (wayland_cursor->name, "none"))
+ return;
+
_gdk_wayland_cursor_update (display_wayland, wayland_cursor);
}
@@ -345,12 +349,18 @@ _gdk_wayland_display_get_cursor_for_name_with_scale (GdkDisplay *display,
"cursor-type", GDK_CURSOR_IS_PIXMAP,
"display", display,
NULL);
- private->name = g_strdup (name);
- private->scale = scale;
/* Blank cursor case */
if (!name || g_str_equal (name, "none") || g_str_equal (name, "blank_cursor"))
- return GDK_CURSOR (private);
+ {
+ private->name = g_strdup ("none");
+ private->scale = scale;
+
+ return GDK_CURSOR (private);
+ }
+
+ private->name = g_strdup (name);
+ private->scale = scale;
if (!_gdk_wayland_cursor_update (display_wayland, private))
{
--
2.12.2

126
gtk3-wayland-distribute-server-decoration-xml.patch Normal file
View File

@ -0,0 +1,126 @@
From 72a45366e23596a5b8d68d3b2eb072d56b9423bd Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sun, 29 Oct 2017 17:50:13 +0000
Subject: wayland: Distribute protocol/server-decoration.xml in tarballs
Otherwise, builds that include the Wayland backend fail.
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=789630
Signed-off-by: Simon McVittie <smcv@debian.org>
Reviewed-by: Emmanuele Bassi <ebassi@gnome.org>
---
gdk/wayland/Makefile.am | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Index: gtk+-3.22.25/gdk/wayland/Makefile.am
===================================================================
--- gtk+-3.22.25.orig/gdk/wayland/Makefile.am
+++ gtk+-3.22.25/gdk/wayland/Makefile.am
@@ -104,6 +104,7 @@ endef
EXTRA_DIST += \
protocol/gtk-primary-selection.xml \
- protocol/gtk-shell.xml
+ protocol/gtk-shell.xml \
+ protocol/server-decoration.xml
-include $(top_srcdir)/git.mk
Index: gtk+-3.22.25/gdk/wayland/protocol/server-decoration.xml
===================================================================
--- /dev/null
+++ gtk+-3.22.25/gdk/wayland/protocol/server-decoration.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<protocol name="server_decoration">
+ <copyright><![CDATA[
+ Copyright (C) 2015 Martin Gräßlin
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation, either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ ]]></copyright>
+ <interface name="org_kde_kwin_server_decoration_manager" version="1">
+ <description summary="Server side window decoration manager">
+ This interface allows to coordinate whether the server should create
+ a server-side window decoration around a wl_surface representing a
+ shell surface (wl_shell_surface or similar). By announcing support
+ for this interface the server indicates that it supports server
+ side decorations.
+ </description>
+ <request name="create">
+ <description summary="Create a server-side decoration object for a given surface">
+ When a client creates a server-side decoration object it indicates
+ that it supports the protocol. The client is supposed to tell the
+ server whether it wants server-side decorations or will provide
+ client-side decorations.
+
+ If the client does not create a server-side decoration object for
+ a surface the server interprets this as lack of support for this
+ protocol and considers it as client-side decorated. Nevertheless a
+ client-side decorated surface should use this protocol to indicate
+ to the server that it does not want a server-side deco.
+ </description>
+ <arg name="id" type="new_id" interface="org_kde_kwin_server_decoration"/>
+ <arg name="surface" type="object" interface="wl_surface"/>
+ </request>
+ <enum name="mode">
+ <description summary="Possible values to use in request_mode and the event mode."/>
+ <entry name="None" value="0" summary="Undecorated: The surface is not decorated at all, neither server nor client-side. An example is a popup surface which should not be decorated."/>
+ <entry name="Client" value="1" summary="Client-side decoration: The decoration is part of the surface and the client."/>
+ <entry name="Server" value="2" summary="Server-side decoration: The server embeds the surface into a decoration frame."/>
+ </enum>
+ <event name="default_mode">
+ <description summary="The default mode used on the server">
+ This event is emitted directly after binding the interface. It contains
+ the default mode for the decoration. When a new server decoration object
+ is created this new object will be in the default mode until the first
+ request_mode is requested.
+
+ The server may change the default mode at any time.
+ </description>
+ <arg name="mode" type="uint" summary="The default decoration mode applied to newly created server decorations."/>
+ </event>
+ </interface>
+ <interface name="org_kde_kwin_server_decoration" version="1">
+ <request name="release" type="destructor">
+ <description summary="release the server decoration object"/>
+ </request>
+ <enum name="mode">
+ <description summary="Possible values to use in request_mode and the event mode."/>
+ <entry name="None" value="0" summary="Undecorated: The surface is not decorated at all, neither server nor client-side. An example is a popup surface which should not be decorated."/>
+ <entry name="Client" value="1" summary="Client-side decoration: The decoration is part of the surface and the client."/>
+ <entry name="Server" value="2" summary="Server-side decoration: The server embeds the surface into a decoration frame."/>
+ </enum>
+ <request name="request_mode">
+ <description summary="The decoration mode the surface wants to use."/>
+ <arg name="mode" type="uint" summary="The mode this surface wants to use."/>
+ </request>
+ <event name="mode">
+ <description summary="The new decoration mode applied by the server">
+ This event is emitted directly after the decoration is created and
+ represents the base decoration policy by the server. E.g. a server
+ which wants all surfaces to be client-side decorated will send Client,
+ a server which wants server-side decoration will send Server.
+
+ The client can request a different mode through the decoration request.
+ The server will acknowledge this by another event with the same mode. So
+ even if a server prefers server-side decoration it's possible to force a
+ client-side decoration.
+
+ The server may emit this event at any time. In this case the client can
+ again request a different mode. It's the responsibility of the server to
+ prevent a feedback loop.
+ </description>
+ <arg name="mode" type="uint" summary="The decoration mode applied to the surface by the server."/>
+ </event>
+ </interface>
+</protocol>

28
gtk3.changes
View File

@ -1,3 +1,31 @@
-------------------------------------------------------------------
Tue Oct 31 07:27:50 UTC 2017 - badshah400@gmail.com
- Update to version 3.22.25:
+ The HighContrast theme has received numerous improvements.
+ Middle-click on scrollbars jumps to the position again.
+ Wayland:
- Terminal sizing problems are fixed.
- The Wayland backend now implemented the KDE server-side
decorations protocol.
+ X11: Problems with menus on several X servers are fixed.
+ Bugs fixed: bgo#701296, bgo#728452, bgo#738387, bgo#763517,
bgo#769877, bgo#769879, bgo#771279, bgo#775217, bgo#776793,
bgo#777072, bgo#778811, bgo#778930, bgo#780101, bgo#781909,
bgo#782396, bgo#783995, bgo#784314, bgo#784509, bgo#786220,
bgo#786794, bgo#787274, bgo#787669, bgo#787866, bgo#788053,
bgo#788458, bgo#788496, bgo#788505, bgo#788516, bgo#788573,
bgo#788574, bgo#788575, bgo#788577, bgo#788580, bgo#788614,
bgo#788841, bgo#788905, bgo#789141, bgo#789149, bgo#789327,
bgo#789357.
+ Updated translations.
- Drop gtk3-silence-log-spew-blank-cursors.patch: Fixed upstream.
- Add gtk3-wayland-distribute-server-decoration-xml.patch: Builds
that include wayland fail unless
gtk/wayland/protocol/server-decoration.xml is included in
tarballs (bgo#789630). Patch touches Makefile.am, uncomment
BuildRequires: gnome-common and ./autogen.sh before configure.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 11 04:18:16 UTC 2017 - yfjiang@suse.com Mon Oct 11 04:18:16 UTC 2017 - yfjiang@suse.com

16
gtk3.spec
View File

@ -29,7 +29,7 @@
Name: gtk3 Name: gtk3
%define _name gtk+ %define _name gtk+
Version: 3.22.24 Version: 3.22.25
Release: 0 Release: 0
Summary: The GTK+ toolkit library (version 3) Summary: The GTK+ toolkit library (version 3)
License: LGPL-2.1+ License: LGPL-2.1+
@ -44,18 +44,18 @@ Source99: baselibs.conf
Patch0: gtk3-GTK_PATH64.patch Patch0: gtk3-GTK_PATH64.patch
# PATCH-NEEDS-REBASE gtk3-path-local.patch Search in /usr/local/%{_lib} by default. bnc369696 bgo534474 -- Was PATCH-FIX-OPENSUSE # PATCH-NEEDS-REBASE gtk3-path-local.patch Search in /usr/local/%{_lib} by default. bnc369696 bgo534474 -- Was PATCH-FIX-OPENSUSE
Patch1: gtk3-path-local.patch Patch1: gtk3-path-local.patch
# PATCH-FIX-UPSTREAM gtk3-silence-log-spew-blank-cursors.patch bgo#775217 zaitor@opensuse.org -- wayland: Don't spew warnings for blank cursors
Patch2: gtk3-silence-log-spew-blank-cursors.patch
# PATCH-FIX-OPENSUSE gtk3-restore-filechooser-click-behavior.patch bgo#758065 bsc#1057471 yfjiang@suse.com -- revert upstream commit#fb0a13b to restore the single click behavior # PATCH-FIX-OPENSUSE gtk3-restore-filechooser-click-behavior.patch bgo#758065 bsc#1057471 yfjiang@suse.com -- revert upstream commit#fb0a13b to restore the single click behavior
Patch3: gtk3-restore-filechooser-click-behavior.patch Patch3: gtk3-restore-filechooser-click-behavior.patch
# PATCH-FIX-OPENSUSE revert-forced-xftdpi.patch fvogt@opensuse.org -- Revert very controversal commit on GTK3, forcing DPI to 96 # PATCH-FIX-OPENSUSE revert-forced-xftdpi.patch fvogt@opensuse.org -- Revert very controversal commit on GTK3, forcing DPI to 96
Patch4: gtk3-revert-forced-xftdpi.patch Patch4: gtk3-revert-forced-xftdpi.patch
# PATCH-FIX-UPSTREAM gtk3-wayland-distribute-server-decoration-xml.patch bgo#789630 badshah400@gmail.com -- Builds that include wayland fail unless gtk/wayland/protocol/server-decoration.xml is included in tarballs
Patch5: gtk3-wayland-distribute-server-decoration-xml.patch
BuildRequires: cups-devel >= 1.2 BuildRequires: cups-devel >= 1.2
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gettext-tools-mini >= 0.19.7 BuildRequires: gettext-tools-mini >= 0.19.7
# Needed for patch1 - disabled since patch is disabled... # Needed for patch1 and patch5
# BuildRequires: gnome-common BuildRequires: gnome-common
BuildRequires: hicolor-icon-theme BuildRequires: hicolor-icon-theme
%if !0%{?is_opensuse} %if !0%{?is_opensuse}
BuildRequires: translation-update-upstream BuildRequires: translation-update-upstream
@ -369,14 +369,14 @@ cp -a %{S:1} .
%endif %endif
# Patch disabled, needs rebase. # Patch disabled, needs rebase.
#patch1 -p0 #patch1 -p0
%patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1
%build %build
# Disabled since patch 1 is in need of rebase # Disabled since patch 1 is in need of rebase
# Needed for patch1 # Needed for patch1 and patch5
#NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh
%configure \ %configure \
--disable-static \ --disable-static \
--enable-man \ --enable-man \