From a61b5347000898122ee13415b1b91d1da6b9fb4788cbc773c966e8a56cf93904 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <bjorn.lie@gmail.com>
Date: Sat, 12 Feb 2022 01:59:53 +0000
Subject: [PATCH] New stable release

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk4?expand=0&rev=83
---
 gtk-4.6.0.tar.xz                 |  3 ---
 gtk-4.6.1.tar.xz                 |  3 +++
 gtk4-make-our-stack-noexec.patch | 38 --------------------------------
 gtk4.changes                     | 30 +++++++++++++++++++++++++
 gtk4.spec                        |  5 +----
 5 files changed, 34 insertions(+), 45 deletions(-)
 delete mode 100644 gtk-4.6.0.tar.xz
 create mode 100644 gtk-4.6.1.tar.xz
 delete mode 100644 gtk4-make-our-stack-noexec.patch

diff --git a/gtk-4.6.0.tar.xz b/gtk-4.6.0.tar.xz
deleted file mode 100644
index ac2ee0a..0000000
--- a/gtk-4.6.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:782d5951fbfd585fc9ec76c09d07e28e6014c72db001fb567fff217fb96e4d8c
-size 22655868
diff --git a/gtk-4.6.1.tar.xz b/gtk-4.6.1.tar.xz
new file mode 100644
index 0000000..e72dd98
--- /dev/null
+++ b/gtk-4.6.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d85508d21cbbcd63d568a7862af5ecd63b978d7d5799cbe404c91d2389d0ec5f
+size 22882528
diff --git a/gtk4-make-our-stack-noexec.patch b/gtk4-make-our-stack-noexec.patch
deleted file mode 100644
index 729f8a5..0000000
--- a/gtk4-make-our-stack-noexec.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 46509b6dd28c58ae8dd7e2c02a82a3ccb2751e88 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Tue, 4 Jan 2022 07:51:56 -0500
-Subject: [PATCH] Make our stack noexec
-
-The change to use ld and objcopy for resources
-had some side-effects: it leaked a few symbols
-and made our stack executable. We don't want that.
-
-Use -z nonexecstack and --strip-all to avoid this.
-
-Fixes: #4598
----
- gtk/meson.build | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gtk/meson.build b/gtk/meson.build
-index 91aefe1b17..6ce2c18320 100644
---- a/gtk/meson.build
-+++ b/gtk/meson.build
-@@ -927,6 +927,7 @@ if not meson.is_cross_build() and build_machine.system() == 'linux' and objcopy.
-       input : gtk_gresource,
-       output : 'gtkresources_blob.o',
-       command : [ld,
-+                 '-z', 'noexecstack',
-                  '-r',
-                  '-b','binary',
-                  '@INPUT@',
-@@ -937,6 +938,7 @@ if not meson.is_cross_build() and build_machine.system() == 'linux' and objcopy.
-     input : gtk_resources_binary,
-     output : 'gtkresources_blob2.o',
-     command : [objcopy,
-+                 '--strip-all',
-                  '--add-symbol','_gtk_resource_data=.data:0',
-                  '@INPUT@',
-                  '@OUTPUT@'])
--- 
-GitLab
diff --git a/gtk4.changes b/gtk4.changes
index c9ce098..8190a24 100644
--- a/gtk4.changes
+++ b/gtk4.changes
@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Sat Feb 12 01:55:04 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 4.6.1:
+  + GtkFontChooser:
+    - Stop using PangoFc api
+    - Fix a crash
+    - Use new HarfBuzz api
+  + GtkMenuButton: Update accessible description
+  + GtkTextView: Fix intra-widget dnd
+  + Printing: Fix an fd leak
+  + Input:
+    - Make sure input methods get focus-in events
+    - Always flush events to avoid scroll event pileup
+    - Support hold events
+    - Update keysyms from libxkbcommon
+  + Theme: Improve text selection legibility
+  + Introspection: Add missing nullable annotations everywhere
+  + Build:
+    - Make stack noexec again
+    - Avoid symbol leaks
+    - Drop unneeded script data
+  + Wayland:
+    - Fix support for the new high-contrast setting
+    - Avoid redundant scale changes
+    - Fix DND hotspot handling
+    - Don't always restore the saved size when floating
+  + Updated translations.
+- Drop gtk4-make-our-stack-noexec.patch: Fixed upstream.
+
 -------------------------------------------------------------------
 Fri Jan  7 08:26:33 UTC 2022 - Teoh Han Hui <teohhanhui@gmail.com>
 
diff --git a/gtk4.spec b/gtk4.spec
index bb7991b..7174d5f 100644
--- a/gtk4.spec
+++ b/gtk4.spec
@@ -22,7 +22,7 @@
 %define _name gtk
 
 Name:           gtk4
-Version:        4.6.0
+Version:        4.6.1
 Release:        0
 Summary:        The GTK+ toolkit library (version 4)
 License:        LGPL-2.1-or-later
@@ -34,9 +34,6 @@ Source2:        settings.ini
 Source3:        macros.gtk4
 Source99:       gtk4-rpmlintrc
 
-# PATCH-FIX-UPSTREAM  gtk4-make-our-stack-noexec.patch glgo#GNOME/gtk!4330 teohhanhui@gmail.com -- Make our stack noexec
-Patch0:         gtk4-make-our-stack-noexec.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)