Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gnome-mahjongg for openSUSE:Factory checked in at 2023-04-26 17:26:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-mahjongg (Old) and /work/SRC/openSUSE:Factory/.gnome-mahjongg.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-mahjongg" Wed Apr 26 17:26:24 2023 rev:27 rq:1082973 version:3.38.3 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-mahjongg/gnome-mahjongg.changes 2022-02-04 21:52:22.555160108 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-mahjongg.new.1533/gnome-mahjongg.changes 2023-04-26 17:26:26.346000480 +0200 @@ -1,0 +2,23 @@ +Wed Apr 26 09:50:24 UTC 2023 - Bjørn Lie <[email protected]> + +- Redownload 26.patch from upstream, changed since it is now + checked-in upstream, and we added pre check-in. However this + leads to a need for rebase, do so, and no longer link to the + patch upstream in spec. + +------------------------------------------------------------------- +Wed Apr 26 09:03:28 UTC 2023 - Manfred Hollstein <[email protected]> + +- Re-generate fix-new-cairo-select-tile.patch against the 3.38.3 + sources + +------------------------------------------------------------------- +Sun Apr 23 20:04:39 UTC 2023 - Bjørn Lie <[email protected]> + +- Add fix-new-cairo-select-tile.patch: Fix selecting a tile since + cairo 1.17.8. Cairo 1.17.8 includes a fix for out of range + coordinates which exposed a problem with the values used to + translate the context in GameView.find_tile() (boo#1209827). + https://gitlab.gnome.org/GNOME/gnome-mahjongg/-/merge_requests/35 + +------------------------------------------------------------------- New: ---- fix-new-cairo-select-tile.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-mahjongg.spec ++++++ --- /var/tmp/diff_new_pack.b9cMSF/_old 2023-04-26 17:26:28.114010795 +0200 +++ /var/tmp/diff_new_pack.b9cMSF/_new 2023-04-26 17:26:28.118010818 +0200 @@ -1,7 +1,7 @@ # # spec file for package gnome-mahjongg # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,8 +24,10 @@ Group: Amusements/Games/Board/Puzzle URL: https://live.gnome.org/GnomeMahongg Source0: https://download.gnome.org/sources/gnome-mahjongg/3.38/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM 26.patch -- Fix build with meson 0.60 and newer -Patch0: https://gitlab.gnome.org/GNOME/gnome-mahjongg/-/merge_requests/26.patch +# PATCH-FIX-UPSTREAM https://gitlab.gnome.org/GNOME/gnome-mahjongg/-/merge_requests/26.patch -- Fix build with meson 0.60 and newer +Patch0: 26.patch +# PATCH-FIX-UPSTREAM fix-new-cairo-select-tile.patch -- Fix selecting a tile since cairo 1.17.8 +Patch1: fix-new-cairo-select-tile.patch BuildRequires: fdupes BuildRequires: hicolor-icon-theme ++++++ 26.patch ++++++ --- /var/tmp/diff_new_pack.b9cMSF/_old 2023-04-26 17:26:28.134010911 +0200 +++ /var/tmp/diff_new_pack.b9cMSF/_new 2023-04-26 17:26:28.138010935 +0200 @@ -1,4 +1,4 @@ -From 7604f8c8311f1088293596e639fefafdbeb73235 Mon Sep 17 00:00:00 2001 +From a2037b0747163601a5d5b57856d037eecf3a4db7 Mon Sep 17 00:00:00 2001 From: Jan Beich <[email protected]> Date: Mon, 24 Jan 2022 11:22:48 +0000 Subject: [PATCH] meson: drop unused argument for i18n.merge_file() @@ -11,11 +11,11 @@ data/meson.build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -diff --git a/data/meson.build b/data/meson.build -index 8325c1b..063e839 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -22,7 +22,6 @@ install_data ('smooth.png', install_dir: join_paths (pkgdatadir, 'themes')) +Index: gnome-mahjongg-3.38.3/data/meson.build +=================================================================== +--- gnome-mahjongg-3.38.3.orig/data/meson.build ++++ gnome-mahjongg-3.38.3/data/meson.build +@@ -22,7 +22,6 @@ install_data ('smooth.png', install_dir: install_data ('edu_kang_xi.png', install_dir: join_paths (pkgdatadir, 'themes')) desktop_file = i18n.merge_file ( @@ -32,7 +32,4 @@ input: 'org.gnome.Mahjongg.appdata.xml.in', output: 'org.gnome.Mahjongg.appdata.xml', install: true, --- -GitLab - ++++++ fix-new-cairo-select-tile.patch ++++++ >From be2e46cc68a865669e462449dd5331016a49e36c Mon Sep 17 00:00:00 2001 From: Chris Mayo <[email protected]> Date: Tue, 18 Apr 2023 19:46:57 +0100 Subject: [PATCH] Fix selecting a tile since cairo 1.17.8 cairo 1.17.8 includes a fix for out of range coordinates [1] which exposed a problem with the values used to translate the context in GameView.find_tile(). [1] 47a21c6e3 ("Clamp path coordinates", 2022-05-15) --- src/game-view.vala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -rup a/src/game-view.vala b/src/game-view.vala --- a/src/game-view.vala 2020-11-01 10:39:32.693650200 +0100 +++ b/src/game-view.vala 2023-04-26 09:28:48.415329449 +0200 @@ -287,7 +287,7 @@ public class GameView : Gtk.DrawingArea return false; /* Get the tile under the square */ - var tile = find_tile ((uint) event.x, (uint) event.y); + var tile = find_tile (event.x, event.y); /* If not a valid tile then ignore the event */ if (tile == null || !game.tile_can_move (tile)) @@ -325,7 +325,7 @@ public class GameView : Gtk.DrawingArea return false; } - private Tile? find_tile (uint x, uint y) + private Tile? find_tile (double x, double y) { /* Render a 1x1 image where the cursor is using a different color for each tile */ var surface = new Cairo.ImageSurface (Cairo.Format.RGB24, 1, 1);
