Re: [PR PATCH] [Updated] newsflash: update to 3.1.3.

[oreo639 <oreo639@users.noreply.github.com>]

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

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages newsflash
https://github.com/void-linux/void-packages/pull/48907

newsflash: update to 3.1.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From b1d74f19d473fcfab784fa0a295eeed880152014 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 23 Feb 2024 23:36:54 -0800
Subject: [PATCH] newsflash: update to 3.1.3.

---
 srcpkgs/newsflash/patches/meson-0.61.patch | 20 --------------------
 srcpkgs/newsflash/template                 | 21 +++++++++------------
 2 files changed, 9 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/newsflash/patches/meson-0.61.patch

diff --git a/srcpkgs/newsflash/patches/meson-0.61.patch b/srcpkgs/newsflash/patches/meson-0.61.patch
deleted file mode 100644
index bfc8a67d0aa878..00000000000000
--- a/srcpkgs/newsflash/patches/meson-0.61.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -2,7 +2,7 @@ subdir('icons')
- 
- desktop_conf = configuration_data()
- desktop_conf.set('icon', application_id)
--desktop_file = i18n.merge_file ('desktop-file',
-+desktop_file = i18n.merge_file (
-   type: 'desktop',
-   input: configure_file(
-     input: files('com.gitlab.newsflash.desktop.in.in'),
-@@ -27,7 +27,7 @@ endif
- 
- appdata_conf = configuration_data()
- appdata_conf.set('appid', application_id)
--appdata_file = i18n.merge_file ('appdata-file',
-+appdata_file = i18n.merge_file (
-   input: configure_file(
-     input: files('com.gitlab.newsflash.appdata.xml.in.in'),
-     output: '@BASENAME@',
diff --git a/srcpkgs/newsflash/template b/srcpkgs/newsflash/template
index e94c4d3b8d234b..e84063c0448c8a 100644
--- a/srcpkgs/newsflash/template
+++ b/srcpkgs/newsflash/template
@@ -1,25 +1,22 @@
 # Template file for 'newsflash'
 pkgname=newsflash
-version=1.4.2
-revision=2
+version=3.1.3
+revision=1
 build_style=meson
 build_helper=rust
-hostmakedepends="cargo pkg-config glib-devel sqlite-devel gettext"
-makedepends="rust-std webkit2gtk-devel libhandy1-devel openssl-devel"
+hostmakedepends="cargo pkg-config glib-devel sqlite-devel gettext-devel
+ desktop-file-utils gtk4-update-icon-cache blueprint-compiler"
+makedepends="rust-std libwebkitgtk60-devel libadwaita-devel openssl-devel"
 short_desc="RSS feed reader that supports various web based services"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/news-flash/news_flash_gtk"
-# distfiles="https://gitlab.com/news-flash/news_flash_gtk/-/archive/$version/news_flash_gtk-$version.tar.gz"
-# tag is gone upstream
-distfiles="https://sources.voidlinux.org/newsflash-1.4.2/news_flash_gtk-1.4.2.tar.gz"
-checksum=099318a6bc57e5e695352b2f3c7dd149c9b889f39cb9cbd58dc3f10f41d4948d
+distfiles="https://gitlab.com/news-flash/news_flash_gtk/-/archive/v.${version}/news_flash_gtk-v.${version}.tar.gz"
+checksum=5c9e6d01de0b3503186a125e5edbba425c1193e7e0f3c45a737d53b82bb54106
 
 post_patch() {
 	if [ -n "$CROSS_BUILD" ]; then
-		vsed -i build-aux/cargo.sh \
-			-e 's,"$CARGO_TARGET_DIR"/,&${RUST_TARGET}/,'
+		vsed -i src/meson.build \
+			 -e "s%rust_target /%'${RUST_TARGET}' / rust_target /%"
 	fi
-	cargo update --package openssl-sys:0.9.63 --precise 0.9.91
-	cargo update --package openssl:0.10.34 --precise 0.10.56
 }