From 4215330fe0e1949f772413def2c3955797613d02 Mon Sep 17 00:00:00 2001 From: oreo639 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 " 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 /%" }