diff --git a/26.patch b/26.patch deleted file mode 100644 index 0d28de2..0000000 --- a/26.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a2037b0747163601a5d5b57856d037eecf3a4db7 Mon Sep 17 00:00:00 2001 -From: Jan Beich -Date: Mon, 24 Jan 2022 11:22:48 +0000 -Subject: [PATCH] meson: drop unused argument for i18n.merge_file() - -Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. - -data/meson.build:24:0: ERROR: Function does not take positional arguments. -data/meson.build:45:0: ERROR: Function does not take positional arguments. ---- - data/meson.build | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -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 ( -- 'desktop-file', - input: 'org.gnome.Mahjongg.desktop.in', - output: 'org.gnome.Mahjongg.desktop', - install: true, -@@ -42,7 +41,7 @@ if desktop_file_validate.found() - ) - endif - --appdata_file = i18n.merge_file ('appdata-file', -+appdata_file = i18n.merge_file ( - input: 'org.gnome.Mahjongg.appdata.xml.in', - output: 'org.gnome.Mahjongg.appdata.xml', - install: true, diff --git a/fix-new-cairo-select-tile.patch b/fix-new-cairo-select-tile.patch deleted file mode 100644 index 834c2e6..0000000 --- a/fix-new-cairo-select-tile.patch +++ /dev/null @@ -1,35 +0,0 @@ -From be2e46cc68a865669e462449dd5331016a49e36c Mon Sep 17 00:00:00 2001 -From: Chris Mayo -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); diff --git a/gnome-mahjongg-3.38.3.tar.xz b/gnome-mahjongg-3.38.3.tar.xz deleted file mode 100644 index 8c742ba..0000000 --- a/gnome-mahjongg-3.38.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d2b1e47d85852048b35d89e3ddaba1daeb06aaf97acfb67a501ce664ff509190 -size 3061860 diff --git a/gnome-mahjongg-3.40.0.tar.xz b/gnome-mahjongg-3.40.0.tar.xz new file mode 100644 index 0000000..dcab7e8 --- /dev/null +++ b/gnome-mahjongg-3.40.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a8ac86d763c5660dd9025f7bc08310b922346fa7e2df7b648c9894dae3f183f +size 3156788 diff --git a/gnome-mahjongg.changes b/gnome-mahjongg.changes index 545dda8..628666a 100644 --- a/gnome-mahjongg.changes +++ b/gnome-mahjongg.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Wed May 31 16:28:49 UTC 2023 - Bjørn Lie + +- Update to version 3.40.0: + + Port to GTK4 and libadwaita + + Build fixes + + Fix hints + + Translate scores dialog + + help-overlay.ui: Remove ctrl+f1 shortcut + + Updated translations. +- Drop patches fixed upstream: + + 26.patch + + fix-new-cairo-select-tile.patch +- Changes in BuildRequires following upstreams changes: + + Dropped: hicolor-icon-theme, yelp-tools and + pkgconfig(gtk+-3.0). + + Added: appstream-glib, desktop-file-utils, itstool, + pkgconfig(gtk4) and pkgconfig(libadwaita-1). +- Stop passing compile-schemas and update-icon-cache to meson, no + longer needed, nor recognized. +- Add check section and run meson_test macro during build, validate + appdata and desktop files. + ------------------------------------------------------------------- Wed Apr 26 09:50:24 UTC 2023 - Bjørn Lie diff --git a/gnome-mahjongg.spec b/gnome-mahjongg.spec index c68d92f..dd408ae 100644 --- a/gnome-mahjongg.spec +++ b/gnome-mahjongg.spec @@ -17,28 +17,26 @@ Name: gnome-mahjongg -Version: 3.38.3 +Version: 3.40.0 Release: 0 Summary: Mahjong Solitaire Game for GNOME License: GPL-2.0-or-later 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 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 +Source0: https://download.gnome.org/sources/gnome-mahjongg/3.40/%{name}-%{version}.tar.xz +BuildRequires: appstream-glib +BuildRequires: desktop-file-utils BuildRequires: fdupes -BuildRequires: hicolor-icon-theme +BuildRequires: itstool BuildRequires: meson BuildRequires: pkgconfig BuildRequires: vala >= 0.24.0 -BuildRequires: yelp-tools BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(glib-2.0) >= 2.40.0 -BuildRequires: pkgconfig(gtk+-3.0) >= 3.13.2 -BuildRequires: pkgconfig(librsvg-2.0) >= 2.32.0 +BuildRequires: pkgconfig(gtk4) +BuildRequires: pkgconfig(libadwaita-1) +BuildRequires: pkgconfig(librsvg-2.0) >= 2.46.0 # Package was renamed to gnome-mahjongg, following upstreams name change during 3.6 development. Obsoletes: mahjongg < %{version} Provides: mahjongg = %{version} @@ -54,9 +52,7 @@ corresponding tiles and taking them out of play. %autosetup -p1 %build -%meson \ - -Dcompile-schemas=disabled \ - -Dupdate-icon-cache=disabled +%meson %meson_build %install @@ -64,6 +60,9 @@ corresponding tiles and taking them out of play. %find_lang %{name} %{?no_lang_C} %fdupes %{buildroot}%{_datadir} +%check +%meson_test + %files %license COPYING %doc NEWS @@ -71,6 +70,7 @@ corresponding tiles and taking them out of play. %{_datadir}/%{name}/ %{_datadir}/metainfo/org.gnome.Mahjongg.appdata.xml %{_datadir}/applications/org.gnome.Mahjongg.desktop +%{_datadir}/dbus-1/services/org.gnome.Mahjongg.service %{_datadir}/glib-2.0/schemas/org.gnome.Mahjongg.gschema.xml %{_datadir}/help/C/%{name}/ %{_datadir}/icons/hicolor/*/apps/org.gnome.Mahjongg*