git: 8259bf7a5dec - main - security/authenticator: Chase USES=cargo's new git source support

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Tobias Kortkamp <tobik_at_FreeBSD.org>
Date: Mon, 25 Oct 2021 08:57:22 UTC
The branch main has been updated by tobik:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8259bf7a5dec4da1d24a8f3e986b6e7913cfa611

commit 8259bf7a5dec4da1d24a8f3e986b6e7913cfa611
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-10-07 14:47:36 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-10-25 08:49:14 +0000

    security/authenticator: Chase USES=cargo's new git source support
    
    PR:             256581
---
 security/authenticator/Makefile        |  39 +----
 security/authenticator/files/patch-gtk | 283 ---------------------------------
 2 files changed, 6 insertions(+), 316 deletions(-)

diff --git a/security/authenticator/Makefile b/security/authenticator/Makefile
index e6e9a3579935..55a53a05e273 100644
--- a/security/authenticator/Makefile
+++ b/security/authenticator/Makefile
@@ -17,19 +17,13 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libzbar.so:graphics/zbar
 
 USES=		cargo gettext gnome meson pkgconfig python:build shebangfix sqlite ssl
-USE_GITHUB=	nodefault
 USE_GITLAB=	yes
 USE_GNOME=	gtk40 libadwaita
 USE_GSTREAMER1=	gl gtk4 zbar
-GH_TUPLE=	bilelmoussaoui:ashpd:d7ec2103565301b8476d6706ef34090e197b021c:ashpd \
-		gtk-rs:gtk3-rs:6e3c8739f9f5b8dc0a234f4a485e254574af5953:gtk3 \
-		gtk-rs:gtk4-rs:13a8317a2ef8738362b9fa7f55a29dd5d3dbc459:gtk4
 GL_SITE=	https://gitlab.gnome.org
 GL_ACCOUNT=	World
 GL_PROJECT=	Authenticator
 GL_COMMIT=	ba1894159358275be2765bc42ef89782a2d1d45d
-GL_TUPLE=	https://gitlab.freedesktop.org:gstreamer:gstreamer-rs:762450bb5335d8c79cc29a6111874d89bd3b5c00:gstreamer \
-		bilelmoussaoui:libadwaita-rs:6ae4d3670565064acc9da2f51434eca0a0c51ac9:libadwaita
 SHEBANG_FILES=	build-aux/meson_post_install.py
 CARGO_ENV=	ZBAR_INCLUDE_DIRS="${LOCALBASE}/include" ZBAR_LIB_DIRS="${LOCALBASE}/lib"
 MAKE_ENV=	${CARGO_ENV}
@@ -342,33 +336,12 @@ CARGO_CRATES=	adler-1.0.2 \
 		zbus-1.8.0 \
 		zbus_macros-1.8.0 \
 		zvariant-2.6.0 \
-		zvariant_derive-2.6.0
-CARGO_USE_GITHUB=	yes
-CARGO_USE_GITLAB=	yes
-CARGO_GIT_SUBDIR=	gstreamer:gst_base:gstreamer-base \
-			gstreamer:gst:gstreamer \
-			gtk3:cairo-rs:cairo \
-			gtk3:cairo-sys-rs:cairo/sys \
-			gtk3:gdk-pixbuf-sys:gdk-pixbuf/sys \
-			gtk3:gdk-pixbuf:gdk-pixbuf \
-			gtk3:gio-sys:gio/sys \
-			gtk3:gio:gio \
-			gtk3:glib-sys:glib/sys \
-			gtk3:glib:glib \
-			gtk3:gobject-sys:glib/gobject-sys \
-			gtk3:graphene-sys:graphene/sys \
-			gtk3:graphene:graphene \
-			gtk3:pango-sys:pango/sys \
-			gtk3:pango:pango \
-			gtk4:gdk-sys:gdk4/sys \
-			gtk4:gdk4:gdk4 \
-			gtk4:gdk4wayland:gdk4-wayland \
-			gtk4:gdk4x11:gdk4-x11 \
-			gtk4:gdk:gdk4 \
-			gtk4:gtk-sys:gtk4/sys \
-			gtk4:gtk4:gtk4 \
-			gtk4:gtk:gtk4 \
-			libadwaita:adw:libadwaita
+		zvariant_derive-2.6.0 \
+		gstreamer,gstreamer-base,gstreamer-base-sys,gstreamer-sys@git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs\#762450bb5335d8c79cc29a6111874d89bd3b5c00 \
+		gdk4,gdk4-sys,gdk4-wayland,gdk4-wayland-sys,gdk4-x11,gdk4-x11-sys,gsk4,gsk4-sys,gtk4,gtk4-macros,gtk4-sys@git+https://github.com/gtk-rs/gtk4-rs\#13a8317a2ef8738362b9fa7f55a29dd5d3dbc459 \
+		libadwaita,libadwaita-sys@git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs\#6ae4d3670565064acc9da2f51434eca0a0c51ac9 \
+		ashpd@git+https://github.com/bilelmoussaoui/ashpd\#d7ec2103565301b8476d6706ef34090e197b021c \
+		cairo-rs,cairo-sys-rs,gdk-pixbuf,gdk-pixbuf-sys,gio,gio-sys,glib,glib-macros,glib-sys,gobject-sys,graphene-rs,graphene-sys,pango,pango-sys@git+https://github.com/gtk-rs/gtk3-rs\#6e3c8739f9f5b8dc0a234f4a485e254574af5953
 CARGO_BUILD=	no
 CARGO_INSTALL=	no
 CARGO_TEST=	no
