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

Accepting request 1109836 from GNOME:Next

Browse Source 
Pushing GNOME 45.rc packages

OBS-URL: https://build.opensuse.org/request/show/1109836
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk4?expand=0&rev=146
This commit is contained in:
Dominique Leuenberger 2023-09-12 08:21:13 +00:00 committed by Git OBS Bridge
parent 8eb90c412b
commit 3ec870cd0a
6 changed files with 46 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
0001-Revert-Meson-Simplify-pkgconfig-file-generator.patch
View File

@ -13,11 +13,11 @@ This reverts commit 802bf4199911c811938b0454a876089bafa97dba.
meson.build | 47 +++++++++++++++++++++++++++++++++--------------
1 file changed, 33 insertions(+), 14 deletions(-)
Index: gtk-4.10.1/meson.build
Index: gtk-4.12.1/meson.build
===================================================================
--- gtk-4.10.1.orig/meson.build
+++ gtk-4.10.1/meson.build
@@ -438,6 +438,9 @@ if not os_win32
--- gtk-4.12.1.orig/meson.build
+++ gtk-4.12.1/meson.build
@@ -430,6 +430,9 @@ if not os_win32
endif
endif
@ -27,7 +27,7 @@ Index: gtk-4.10.1/meson.build
cairo_backends = []
foreach backend: [ ['cairo-xlib', cairo_req, x11_enabled],
['cairo-win32', cairo_req, win32_enabled],
@@ -566,14 +569,26 @@ if x11_enabled
@@ -562,14 +565,26 @@ if x11_enabled
cdata.set('HAVE_RANDR15', xrandr15_dep.found())
endif
@ -54,55 +54,15 @@ Index: gtk-4.10.1/meson.build
# Check whether libepoxy is built with EGL support on Windows
endif
@@ -803,7 +818,16 @@ gsk_private_packages = [] # all already
pangoft2_pkgs = (wayland_enabled or x11_enabled) ? ['pangoft2'] : []
gtk_private_packages = pangoft2_pkgs
-pkgs = []
+gdk_extra_libs = pc_gdk_extra_libs
+gsk_extra_libs = []
+gtk_extra_libs = []
+
+gdk_extra_cflags = []
+gsk_extra_cflags = []
+gtk_extra_cflags = []
+
+pkgs = [ 'gtk4' ]
+
pkg_targets = []
display_backends = []
foreach backend: [ 'broadway', 'macos', 'wayland', 'win32', 'x11', ]
@@ -820,23 +844,18 @@ common_pc_variables = [
'gtk_host=@0@-@1@'.format(host_machine.cpu_family(), host_machine.system()), # FIXME
]
-pkg_config.generate(libgtk,
- filebase: 'gtk4',
- unescaped_variables: common_pc_variables,
- name: 'GTK',
- description: 'GTK Graphical UI Library',
- requires: gdk_packages + gsk_packages + gtk_packages,
- subdirs: ['gtk-@0@'.format(gtk_api_version)],
-)
-meson.override_dependency('gtk4', libgtk_dep)
-
foreach pkg: pkgs
pkg_config.generate(
filebase: pkg,
unescaped_variables: common_pc_variables,
name: 'GTK',
description: 'GTK Graphical UI Library',
- requires: 'gtk4',
+ requires: gdk_packages + gsk_packages + gtk_packages,
+ requires_private: gdk_private_packages + gsk_private_packages + gtk_private_packages,
+ libraries: ['-L${libdir}', '-lgtk-4'],
+ libraries_private: gdk_extra_libs + gsk_extra_libs + gtk_extra_libs,
+ subdirs: ['gtk-@0@'.format(gtk_api_version)],
+ extra_cflags: gdk_extra_cflags + gsk_extra_cflags + gtk_extra_cflags,
)
meson.override_dependency(pkg, libgtk_dep)
endforeach
@@ -847,10 +866,10 @@ if os_unix
@@ -837,6 +852,7 @@ pkg_config.generate(libgtk,
name: 'GTK',
description: 'GTK Graphical UI Library',
requires: gdk_packages + gsk_packages + gtk_packages,
+ requires_private: wayland_pkgs,
subdirs: ['gtk-@0@'.format(gtk_api_version)],
)
meson.override_dependency('gtk4', libgtk_dep)
@@ -859,10 +875,10 @@ if os_unix
unescaped_variables: common_pc_variables,
name: 'GTK',
description: 'GTK Unix print support',

69
6af9dc86.patch
View File

@ -1,69 +0,0 @@
From 4d7277f72c8f4915f237e36982ffd7dfba524b15 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Mon, 7 Aug 2023 18:00:34 +0800
Subject: [PATCH] print: Revert "Start sorting apart includes" change for
gtkprinteroptionprivate.h
The print backends needs the functions in gtkprinteroptionprivate.h to
be exported.
Fixes #6003.
---
gtk/print/gtkprinteroptionprivate.h | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/gtk/print/gtkprinteroptionprivate.h b/gtk/print/gtkprinteroptionprivate.h
index 82dd8739ba1..a7d8e8ad5b6 100644
--- a/gtk/print/gtkprinteroptionprivate.h
+++ b/gtk/print/gtkprinteroptionprivate.h
@@ -27,6 +27,7 @@
#endif
#include <glib-object.h>
+#include <gdk/gdk.h>
G_BEGIN_DECLS
@@ -87,28 +88,39 @@ struct _GtkPrinterOptionClass
void (*_gtk_reserved4) (void);
};
+GDK_AVAILABLE_IN_ALL
GType gtk_printer_option_get_type (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
GtkPrinterOption *gtk_printer_option_new (const char *name,
const char *display_text,
GtkPrinterOptionType type);
+GDK_AVAILABLE_IN_ALL
void gtk_printer_option_set (GtkPrinterOption *option,
const char *value);
+GDK_AVAILABLE_IN_ALL
void gtk_printer_option_set_has_conflict (GtkPrinterOption *option,
gboolean has_conflict);
+GDK_AVAILABLE_IN_ALL
void gtk_printer_option_clear_has_conflict (GtkPrinterOption *option);
+GDK_AVAILABLE_IN_ALL
void gtk_printer_option_set_boolean (GtkPrinterOption *option,
gboolean value);
+GDK_AVAILABLE_IN_ALL
void gtk_printer_option_allocate_choices (GtkPrinterOption *option,
int num);
+GDK_AVAILABLE_IN_ALL
void gtk_printer_option_choices_from_array (GtkPrinterOption *option,
int num_choices,
const char **choices,
const char **choices_display);
+GDK_AVAILABLE_IN_ALL
gboolean gtk_printer_option_has_choice (GtkPrinterOption *option,
const char *choice);
+GDK_AVAILABLE_IN_ALL
void gtk_printer_option_set_activates_default (GtkPrinterOption *option,
gboolean activates);
+GDK_AVAILABLE_IN_ALL
gboolean gtk_printer_option_get_activates_default (GtkPrinterOption *option);
--
GitLab

3
gtk-4.12.0.tar.xz
View File

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

3
gtk-4.12.1.tar.xz Normal file
View File

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

28
gtk4.changes
View File

@ -1,3 +1,31 @@
-------------------------------------------------------------------
Thu Aug 31 12:51:57 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
- Re-add 0001-Revert-Meson-Simplify-pkgconfig-file-generator.patch
and rebased/simplified (less correct, but sufficient for us) for
4.12.1.
-------------------------------------------------------------------
Fri Aug 25 18:14:34 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 4.12.1:
+ GtkGridView: Fix a crash when scrolling
+ GtkColumnView: Fix a refcounting issue in the new scroll_to api
+ GtkTreeView: Fix style classes for sort arrows
+ GtkEntry: Improve tracking of user changes (for undo)
+ GtkNotebook: Fix a critical when switching pages
+ GtkColor/FontDialogButton: Make these widgets activatable
+ GtkMenuButton:
- Fix problems with focus handling
- Fix problems with DND
+ Printing: Fix the cpdb backend build
+ GSK: Fix issues with color matrix nodes
+ Wayland: Fix a crash with compositors other than gnome-shell
+ Updated translations.
- Drop patches fixed upstream:
+ 0001-Revert-Meson-Simplify-pkgconfig-file-generator.patch
+ 6af9dc86.patch
-------------------------------------------------------------------
Mon Aug 21 11:17:26 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>

4
gtk4.spec
View File

@ -29,7 +29,7 @@
%endif
Name: gtk4
Version: 4.12.0
Version: 4.12.1
Release: 0
Summary: The GTK+ toolkit library (version 4)
License: LGPL-2.1-or-later
@ -46,8 +46,6 @@ Source99: gtk4-rpmlintrc
# https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4756
# 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
# PATCH-FIX-UPSTREAM 6af9dc86.patch -- print: Revert "Start sorting apart includes" change for gtkprinteroptionprivate.h
Patch1: https://gitlab.gnome.org/GNOME/gtk/-/commit/6af9dc86.patch
BuildRequires: cups-devel >= 2.0
# We do not support building against cups 2.3 betas