From 2cad92e242d482e8c9c4e5725b2fc2b33e87a4a6 Mon Sep 17 00:00:00 2001
From: Tomas Popela <tpopela@redhat.com>
Date: Tue, 7 Jan 2025 12:14:00 +0100
Subject: [PATCH] Update to 46.3

Also sync with Fedora

Resolves: RHEL-38683
---
 .gitignore    |  1 +
 175.patch     | 31 -------------------------------
 snapshot.spec | 13 +++++++------
 sources       |  2 +-
 4 files changed, 9 insertions(+), 38 deletions(-)
 delete mode 100644 175.patch

diff --git a/.gitignore b/.gitignore
index b4ed2a9..ab3098d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /snapshot-45.0.tar.xz
 /snapshot-45.1.tar.xz
 /snapshot-45.2.tar.xz
+/snapshot-46.3.tar.xz
diff --git a/175.patch b/175.patch
deleted file mode 100644
index a8e8c46..0000000
--- a/175.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From cef8ed2fdcc4c2307e4aa2135767e462a6ab1fed Mon Sep 17 00:00:00 2001
-From: Yaakov Selkowitz <yselkowi@redhat.com>
-Date: Tue, 14 Nov 2023 16:34:29 -0500
-Subject: [PATCH] appstream: use developer instead of deprecated developer_name
-
-This fixes a validate-appdata test failure due to deprecation warnings
-when run with appstreamcli 1.0:
-
-https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#tag-developer
----
- data/org.gnome.Snapshot.metainfo.xml.in.in | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/data/org.gnome.Snapshot.metainfo.xml.in.in b/data/org.gnome.Snapshot.metainfo.xml.in.in
-index 2dc32d8..d99dfa6 100644
---- a/data/org.gnome.Snapshot.metainfo.xml.in.in
-+++ b/data/org.gnome.Snapshot.metainfo.xml.in.in
-@@ -98,7 +98,9 @@
-      <kudo>ModernToolkit</kudo>
-      <kudo>HiDpiIcon</kudo>
-   </kudos>
--  <developer_name>The GNOME Project</developer_name>
-+  <developer id="gnome.org">
-+    <name>The GNOME Project</name>
-+  </developer>
-   <update_contact>msandova@gnome.org</update_contact>
-   <translation type="gettext">@gettext-package@</translation>
-   <launchable type="desktop-id">@app-id@.desktop</launchable>
--- 
-GitLab
-
diff --git a/snapshot.spec b/snapshot.spec
index 3944d1b..fcfe988 100644
--- a/snapshot.spec
+++ b/snapshot.spec
@@ -9,7 +9,7 @@
 %global tarball_version %%(echo %{version} | tr '~' '.')
 
 Name:           snapshot
-Version:        45.2
+Version:        46.3
 Release:        %autorelease
 Summary:        Take pictures and videos
 
@@ -29,14 +29,11 @@ SourceLicense:  GPL-3.0-or-later
 License:        (MIT OR Apache-2.0) AND Unicode-DFS-2016 AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND GPL-3.0-or-later AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR Zlib) AND MPL-2.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT)
 # LICENSE.dependencies contains a full license breakdown
 URL:            https://gitlab.gnome.org/GNOME/snapshot
-Source:         https://download.gnome.org/sources/snapshot/45/snapshot-%{tarball_version}.tar.xz
+Source:         https://download.gnome.org/sources/snapshot/46/snapshot-%{tarball_version}.tar.xz
 
 # Downstream patch to disable linting as part of self tests
 Patch:          0001-Disable-cargo-clippy-test.patch
 
-# https://gitlab.gnome.org/GNOME/snapshot/-/merge_requests/175
-Patch:          175.patch
-
 # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 ExcludeArch:    %{ix86}
 
@@ -105,7 +102,11 @@ cd ~-
 
 %if %{with check}
 %check
-%meson_test
+%meson_test \
+%ifarch riscv64
+    --timeout-multiplier 10 \
+%endif
+    %{nil}
 
 appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/org.gnome.Snapshot.metainfo.xml
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Snapshot.desktop
diff --git a/sources b/sources
index d22a166..74b0e2c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (snapshot-45.2.tar.xz) = 821fb43fbf8c71dd669054889e6860974a3725d30509e00bf35ef908d97966bf9d55f8689e38371d331e4d629f19cd8f8cc874781b8fe57dbea6f029adcfaf26
+SHA512 (snapshot-46.3.tar.xz) = d2fc212727d90ec403f743b8fe92fbdd47d3e8bb80b79b21035be8f9f97c682011c72a7f07d2dd44c963464312c18043ebd5de1ecffb52f1dfe2b2a799690e5f