diff --git a/security/authenticator/files/patch-gtk b/security/authenticator/files/patch-gtk
deleted file mode 100644
index 66ac662d031b..000000000000
--- a/security/authenticator/files/patch-gtk
+++ /dev/null
@@ -1,283 +0,0 @@
-https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=256581
-
---- ../gstreamer-rs-762450bb5335d8c79cc29a6111874d89bd3b5c00/gstreamer-base/sys/Cargo.toml.orig	2021-03-25 18:12:51 UTC
-+++ ../gstreamer-rs-762450bb5335d8c79cc29a6111874d89bd3b5c00/gstreamer-base/sys/Cargo.toml
-@@ -3,12 +3,8 @@ system-deps = "3"
- 
- [dependencies]
- libc = "0.2"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gobject-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
- 
- [dependencies.gstreamer-sys]
- path = "../../gstreamer/sys"
---- ../gstreamer-rs-762450bb5335d8c79cc29a6111874d89bd3b5c00/gstreamer/sys/Cargo.toml.orig	2021-03-25 18:12:51 UTC
-+++ ../gstreamer-rs-762450bb5335d8c79cc29a6111874d89bd3b5c00/gstreamer/sys/Cargo.toml
-@@ -3,12 +3,8 @@ system-deps = "3"
- 
- [dependencies]
- libc = "0.2"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gobject-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
- 
- [dev-dependencies]
- shell-words = "1.0.0"
---- ../gtk4-rs-13a8317a2ef8738362b9fa7f55a29dd5d3dbc459/gdk4-wayland/Cargo.toml.orig	2021-03-24 16:58:30 UTC
-+++ ../gtk4-rs-13a8317a2ef8738362b9fa7f55a29dd5d3dbc459/gdk4-wayland/Cargo.toml
-@@ -21,12 +21,8 @@ git = "https://github.com/gtk-rs/lgpl-docs"
- [dependencies]
- libc = "0.2"
- wayland-client = { version = "0.28", features = ["use_system_lib"] }
--
--[dependencies.glib]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gio]
--git = "https://github.com/gtk-rs/gtk3-rs"
-+glib = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gio = { git = "https://github.com/gtk-rs/gtk3-rs" }
- 
- [dependencies.gdk]
- path = "../gdk4"
---- ../gtk4-rs-13a8317a2ef8738362b9fa7f55a29dd5d3dbc459/gdk4-wayland/sys/Cargo.toml.orig	2021-03-24 16:58:30 UTC
-+++ ../gtk4-rs-13a8317a2ef8738362b9fa7f55a29dd5d3dbc459/gdk4-wayland/sys/Cargo.toml
-@@ -15,9 +15,7 @@ name = "gdk4_wayland_sys"
- 
- [dependencies]
- libc = "0.2"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs.git"
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs.git" }
- 
- [build-dependencies]
- system-deps = "3"
---- ../gtk4-rs-13a8317a2ef8738362b9fa7f55a29dd5d3dbc459/gdk4-x11/Cargo.toml.orig	2021-03-24 16:58:30 UTC
-+++ ../gtk4-rs-13a8317a2ef8738362b9fa7f55a29dd5d3dbc459/gdk4-x11/Cargo.toml
-@@ -21,12 +21,8 @@ git = "https://github.com/gtk-rs/lgpl-docs"
- [dependencies]
- libc = "0.2"
- x11 = "2.18"
--
--[dependencies.glib]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gio]
--git = "https://github.com/gtk-rs/gtk3-rs"
-+glib = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gio = { git = "https://github.com/gtk-rs/gtk3-rs" }
- 
- [dependencies.gdk]
- path = "../gdk4"
---- ../gtk4-rs-13a8317a2ef8738362b9fa7f55a29dd5d3dbc459/gdk4-x11/sys/Cargo.toml.orig	2021-03-24 16:58:30 UTC
-+++ ../gtk4-rs-13a8317a2ef8738362b9fa7f55a29dd5d3dbc459/gdk4-x11/sys/Cargo.toml
-@@ -16,12 +16,10 @@ name = "gdk4_x11_sys"
- [dependencies]
- libc = "0.2"
- x11 = "2.18"
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs.git" }
- 
- [dependencies.gdk4-sys]
- path = "../../gdk4/sys"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs.git"
- 
- [build-dependencies]
- system-deps = "3"
---- ../gtk4-rs-13a8317a2ef8738362b9fa7f55a29dd5d3dbc459/gdk4/sys/Cargo.toml.orig	2021-03-24 16:58:30 UTC
-+++ ../gtk4-rs-13a8317a2ef8738362b9fa7f55a29dd5d3dbc459/gdk4/sys/Cargo.toml
-@@ -3,24 +3,12 @@ system-deps = "3"
- 
- [dependencies]
- libc = "0.2"
--
--[dependencies.cairo-sys-rs]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gdk-pixbuf-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gio-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gobject-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.pango-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
-+cairo-sys-rs = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gdk-pixbuf-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gio-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+pango-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
- 
- [dev-dependencies]
- shell-words = "1.0.0"
---- ../gtk4-rs-13a8317a2ef8738362b9fa7f55a29dd5d3dbc459/gsk4/sys/Cargo.toml.orig	2021-03-24 16:58:30 UTC
-+++ ../gtk4-rs-13a8317a2ef8738362b9fa7f55a29dd5d3dbc459/gsk4/sys/Cargo.toml
-@@ -3,24 +3,14 @@ system-deps = "3"
- 
- [dependencies]
- libc = "0.2"
-+cairo-sys-rs = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+graphene-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+pango-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
- 
--[dependencies.cairo-sys-rs]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
- [dependencies.gdk4-sys]
- path = "../../gdk4/sys"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gobject-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.graphene-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.pango-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
- 
- [dev-dependencies]
- shell-words = "1.0.0"
---- ../gtk4-rs-13a8317a2ef8738362b9fa7f55a29dd5d3dbc459/gtk4/sys/Cargo.toml.orig	2021-03-24 16:58:30 UTC
-+++ ../gtk4-rs-13a8317a2ef8738362b9fa7f55a29dd5d3dbc459/gtk4/sys/Cargo.toml
-@@ -3,33 +3,19 @@ system-deps = "3"
- 
- [dependencies]
- libc = "0.2"
-+cairo-sys-rs = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gdk-pixbuf-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gio-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+graphene-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+pango-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
- 
--[dependencies.cairo-sys-rs]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gdk-pixbuf-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
- [dependencies.gdk4-sys]
- path = "../../gdk4/sys"
- 
--[dependencies.gio-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gobject-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.graphene-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
- [dependencies.gsk4-sys]
- path = "../../gsk4/sys"
--
--[dependencies.pango-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
- 
- [dev-dependencies]
- shell-words = "1.0.0"
---- ../libadwaita-rs-6ae4d3670565064acc9da2f51434eca0a0c51ac9/libadwaita/Cargo.toml.orig	2021-03-12 01:18:14 UTC
-+++ ../libadwaita-rs-6ae4d3670565064acc9da2f51434eca0a0c51ac9/libadwaita/Cargo.toml
-@@ -8,28 +8,14 @@ edition = "2018"
- libc = '0.2'
- bitflags = '1.2'
- lazy_static = '1.4'
-+glib = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gio = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gdk-pixbuf = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+pango = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gdk = { package = "gdk4", git = "https://github.com/gtk-rs/gtk4-rs" }
-+gtk = { package = "gtk4", git = "https://github.com/gtk-rs/gtk4-rs" }
- [lib]
- name = "libadwaita"
--
--[dependencies.glib]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gio]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gdk-pixbuf]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.pango]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gdk]
--package = "gdk4"
--git = "https://github.com/gtk-rs/gtk4-rs"
--
--[dependencies.gtk]
--package = "gtk4"
--git = "https://github.com/gtk-rs/gtk4-rs"
- 
- [dependencies.ffi]
- package = "libadwaita-sys"
---- ../libadwaita-rs-6ae4d3670565064acc9da2f51434eca0a0c51ac9/libadwaita/sys/Cargo.toml.orig	2021-03-12 01:18:14 UTC
-+++ ../libadwaita-rs-6ae4d3670565064acc9da2f51434eca0a0c51ac9/libadwaita/sys/Cargo.toml
-@@ -16,29 +16,13 @@ name = "libadwaita_sys"
- 
- [dependencies]
- libc = "0.2"
--
--[dependencies.gio-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gdk-pixbuf-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.pango-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gobject-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gtk-sys]
--package = "gtk4-sys"
--git = "https://github.com/gtk-rs/gtk4-rs"
--
--[dependencies.gdk-sys]
--package = "gdk4-sys"
--git = "https://github.com/gtk-rs/gtk4-rs"
-+gio-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gdk-pixbuf-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+pango-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gtk-sys = { package = "gtk4-sys", git = "https://github.com/gtk-rs/gtk4-rs" }
-+gdk-sys = { package = "gdk4-sys", git = "https://github.com/gtk-rs/gtk4-rs" }
- 
- [build-dependencies]
- system-deps = "3"