Bah...

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-mahjongg?expand=0&rev=61

26.patch

@@ -11,19 +11,19 @@ data/meson.build:45:0: ERROR: Function does not take positional arguments.
  data/meson.build | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
-diff --git a/data/meson.build b/data/meson.build
-index 8740503..edb8583 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -21,7 +21,6 @@ install_data ('edu_kang_xi.png', install_dir: join_paths (pkgdatadir, 'themes'))
- install_data ('maya.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 (
 -  'desktop-file',
    input:       'org.gnome.Mahjongg.desktop.in',
    output:      'org.gnome.Mahjongg.desktop',
    install:     true,
-@@ -41,7 +40,7 @@ if desktop_file_validate.found()
+@@ -42,7 +41,7 @@ if desktop_file_validate.found()
    )
  endif
  
@@ -32,6 +32,3 @@ index 8740503..edb8583 100644
                   input: 'org.gnome.Mahjongg.appdata.xml.in',
                   output: 'org.gnome.Mahjongg.appdata.xml',
                   install: true,
--- 
-GitLab
-

gnome-mahjongg.changes

@@ -2,7 +2,9 @@
 Wed Apr 26 09:50:24 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
 
 - Redownload 26.patch from upstream, changed since it is now
-  checked-in upstream, and we added pre check-in.
+  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 <manfred.h@gmx.net>

gnome-mahjongg.spec

@@ -24,8 +24,8 @@ 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 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