[PR PATCH] gnome-authenticator: update to 4.2.0.

[PR PATCH] gnome-authenticator: update to 4.2.0.

[oreo639]

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

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

https://github.com/oreo639/void-packages gauthenticator
https://github.com/void-linux/void-packages/pull/42999

gnome-authenticator: update to 4.2.0.
<!-- 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/42999.patch is attached

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

From 4215330fe0e1949f772413def2c3955797613d02 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 24 Mar 2023 16:35:20 -0700
Subject: [PATCH] gnome-authenticator: update to 4.2.0.

---
 .../patches/fix-zbar.patch                    | 13 ----------
 .../patches/meson-0.61.patch                  | 18 -------------
 srcpkgs/gnome-authenticator/template          | 25 +++++++++++--------
 3 files changed, 14 insertions(+), 42 deletions(-)
 delete mode 100644 srcpkgs/gnome-authenticator/patches/fix-zbar.patch
 delete mode 100644 srcpkgs/gnome-authenticator/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-authenticator/patches/fix-zbar.patch b/srcpkgs/gnome-authenticator/patches/fix-zbar.patch
deleted file mode 100644
index 8683ff6129b7..000000000000
--- a/srcpkgs/gnome-authenticator/patches/fix-zbar.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git meson.build meson.build
-index 8eed8f8..a1e38ab 100644
---- a/meson.build
-+++ b/meson.build
-@@ -24,7 +24,7 @@ dependency('gobject-2.0')
- dependency('gobject-introspection-1.0')
- dependency('gtk+-3.0', version: '>=3.16')
- dependency('libsecret-1')
--dependency('zbar', version: '>= 0.20.1')
-+dependency('zbar', version: '>= 0.10')
- find_program('glib-compile-schemas', required: true)
- find_program('gtk-update-icon-cache', required: false)
- find_program('update-desktop-database', required: false)
diff --git a/srcpkgs/gnome-authenticator/patches/meson-0.61.patch b/srcpkgs/gnome-authenticator/patches/meson-0.61.patch
deleted file mode 100644
index eade2e1241b5..000000000000
--- a/srcpkgs/gnome-authenticator/patches/meson-0.61.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -63,7 +63,6 @@ configure_file(
- desktop_conf = configuration_data()
- desktop_conf.set('APP_ID', application_id)
- desktop_file = i18n.merge_file(
--  'desktop',
-   input: configure_file(
-     input: meson.project_name() + '.desktop.in.in',
-     output: '@BASENAME@',
-@@ -90,7 +89,6 @@ appdata_conf = configuration_data()
- appdata_conf.set('APP_ID', application_id)
- appdata_conf.set('GETTEXT_PACKAGE', gettext_package)
- appdata_file = i18n.merge_file(
--  'appdata',
-   input: configure_file(
-     input: meson.project_name() + '.appdata.xml.in.in',
-     output: '@BASENAME@',
diff --git a/srcpkgs/gnome-authenticator/template b/srcpkgs/gnome-authenticator/template
index 2bd6c63b9d0b..25d04361e8d2 100644
--- a/srcpkgs/gnome-authenticator/template
+++ b/srcpkgs/gnome-authenticator/template
@@ -1,21 +1,24 @@
 # Template file for 'gnome-authenticator'
 pkgname=gnome-authenticator
-version=3.32.2
-revision=5
+version=4.2.0
+revision=1
 build_style=meson
-build_helper="gir"
-hostmakedepends="gettext appstream-glib desktop-file-utils glib-devel pkg-config"
-makedepends="gtk+3-devel libglib-devel libsecret-devel libzbar-devel"
-depends="python3-pyzbar python3-Pillow python3-pyotp libhandy python3-gobject
- gnome-keyring python3-yoyo-migrations python3-pyfavicon"
+build_helper="rust"
+hostmakedepends="pkg-config gettext glib-devel itstool cargo desktop-file-utils
+ gtk-update-icon-cache clang"
+makedepends="gtk4-devel libadwaita-devel libglib-devel libzbar-devel openssl-devel
+ pipewire-devel rust-std"
 short_desc="Two-factor authentication code generator for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/World/Authenticator"
-distfiles="${homepage}/-/archive/${version}/Authenticator-${version}.tar.gz"
-checksum="d7250fbef1de2dcb599a55ff3d40dcc6ed5618fe89d50ec795281d8ba3123d5b"
+distfiles="https://gitlab.gnome.org/World/Authenticator/-/archive/${version}/Authenticator-${version}.tar.gz"
+checksum="7dbb9c9a10ca0a95750adebc860fa81674f4d49bd45f5c1c6ec063278631221c"
+
+export BINDGEN_EXTRA_CLANG_ARGS="-DPW_ENABLE_DEPRECATED"
 
 post_patch() {
-	find src/Authenticator/widgets -type f -exec \
-		sed -i '/init_template/d' {} +
+	[ -z "$CROSS_BUILD" ] && return 0
+	vsed -i src/meson.build \
+		 -e "s%rust_target /%'${RUST_TARGET}' / rust_target /%"
 }

Re: [PR PATCH] [Updated] gnome-authenticator: update to 4.2.0.

[oreo639]

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

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

https://github.com/oreo639/void-packages gauthenticator
https://github.com/void-linux/void-packages/pull/42999

gnome-authenticator: update to 4.2.0.
<!-- 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/42999.patch is attached

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

From 47b41ff14c39066d6ada54b225a3ec220d1cb765 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 24 Mar 2023 16:35:20 -0700
Subject: [PATCH] gnome-authenticator: update to 4.2.0.

---
 .../patches/fix-zbar.patch                    | 13 -----------
 .../patches/meson-0.61.patch                  | 18 ---------------
 .../patches/pipewire0.3.64.patch              | 11 +++++++++
 srcpkgs/gnome-authenticator/template          | 23 ++++++++++---------
 4 files changed, 23 insertions(+), 42 deletions(-)
 delete mode 100644 srcpkgs/gnome-authenticator/patches/fix-zbar.patch
 delete mode 100644 srcpkgs/gnome-authenticator/patches/meson-0.61.patch
 create mode 100644 srcpkgs/gnome-authenticator/patches/pipewire0.3.64.patch

diff --git a/srcpkgs/gnome-authenticator/patches/fix-zbar.patch b/srcpkgs/gnome-authenticator/patches/fix-zbar.patch
deleted file mode 100644
index 8683ff6129b7..000000000000
--- a/srcpkgs/gnome-authenticator/patches/fix-zbar.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git meson.build meson.build
-index 8eed8f8..a1e38ab 100644
---- a/meson.build
-+++ b/meson.build
-@@ -24,7 +24,7 @@ dependency('gobject-2.0')
- dependency('gobject-introspection-1.0')
- dependency('gtk+-3.0', version: '>=3.16')
- dependency('libsecret-1')
--dependency('zbar', version: '>= 0.20.1')
-+dependency('zbar', version: '>= 0.10')
- find_program('glib-compile-schemas', required: true)
- find_program('gtk-update-icon-cache', required: false)
- find_program('update-desktop-database', required: false)
diff --git a/srcpkgs/gnome-authenticator/patches/meson-0.61.patch b/srcpkgs/gnome-authenticator/patches/meson-0.61.patch
deleted file mode 100644
index eade2e1241b5..000000000000
--- a/srcpkgs/gnome-authenticator/patches/meson-0.61.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -63,7 +63,6 @@ configure_file(
- desktop_conf = configuration_data()
- desktop_conf.set('APP_ID', application_id)
- desktop_file = i18n.merge_file(
--  'desktop',
-   input: configure_file(
-     input: meson.project_name() + '.desktop.in.in',
-     output: '@BASENAME@',
-@@ -90,7 +89,6 @@ appdata_conf = configuration_data()
- appdata_conf.set('APP_ID', application_id)
- appdata_conf.set('GETTEXT_PACKAGE', gettext_package)
- appdata_file = i18n.merge_file(
--  'appdata',
-   input: configure_file(
-     input: meson.project_name() + '.appdata.xml.in.in',
-     output: '@BASENAME@',
diff --git a/srcpkgs/gnome-authenticator/patches/pipewire0.3.64.patch b/srcpkgs/gnome-authenticator/patches/pipewire0.3.64.patch
new file mode 100644
index 000000000000..a6ec118032e1
--- /dev/null
+++ b/srcpkgs/gnome-authenticator/patches/pipewire0.3.64.patch
@@ -0,0 +1,11 @@
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -2648,7 +2648,7 @@ checksum = "8b870d8c151b6f2fb93e84a13146
+ 
+ [[package]]
+ name = "pipewire"
+-version = "0.5.0"
++version = "0.6.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "d80fef8219c37f479f3d62d70167f3daaa90b71a083f7fd88d69e49f05f0ecdc"
+ dependencies = [
diff --git a/srcpkgs/gnome-authenticator/template b/srcpkgs/gnome-authenticator/template
index 2bd6c63b9d0b..5378d04c5c2c 100644
--- a/srcpkgs/gnome-authenticator/template
+++ b/srcpkgs/gnome-authenticator/template
@@ -1,21 +1,22 @@
 # Template file for 'gnome-authenticator'
 pkgname=gnome-authenticator
-version=3.32.2
-revision=5
+version=4.2.0
+revision=1
 build_style=meson
-build_helper="gir"
-hostmakedepends="gettext appstream-glib desktop-file-utils glib-devel pkg-config"
-makedepends="gtk+3-devel libglib-devel libsecret-devel libzbar-devel"
-depends="python3-pyzbar python3-Pillow python3-pyotp libhandy python3-gobject
- gnome-keyring python3-yoyo-migrations python3-pyfavicon"
+build_helper="rust"
+hostmakedepends="pkg-config gettext glib-devel itstool cargo desktop-file-utils
+ gtk-update-icon-cache clang"
+makedepends="gtk4-devel libadwaita-devel libglib-devel libzbar-devel openssl-devel
+ pipewire-devel rust-std"
 short_desc="Two-factor authentication code generator for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/World/Authenticator"
-distfiles="${homepage}/-/archive/${version}/Authenticator-${version}.tar.gz"
-checksum="d7250fbef1de2dcb599a55ff3d40dcc6ed5618fe89d50ec795281d8ba3123d5b"
+distfiles="https://gitlab.gnome.org/World/Authenticator/-/archive/${version}/Authenticator-${version}.tar.gz"
+checksum="7dbb9c9a10ca0a95750adebc860fa81674f4d49bd45f5c1c6ec063278631221c"
 
 post_patch() {
-	find src/Authenticator/widgets -type f -exec \
-		sed -i '/init_template/d' {} +
+	[ -z "$CROSS_BUILD" ] && return 0
+	vsed -i src/meson.build \
+		 -e "s%rust_target /%'${RUST_TARGET}' / rust_target /%"
 }

Re: [PR PATCH] [Updated] gnome-authenticator: update to 4.2.0.

[oreo639]

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

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

https://github.com/oreo639/void-packages gauthenticator
https://github.com/void-linux/void-packages/pull/42999

gnome-authenticator: update to 4.2.0.
<!-- 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/42999.patch is attached

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

From ec6a7d481d74f1b3891de21510703789630d3a18 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 24 Mar 2023 18:01:11 -0700
Subject: [PATCH 1/2] common/build-helper/rust.sh: allow specifying
 BINDGEN_EXTRA_CLANG_ARGS

---
 common/build-helper/rust.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh
index 9e604929ed23..2b15bde3a1ed 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -25,7 +25,7 @@ if [ "$CROSS_BUILD" ]; then
 	export HOST_CFLAGS="-O2"
 
 	# Crates that use bindgen via build.rs are not cross-aware unless these are set
-	export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=${XBPS_CROSS_BASE} -I${XBPS_CROSS_BASE}/usr/include"
+	export BINDGEN_EXTRA_CLANG_ARGS+=" --sysroot=${XBPS_CROSS_BASE} -I${XBPS_CROSS_BASE}/usr/include"
 else
 	unset CARGO_BUILD_TARGET
 fi

From 0d68aebb60c7fd9b695e5fa278ba9dea90c6c29d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 24 Mar 2023 18:01:41 -0700
Subject: [PATCH 2/2] gnome-authenticator: update to 4.2.0.

---
 .../patches/fix-zbar.patch                    | 13 ----------
 .../patches/meson-0.61.patch                  | 18 -------------
 srcpkgs/gnome-authenticator/template          | 25 +++++++++++--------
 3 files changed, 14 insertions(+), 42 deletions(-)
 delete mode 100644 srcpkgs/gnome-authenticator/patches/fix-zbar.patch
 delete mode 100644 srcpkgs/gnome-authenticator/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-authenticator/patches/fix-zbar.patch b/srcpkgs/gnome-authenticator/patches/fix-zbar.patch
deleted file mode 100644
index 8683ff6129b7..000000000000
--- a/srcpkgs/gnome-authenticator/patches/fix-zbar.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git meson.build meson.build
-index 8eed8f8..a1e38ab 100644
---- a/meson.build
-+++ b/meson.build
-@@ -24,7 +24,7 @@ dependency('gobject-2.0')
- dependency('gobject-introspection-1.0')
- dependency('gtk+-3.0', version: '>=3.16')
- dependency('libsecret-1')
--dependency('zbar', version: '>= 0.20.1')
-+dependency('zbar', version: '>= 0.10')
- find_program('glib-compile-schemas', required: true)
- find_program('gtk-update-icon-cache', required: false)
- find_program('update-desktop-database', required: false)
diff --git a/srcpkgs/gnome-authenticator/patches/meson-0.61.patch b/srcpkgs/gnome-authenticator/patches/meson-0.61.patch
deleted file mode 100644
index eade2e1241b5..000000000000
--- a/srcpkgs/gnome-authenticator/patches/meson-0.61.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -63,7 +63,6 @@ configure_file(
- desktop_conf = configuration_data()
- desktop_conf.set('APP_ID', application_id)
- desktop_file = i18n.merge_file(
--  'desktop',
-   input: configure_file(
-     input: meson.project_name() + '.desktop.in.in',
-     output: '@BASENAME@',
-@@ -90,7 +89,6 @@ appdata_conf = configuration_data()
- appdata_conf.set('APP_ID', application_id)
- appdata_conf.set('GETTEXT_PACKAGE', gettext_package)
- appdata_file = i18n.merge_file(
--  'appdata',
-   input: configure_file(
-     input: meson.project_name() + '.appdata.xml.in.in',
-     output: '@BASENAME@',
diff --git a/srcpkgs/gnome-authenticator/template b/srcpkgs/gnome-authenticator/template
index 2bd6c63b9d0b..7352e74e6a92 100644
--- a/srcpkgs/gnome-authenticator/template
+++ b/srcpkgs/gnome-authenticator/template
@@ -1,21 +1,24 @@
 # Template file for 'gnome-authenticator'
 pkgname=gnome-authenticator
-version=3.32.2
-revision=5
+version=4.2.0
+revision=1
 build_style=meson
-build_helper="gir"
-hostmakedepends="gettext appstream-glib desktop-file-utils glib-devel pkg-config"
-makedepends="gtk+3-devel libglib-devel libsecret-devel libzbar-devel"
-depends="python3-pyzbar python3-Pillow python3-pyotp libhandy python3-gobject
- gnome-keyring python3-yoyo-migrations python3-pyfavicon"
+build_helper="rust"
+hostmakedepends="pkg-config gettext glib-devel itstool cargo desktop-file-utils
+ gtk-update-icon-cache clang"
+makedepends="gtk4-devel libadwaita-devel libglib-devel libzbar-devel openssl-devel
+ pipewire-devel rust-std"
 short_desc="Two-factor authentication code generator for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/World/Authenticator"
-distfiles="${homepage}/-/archive/${version}/Authenticator-${version}.tar.gz"
-checksum="d7250fbef1de2dcb599a55ff3d40dcc6ed5618fe89d50ec795281d8ba3123d5b"
+distfiles="https://gitlab.gnome.org/World/Authenticator/-/archive/${version}/Authenticator-${version}.tar.gz"
+checksum="7dbb9c9a10ca0a95750adebc860fa81674f4d49bd45f5c1c6ec063278631221c"
+
+export BINDGEN_EXTRA_CLANG_ARGS="${BINDGEN_EXTRA_CLANG_ARGS} -DPW_ENABLE_DEPRECATED"
 
 post_patch() {
-	find src/Authenticator/widgets -type f -exec \
-		sed -i '/init_template/d' {} +
+	[ -z "$CROSS_BUILD" ] && return 0
+	vsed -i src/meson.build \
+		 -e "s%rust_target /%'${RUST_TARGET}' / rust_target /%"
 }

Re: [PR PATCH] [Updated] gnome-authenticator: update to 4.2.0.

[oreo639]

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

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

https://github.com/oreo639/void-packages gauthenticator
https://github.com/void-linux/void-packages/pull/42999

gnome-authenticator: update to 4.2.0.
<!-- 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/42999.patch is attached

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

From ec6a7d481d74f1b3891de21510703789630d3a18 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 24 Mar 2023 18:01:11 -0700
Subject: [PATCH 1/2] common/build-helper/rust.sh: allow specifying
 BINDGEN_EXTRA_CLANG_ARGS

---
 common/build-helper/rust.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh
index 9e604929ed23..2b15bde3a1ed 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -25,7 +25,7 @@ if [ "$CROSS_BUILD" ]; then
 	export HOST_CFLAGS="-O2"
 
 	# Crates that use bindgen via build.rs are not cross-aware unless these are set
-	export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=${XBPS_CROSS_BASE} -I${XBPS_CROSS_BASE}/usr/include"
+	export BINDGEN_EXTRA_CLANG_ARGS+=" --sysroot=${XBPS_CROSS_BASE} -I${XBPS_CROSS_BASE}/usr/include"
 else
 	unset CARGO_BUILD_TARGET
 fi

From 085a7417cf636e36d65edfbc36e5fb79a9b28e72 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 24 Mar 2023 18:01:41 -0700
Subject: [PATCH 2/2] gnome-authenticator: update to 4.2.0.

---
 .../patches/fix-zbar.patch                    | 13 ----------
 .../patches/meson-0.61.patch                  | 18 -------------
 srcpkgs/gnome-authenticator/template          | 26 +++++++++++--------
 3 files changed, 15 insertions(+), 42 deletions(-)
 delete mode 100644 srcpkgs/gnome-authenticator/patches/fix-zbar.patch
 delete mode 100644 srcpkgs/gnome-authenticator/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-authenticator/patches/fix-zbar.patch b/srcpkgs/gnome-authenticator/patches/fix-zbar.patch
deleted file mode 100644
index 8683ff6129b7..000000000000
--- a/srcpkgs/gnome-authenticator/patches/fix-zbar.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git meson.build meson.build
-index 8eed8f8..a1e38ab 100644
---- a/meson.build
-+++ b/meson.build
-@@ -24,7 +24,7 @@ dependency('gobject-2.0')
- dependency('gobject-introspection-1.0')
- dependency('gtk+-3.0', version: '>=3.16')
- dependency('libsecret-1')
--dependency('zbar', version: '>= 0.20.1')
-+dependency('zbar', version: '>= 0.10')
- find_program('glib-compile-schemas', required: true)
- find_program('gtk-update-icon-cache', required: false)
- find_program('update-desktop-database', required: false)
diff --git a/srcpkgs/gnome-authenticator/patches/meson-0.61.patch b/srcpkgs/gnome-authenticator/patches/meson-0.61.patch
deleted file mode 100644
index eade2e1241b5..000000000000
--- a/srcpkgs/gnome-authenticator/patches/meson-0.61.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -63,7 +63,6 @@ configure_file(
- desktop_conf = configuration_data()
- desktop_conf.set('APP_ID', application_id)
- desktop_file = i18n.merge_file(
--  'desktop',
-   input: configure_file(
-     input: meson.project_name() + '.desktop.in.in',
-     output: '@BASENAME@',
-@@ -90,7 +89,6 @@ appdata_conf = configuration_data()
- appdata_conf.set('APP_ID', application_id)
- appdata_conf.set('GETTEXT_PACKAGE', gettext_package)
- appdata_file = i18n.merge_file(
--  'appdata',
-   input: configure_file(
-     input: meson.project_name() + '.appdata.xml.in.in',
-     output: '@BASENAME@',
diff --git a/srcpkgs/gnome-authenticator/template b/srcpkgs/gnome-authenticator/template
index 2bd6c63b9d0b..db6d2317e57d 100644
--- a/srcpkgs/gnome-authenticator/template
+++ b/srcpkgs/gnome-authenticator/template
@@ -1,21 +1,25 @@
 # Template file for 'gnome-authenticator'
 pkgname=gnome-authenticator
-version=3.32.2
-revision=5
+version=4.2.0
+revision=1
 build_style=meson
-build_helper="gir"
-hostmakedepends="gettext appstream-glib desktop-file-utils glib-devel pkg-config"
-makedepends="gtk+3-devel libglib-devel libsecret-devel libzbar-devel"
-depends="python3-pyzbar python3-Pillow python3-pyotp libhandy python3-gobject
- gnome-keyring python3-yoyo-migrations python3-pyfavicon"
+build_helper="rust"
+hostmakedepends="pkg-config gettext glib-devel itstool cargo desktop-file-utils
+ gtk-update-icon-cache clang"
+makedepends="gtk4-devel libadwaita-devel libglib-devel libzbar-devel openssl-devel
+ pipewire-devel rust-std"
 short_desc="Two-factor authentication code generator for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/World/Authenticator"
-distfiles="${homepage}/-/archive/${version}/Authenticator-${version}.tar.gz"
-checksum="d7250fbef1de2dcb599a55ff3d40dcc6ed5618fe89d50ec795281d8ba3123d5b"
+distfiles="https://gitlab.gnome.org/World/Authenticator/-/archive/${version}/Authenticator-${version}.tar.gz"
+checksum="7dbb9c9a10ca0a95750adebc860fa81674f4d49bd45f5c1c6ec063278631221c"
+make_check=ci-skip # Test timeout while compiling tests
+
+export BINDGEN_EXTRA_CLANG_ARGS="${BINDGEN_EXTRA_CLANG_ARGS} -DPW_ENABLE_DEPRECATED"
 
 post_patch() {
-	find src/Authenticator/widgets -type f -exec \
-		sed -i '/init_template/d' {} +
+	[ -z "$CROSS_BUILD" ] && return 0
+	vsed -i src/meson.build \
+		 -e "s%rust_target /%'${RUST_TARGET}' / rust_target /%"
 }

Re: gnome-authenticator: update to 4.2.0.

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/42999#issuecomment-1483916318

Comment:
@jcgruenhage does the rust build helper change look fine to you?

Re: gnome-authenticator: update to 4.2.0.

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/42999#issuecomment-1483916318

Comment:
@jcgruenhage or @tranzystorek-io does the rust build helper change look fine to you?

Re: gnome-authenticator: update to 4.2.0.

[jcgruenhage]

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

New comment by jcgruenhage on void-packages repository

https://github.com/void-linux/void-packages/pull/42999#issuecomment-1483917593

Comment:
assuming that the build helpers are evaluated after the template, yeah, that looks fine to me.

Re: gnome-authenticator: update to 4.2.0.

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/42999#issuecomment-1484283578

Comment:
build helper change seems fine to me

Re: [PR PATCH] [Merged]: gnome-authenticator: update to 4.2.0.

[paper42]

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

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

gnome-authenticator: update to 4.2.0.
https://github.com/void-linux/void-packages/pull/42999

Description:
<!-- 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
-->