[PR PATCH] gnome-mahjongg: update to 3.40.0

[PR PATCH] gnome-mahjongg: update to 3.40.0

[chrysos349]

[-- Attachment #1: Type: text/plain, Size: 593 bytes --]

There is a new pull request by chrysos349 against master on the void-packages repository

https://github.com/chrysos349/void-packages gnome-mahjongg
https://github.com/void-linux/void-packages/pull/44355

gnome-mahjongg: update to 3.40.0
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64

A patch file from https://github.com/void-linux/void-packages/pull/44355.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-mahjongg-44355.patch --]
[-- Type: text/x-diff, Size: 3190 bytes --]

From 245d732a16f3bfe764d198b0c0ab0be7d9706c7f Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Sun, 11 Jun 2023 00:16:57 +0300
Subject: [PATCH] gnome-mahjongg: update to 3.40.0

---
 .../gnome-mahjongg/patches/meson-0.61.patch   | 37 -------------------
 srcpkgs/gnome-mahjongg/template               | 11 +++---
 2 files changed, 6 insertions(+), 42 deletions(-)
 delete mode 100644 srcpkgs/gnome-mahjongg/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch b/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch
deleted file mode 100644
index 2a17ad713752..000000000000
--- a/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From a2037b0747163601a5d5b57856d037eecf3a4db7 Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-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(-)
-
-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'))
- 
- 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()
-   )
- 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,
--- 
-GitLab
-
diff --git a/srcpkgs/gnome-mahjongg/template b/srcpkgs/gnome-mahjongg/template
index 9cf1ef18d634..8f4d5992c527 100644
--- a/srcpkgs/gnome-mahjongg/template
+++ b/srcpkgs/gnome-mahjongg/template
@@ -1,14 +1,15 @@
 # Template file for 'gnome-mahjongg'
 pkgname=gnome-mahjongg
-version=3.38.3
+version=3.40.0
 revision=1
 build_style=meson
-configure_args="-Dcompile-schemas=disabled -Dupdate-icon-cache=disabled"
-hostmakedepends="gettext glib-devel itstool pkg-config vala"
-makedepends="librsvg-devel gtk+3-devel libglib-devel"
+hostmakedepends="gettext glib-devel itstool pkg-config vala
+ gtk-update-icon-cache"
+makedepends="librsvg-devel libadwaita-devel"
 short_desc="GNOME Mahjongg solitaire game"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Mahjongg"
+changelog="https://gitlab.gnome.org/GNOME/gnome-mahjongg/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d2b1e47d85852048b35d89e3ddaba1daeb06aaf97acfb67a501ce664ff509190
+checksum=5a8ac86d763c5660dd9025f7bc08310b922346fa7e2df7b648c9894dae3f183f

Re: [PR REVIEW] gnome-mahjongg: update to 3.40.0

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 169 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/44355#discussion_r1225908817

Comment:
why remove this?

Re: [PR REVIEW] gnome-mahjongg: update to 3.40.0

[chrysos349]

[-- Attachment #1: Type: text/plain, Size: 275 bytes --]

New review comment by chrysos349 on void-packages repository

https://github.com/void-linux/void-packages/pull/44355#discussion_r1225925722

Comment:
@classabbyamp  because of the error
```
meson.build:1:0: ERROR: Unknown options: "compile-schemas, update-icon-cache"
```

Re: [PR PATCH] [Merged]: gnome-mahjongg: update to 3.40.0

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 429 bytes --]

There's a merged pull request on the void-packages repository

gnome-mahjongg: update to 3.40.0
https://github.com/void-linux/void-packages/pull/44355

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64