Bjørn Lie 2023-04-26 10:48:26 +00:00 committed by Git OBS Bridge
parent b262476f69
commit eb69fbffa6
3 changed files with 12 additions and 13 deletions

View File

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

View File

@ -2,7 +2,9 @@
Wed Apr 26 09:50:24 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com> 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 - 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> Wed Apr 26 09:03:28 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>

View File

@ -24,8 +24,8 @@ License: GPL-2.0-or-later
Group: Amusements/Games/Board/Puzzle Group: Amusements/Games/Board/Puzzle
URL: https://live.gnome.org/GnomeMahongg URL: https://live.gnome.org/GnomeMahongg
Source0: https://download.gnome.org/sources/gnome-mahjongg/3.38/%{name}-%{version}.tar.xz 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 # PATCH-FIX-UPSTREAM https://gitlab.gnome.org/GNOME/gnome-mahjongg/-/merge_requests/26.patch -- Fix build with meson 0.60 and newer
Patch0: https://gitlab.gnome.org/GNOME/gnome-mahjongg/-/merge_requests/26.patch Patch0: 26.patch
# PATCH-FIX-UPSTREAM fix-new-cairo-select-tile.patch -- Fix selecting a tile since cairo 1.17.8 # 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 Patch1: fix-new-cairo-select-tile.patch