From nobody Mon Oct 25 08:57:03 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id ED2341810B8C; Mon, 25 Oct 2021 08:57:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hd8351njLz4mFF; Mon, 25 Oct 2021 08:57:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D197B25C31; Mon, 25 Oct 2021 08:57:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19P8v3Ek099022; Mon, 25 Oct 2021 08:57:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19P8v3wM099021; Mon, 25 Oct 2021 08:57:03 GMT (envelope-from git) Date: Mon, 25 Oct 2021 08:57:03 GMT Message-Id: <202110250857.19P8v3wM099021@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tobias Kortkamp Subject: git: 88d555cd751d - main - audio/shortwave: Chase USES=cargo's new git source support List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tobik X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 88d555cd751d684e56da89916311189628d32075 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=88d555cd751d684e56da89916311189628d32075 commit 88d555cd751d684e56da89916311189628d32075 Author: Tobias Kortkamp AuthorDate: 2021-10-07 14:47:08 +0000 Commit: Tobias Kortkamp CommitDate: 2021-10-25 08:49:07 +0000 audio/shortwave: Chase USES=cargo's new git source support PR: 256581 --- audio/shortwave/Makefile | 35 +----- audio/shortwave/files/patch-gtk | 241 ---------------------------------------- 2 files changed, 5 insertions(+), 271 deletions(-) diff --git a/audio/shortwave/Makefile b/audio/shortwave/Makefile index 456d8d55de7e..2891ec032353 100644 --- a/audio/shortwave/Makefile +++ b/audio/shortwave/Makefile @@ -12,18 +12,13 @@ LICENSE_FILE= ${WRKSRC}/COPYING.md LIB_DEPENDS= libdbus-1.so:devel/dbus USES= cargo gettext gnome meson pkgconfig python:build shebangfix sqlite ssl -USE_GITHUB= nodefault USE_GITLAB= yes USE_GNOME= gdkpixbuf2 gtk40 libadwaita USE_GSTREAMER1= good libav soup vorbis -GH_TUPLE= gtk-rs:gtk3-rs:1ca4fbcc30ec882f6079f26018c30ef1ceb8a2e2:gtk3 \ - gtk-rs:gtk4-rs:534f63e66a2a3883770fe110a8a556a4b40f84b3:gtk4 GL_SITE= https://gitlab.gnome.org GL_ACCOUNT= World GL_PROJECT= Shortwave GL_COMMIT= 9bfc5ee2d857035cf0d3c72e211b3d76b85d7414 -GL_TUPLE= https://gitlab.freedesktop.org:gstreamer:gstreamer-rs:f00c57cd6f2a0912e04c10887cedbe95be7d5dea:gstreamer \ - bilelmoussaoui:libadwaita-rs:2d09b6b566bc0fa2497612768cf0c41f582acdd7:libadwaita SHEBANG_FILES= build-aux/meson/postinstall.py MAKE_ENV= ${CARGO_ENV} GLIB_SCHEMAS= de.haeckerfelix.Shortwave.gschema.xml @@ -275,31 +270,11 @@ CARGO_CRATES= addr2line-0.14.1 \ winapi-util-0.1.5 \ winapi-x86_64-pc-windows-gnu-0.4.0 \ winreg-0.6.2 \ - ws2_32-sys-0.2.1 -CARGO_USE_GITHUB= yes -CARGO_USE_GITLAB= yes -CARGO_GIT_SUBDIR= gstreamer:gstreamer-audio:gstreamer-audio \ - gstreamer:gstreamer:gstreamer \ - gtk3:cairo-rs:cairo \ - gtk3:cairo-sys-rs:cairo/sys \ - gtk3:gdk-pixbuf-sys:gdk-pixbuf/sys \ - gtk3:gdk-pixbuf:gdk-pixbuf \ - gtk3:gdk:gdk \ - 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:gtk:gtk \ - gtk3:pango-sys:pango/sys \ - gtk3:pango:pango \ - gtk4:gdk-sys:gdk4/sys \ - gtk4:gdk:gdk4 \ - gtk4:gtk-sys:gtk4/sys \ - gtk4:gtk:gtk4 \ - libadwaita:adw:libadwaita + ws2_32-sys-0.2.1 \ + gstreamer,gstreamer-audio,gstreamer-audio-sys,gstreamer-base,gstreamer-base-sys,gstreamer-sys@git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs\#f00c57cd6f2a0912e04c10887cedbe95be7d5dea \ + 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\#1ca4fbcc30ec882f6079f26018c30ef1ceb8a2e2 \ + gdk4,gdk4-sys,gsk4,gsk4-sys,gtk4,gtk4-macros,gtk4-sys@git+https://github.com/gtk-rs/gtk4-rs\#534f63e66a2a3883770fe110a8a556a4b40f84b3 \ + libadwaita,libadwaita-sys@git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs\#2d09b6b566bc0fa2497612768cf0c41f582acdd7 CARGO_BUILD= no CARGO_INSTALL= no CARGO_TEST= no diff --git a/audio/shortwave/files/patch-gtk b/audio/shortwave/files/patch-gtk deleted file mode 100644 index c1c7493eeb46..000000000000 --- a/audio/shortwave/files/patch-gtk +++ /dev/null @@ -1,241 +0,0 @@ -https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=256581 - ---- ../gstreamer-rs-f00c57cd6f2a0912e04c10887cedbe95be7d5dea/gstreamer/sys/Cargo.toml.orig 2021-04-23 12:28:54 UTC -+++ ../gstreamer-rs-f00c57cd6f2a0912e04c10887cedbe95be7d5dea/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" ---- ../gstreamer-rs-f00c57cd6f2a0912e04c10887cedbe95be7d5dea/gstreamer-audio/sys/Cargo.toml.orig 2021-04-23 12:28:54 UTC -+++ ../gstreamer-rs-f00c57cd6f2a0912e04c10887cedbe95be7d5dea/gstreamer-audio/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-base-sys] - path = "../../gstreamer-base/sys" ---- ../gstreamer-rs-f00c57cd6f2a0912e04c10887cedbe95be7d5dea/gstreamer-base/sys/Cargo.toml.orig 2021-04-23 12:28:54 UTC -+++ ../gstreamer-rs-f00c57cd6f2a0912e04c10887cedbe95be7d5dea/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" ---- ../gtk4-rs-534f63e66a2a3883770fe110a8a556a4b40f84b3/gdk4/sys/Cargo.toml.orig 2021-04-23 13:02:09 UTC -+++ ../gtk4-rs-534f63e66a2a3883770fe110a8a556a4b40f84b3/gdk4/sys/Cargo.toml -@@ -28,27 +28,13 @@ v4_2 = [] - - [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.graphene-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" } -+graphene-sys = { git = "https://github.com/gtk-rs/gtk3-rs" } -+pango-sys = { git = "https://github.com/gtk-rs/gtk3-rs" } - - [build-dependencies] - system-deps = "3" ---- ../gtk4-rs-534f63e66a2a3883770fe110a8a556a4b40f84b3/gsk4/sys/Cargo.toml.orig 2021-04-23 13:02:09 UTC -+++ ../gtk4-rs-534f63e66a2a3883770fe110a8a556a4b40f84b3/gsk4/sys/Cargo.toml -@@ -28,24 +28,14 @@ v4_2 = [] - - [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" - - [build-dependencies] - system-deps = "3" ---- ../gtk4-rs-534f63e66a2a3883770fe110a8a556a4b40f84b3/gtk4/sys/Cargo.toml.orig 2021-04-23 13:02:09 UTC -+++ ../gtk4-rs-534f63e66a2a3883770fe110a8a556a4b40f84b3/gtk4/sys/Cargo.toml -@@ -29,33 +29,19 @@ v4_2 = [] - - [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" - - [build-dependencies] - system-deps = "3" ---- ../libadwaita-rs-2d09b6b566bc0fa2497612768cf0c41f582acdd7/libadwaita/Cargo.toml.orig 2021-04-20 20:15:58 UTC -+++ ../libadwaita-rs-2d09b6b566bc0fa2497612768cf0c41f582acdd7/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-2d09b6b566bc0fa2497612768cf0c41f582acdd7/libadwaita/sys/Cargo.toml.orig 2021-04-20 20:15:58 UTC -+++ ../libadwaita-rs-2d09b6b566bc0fa2497612768cf0c41f582acdd7/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"