Accepting request 1195177 from GNOME:Next

New try....

OBS-URL: https://build.opensuse.org/request/show/1195177
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk4?expand=0&rev=176
This commit is contained in:
Bjørn Lie 2024-08-23 17:48:34 +00:00 committed by Git OBS Bridge
parent ae87f0bde8
commit 46717eeada
9 changed files with 75 additions and 59 deletions

View File

@ -13,11 +13,11 @@ This reverts commit 802bf4199911c811938b0454a876089bafa97dba.
meson.build | 47 +++++++++++++++++++++++++++++++++--------------
1 file changed, 33 insertions(+), 14 deletions(-)
Index: gtk-4.12.1/meson.build
Index: gtk-4.15.5/meson.build
===================================================================
--- gtk-4.12.1.orig/meson.build
+++ gtk-4.12.1/meson.build
@@ -430,6 +430,9 @@ if not os_win32
--- gtk-4.15.5.orig/meson.build
+++ gtk-4.15.5/meson.build
@@ -456,6 +456,9 @@ if not os_win32
endif
endif
@ -27,7 +27,7 @@ Index: gtk-4.12.1/meson.build
cairo_backends = []
foreach backend: [ ['cairo-xlib', cairo_req, x11_enabled],
['cairo-win32', cairo_req, win32_enabled],
@@ -562,14 +565,26 @@ if x11_enabled
@@ -586,14 +589,26 @@ if x11_enabled
cdata.set('HAVE_RANDR15', xrandr15_dep.found())
endif
@ -54,7 +54,7 @@ Index: gtk-4.12.1/meson.build
# Check whether libepoxy is built with EGL support on Windows
endif
@@ -837,6 +852,7 @@ pkg_config.generate(libgtk,
@@ -878,6 +893,7 @@ pkg_config.generate(libgtk,
name: 'GTK',
description: 'GTK Graphical UI Library',
requires: gdk_packages + gsk_packages + gtk_packages,
@ -62,7 +62,7 @@ Index: gtk-4.12.1/meson.build
subdirs: ['gtk-@0@'.format(gtk_api_version)],
)
meson.override_dependency('gtk4', libgtk_dep)
@@ -859,10 +875,10 @@ if os_unix
@@ -912,10 +928,10 @@ if os_unix
unescaped_variables: common_pc_variables,
name: 'GTK',
description: 'GTK Unix print support',

View File

@ -1,37 +0,0 @@
From 3d802177be2f2e5fb95fdb988108dd1b048c5579 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 31 Jul 2024 07:29:37 -0400
Subject: [PATCH] wayland: No viewporter for cursors
The outlook for mutter supporting this in GNOME 47 are cloudy,
so lets flip the switch back. You can still set
USE_POINTER_VIEWPORT in the environment to try this code.
---
gdk/wayland/gdkdevice-wayland.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c
index 1070d7f9e1d..139c22cd39b 100644
--- a/gdk/wayland/gdkdevice-wayland.c
+++ b/gdk/wayland/gdkdevice-wayland.c
@@ -265,13 +265,13 @@ gdk_wayland_device_update_surface_cursor (GdkDevice *device)
guint next_image_index, next_image_delay;
gboolean retval = G_SOURCE_REMOVE;
GdkWaylandTabletData *tablet;
- gboolean use_viewport;
+ gboolean use_viewport = FALSE;
tablet = gdk_wayland_seat_find_tablet (seat, device);
- use_viewport = pointer->pointer_surface_viewport != NULL;
- if (g_getenv ("NO_POINTER_VIEWPORT"))
- use_viewport = FALSE;
+ if (pointer->pointer_surface_viewport &&
+ g_getenv ("USE_POINTER_VIEWPORT"))
+ use_viewport = TRUE;
if (pointer->cursor)
{
--
GitLab

View File

@ -3,11 +3,11 @@
<service name="obs_scm" mode="manual">
<param name="scm">git</param>
<param name="url">https://gitlab.gnome.org/GNOME/gtk.git</param>
<param name="revision">4.15.4</param>
<param name="revision">e3437c748a56db620702b8445d05aa95e3b0ff3e</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">(.*)\+0</param>
<param name="versionrewrite-replacement">\1</param>
<!-- <param name="changesgenerate">enable</param> -->
<param name="changesgenerate">enable</param>
</service>
<service name="tar" mode="buildtime"/>
<service name="recompress" mode="buildtime">

4
_servicedata Normal file
View File

@ -0,0 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://gitlab.gnome.org/GNOME/gtk.git</param>
<param name="changesrevision">e3437c748a56db620702b8445d05aa95e3b0ff3e</param></service></servicedata>

View File

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

3
gtk-4.15.5+115.obscpio Normal file
View File

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

View File

@ -1,4 +1,4 @@
name: gtk
version: 4.15.4
mtime: 1722358222
commit: 322bbd2376f5279cf9b08925c2c836fa777e283b
version: 4.15.5+115
mtime: 1724230649
commit: e3437c748a56db620702b8445d05aa95e3b0ff3e

View File

@ -1,7 +1,60 @@
-------------------------------------------------------------------
Wed Aug 21 13:11:18 UTC 2024 - bjorn.lie@gmail.com
- Update to version 4.15.5+115:
* gpu:
- Be more aggressive about GC'ing dead textures
- The colorstate op doesn't need a colorstates arg
* win32: Adapt to default flag changes
* docs: Remove outdated information
* gdk: Beef up gdk_parse_debug_var
* egl: Don't bind to NULL surface unless surfaceless
* wayland: Create EGL window in make_current() if necessary
* gl: Use the shared GL context when creating GL textures
* emojichooser: Resize according to screen height
* GdkWin32: Drop unused variable
* WGL:
- Report paint region when presenting (SwapBuffers)
- Report backbuffer's damage to GDK
- Search pixel format with defined swap method (opengl32)
- Search pixel format with defined swap method (arb)
* Updated translations.
-------------------------------------------------------------------
Thu Aug 15 12:05:29 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
- Rebase 0001-Revert-Meson-Simplify-pkgconfig-file-generator.patch
with quilt.
-------------------------------------------------------------------
Mon Aug 12 07:06:16 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 4.15.5:
+ GtkTextView: ADd GtkTextBufferCommitNotify
+ CSS: Propagate color state information to GSK for many
features: colors, borders, shadows, text
+ Gdk:
- Fix an fd leak in the Vulkan code
- Fix a leak of EGLSurfaces and DMA buffers
- Set the opaque region of surfaces automatically based on
their content
+ Gsk:
- Fix Emoji rendering in Vulkan
- Rework color handling to take color states into account
- Implement more powerful occlusion culling
- Minimize our use of renderpasses
+ Debugging: The inspector shows details about color states
+ Deprecations:
- gdk_draw_context_begin/end_frame
- gdk_surface_set_opaque_region
+ Build: Require gstreamer 1.24
+ Updated translations.
- Drop 0002-Revert-no-pointer-viewport.patch: Fixed upstream.
-------------------------------------------------------------------
Fri Aug 2 20:17:08 UTC 2024 - Joshua Smith <smolsheep@opensuse.org>
- Add 0002-Revert-no-pointer-viewport.patch --
- Add 0002-Revert-no-pointer-viewport.patch:
Fixes https://gitlab.gnome.org/GNOME/gtk/-/issues/6620
-------------------------------------------------------------------
@ -64,7 +117,7 @@ Tue Jul 30 19:42:09 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
-------------------------------------------------------------------
Mon Jul 1 10:45:41 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 4.15.3:
- Update to version 4.15.3 (bsc#1221052):
+ Accessibility:
- Only emit notifications when cursor positions change in
GtkText.

View File

@ -28,7 +28,7 @@
%endif
Name: gtk4
Version: 4.15.4
Version: 4.15.5+115
Release: 0
Summary: The GTK+ toolkit library (version 4)
License: LGPL-2.1-or-later
@ -46,10 +46,6 @@ Source99: gtk4-rpmlintrc
# PATCH-FIX-OPENSUSE 0001-Revert-Meson-Simplify-pkgconfig-file-generator.patch -- Revert "Meson: Simplify pkgconfig file generator"
Patch0: 0001-Revert-Meson-Simplify-pkgconfig-file-generator.patch
# https://gitlab.gnome.org/GNOME/gtk/-/issues/6620
# PATCH-FIX-UPSTREAM 0002-Revert-no-pointer-viewport.patch -- Fix the gigantic cursor issue pulled in latest version
Patch1: 0002-Revert-no-pointer-viewport.patch
BuildRequires: cups-devel >= 2.0
# We do not support building against cups 2.3 betas
BuildConflicts: (cups-devel > 2.3 with cups-devel < 2.3.0)