*/*: sync with upstream

Taken from: FreeBSD
opnsense2 · May 12, 2023 · 50a668d · 50a668d
1 parent c26dcab
commit 50a668d
Show file tree

Hide file tree

Showing 156 changed files with 1,872 additions and 785 deletions.
diff --git a/audio/gnome-metronome/Makefile b/audio/gnome-metronome/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	metronome
-DISTVERSION=	1.2.0
-PORTREVISION=	8
+DISTVERSION=	1.2.1
 CATEGORIES=	audio
 PKGNAMEPREFIX=	gnome-
 
@@ -13,25 +12,26 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgraphene-1.0.so:graphics/graphene
 
-USES=		cargo gettext gnome gstreamer meson pkgconfig python:build shebangfix
+USES=		cargo gettext gnome gstreamer meson pkgconfig
 USE_GITLAB=	yes
 USE_GNOME=	gtk40 libadwaita
 USE_GSTREAMER=	bad good vorbis
 GL_SITE=	https://gitlab.gnome.org
 GL_ACCOUNT=	World
-GL_COMMIT=	26fb83ff4ca32bf801260c3e32af6dcef19f5e59
-SHEBANG_FILES=	build-aux/meson_post_install.py
+GL_COMMIT=	1a9f4b1bebcd6a6fb76c1774714e43006de8d503
 MAKE_ENV=	${CARGO_ENV}
 CARGO_BUILD=	no
 CARGO_INSTALL=	no
 CARGO_TEST=	no
 GLIB_SCHEMAS=	com.adrienplazas.Metronome.gschema.xml
 
 post-patch:
+	@${REINPLACE_CMD} -e '/update_desktop_database/d' \
+		${WRKSRC}/meson.build
 # Make each cargo subcommand very verbose
 # Add explicit <triple> subdir for --target from USES=cargo
-	@${REINPLACE_CMD} -e '/cargo/s/ --/&verbose&verbose&/' \
-		-Ee '/cp/s,/(release|debug)/,/${CARGO_BUILD_TARGET}&,' \
-		${WRKSRC}/build-aux/cargo.sh
+	@${REINPLACE_CMD} -e "/cargo_options =/s/ '--/&verbose', &verbose', &/" \
+		-e "/cp/s,'src',& / '${CARGO_BUILD_TARGET}'," \
+		${WRKSRC}/src/meson.build
 
 .include <bsd.port.mk>
diff --git a/audio/gnome-metronome/Makefile.crates b/audio/gnome-metronome/Makefile.crates
@@ -1,13 +1,15 @@
 CARGO_CRATES=	aho-corasick-0.7.18 \
 		anyhow-1.0.56 \
+		atomic_refcell-0.1.9 \
 		atty-0.2.14 \
 		autocfg-1.1.0 \
 		bitflags-1.3.2 \
 		block-0.1.6 \
+		cairo-rs-0.17.0 \
+		cairo-sys-rs-0.17.0 \
 		cc-1.0.73 \
 		cfg-expr-0.10.2 \
 		cfg-if-1.0.0 \
-		either-1.6.1 \
 		env_logger-0.7.1 \
 		field-offset-0.3.4 \
 		futures-channel-0.3.21 \
@@ -17,55 +19,68 @@ CARGO_CRATES=	aho-corasick-0.7.18 \
 		futures-macro-0.3.21 \
 		futures-task-0.3.21 \
 		futures-util-0.3.21 \
+		gdk-pixbuf-0.17.0 \
+		gdk-pixbuf-sys-0.17.0 \
+		gdk4-0.6.2 \
+		gdk4-sys-0.6.2 \
 		gettext-rs-0.7.0 \
 		gettext-sys-0.21.3 \
-		glib-0.10.3 \
-		glib-macros-0.10.1 \
-		glib-sys-0.10.1 \
-		gobject-sys-0.10.0 \
-		gstreamer-0.16.7 \
-		gstreamer-base-0.16.5 \
-		gstreamer-base-sys-0.9.1 \
-		gstreamer-player-0.16.5 \
-		gstreamer-player-sys-0.9.1 \
-		gstreamer-sys-0.9.1 \
-		gstreamer-video-0.16.7 \
-		gstreamer-video-sys-0.9.1 \
-		gtk-macros-0.3.0 \
-		heck-0.3.3 \
+		gio-0.17.3 \
+		gio-sys-0.17.0 \
+		glib-0.17.3 \
+		glib-macros-0.17.3 \
+		glib-sys-0.17.2 \
+		gobject-sys-0.17.0 \
+		graphene-rs-0.17.1 \
+		graphene-sys-0.17.0 \
+		gsk4-0.6.2 \
+		gsk4-sys-0.6.2 \
+		gstreamer-0.20.2 \
+		gstreamer-base-0.20.0 \
+		gstreamer-base-sys-0.20.0 \
+		gstreamer-player-0.20.0 \
+		gstreamer-player-sys-0.20.0 \
+		gstreamer-sys-0.20.0 \
+		gstreamer-video-0.20.2 \
+		gstreamer-video-sys-0.20.0 \
+		gtk4-0.6.2 \
+		gtk4-macros-0.6.0 \
+		gtk4-sys-0.6.2 \
 		heck-0.4.0 \
 		hermit-abi-0.1.19 \
 		humantime-1.3.0 \
-		itertools-0.9.0 \
 		lazy_static-1.4.0 \
+		libadwaita-0.3.1 \
+		libadwaita-sys-0.3.0 \
 		libc-0.2.123 \
 		locale_config-0.3.0 \
 		log-0.4.16 \
 		malloc_buf-0.0.6 \
-		memchr-2.4.1 \
+		memchr-2.5.0 \
 		memoffset-0.6.5 \
-		muldiv-0.2.1 \
+		muldiv-1.0.1 \
 		num-integer-0.1.44 \
-		num-rational-0.3.2 \
+		num-rational-0.4.1 \
 		num-traits-0.2.14 \
 		objc-0.2.7 \
 		objc-foundation-0.1.1 \
 		objc_id-0.1.1 \
 		once_cell-1.10.0 \
+		option-operations-0.5.0 \
+		pango-0.17.0 \
+		pango-sys-0.17.0 \
 		paste-1.0.7 \
 		pest-2.1.3 \
 		pin-project-lite-0.2.8 \
 		pin-utils-0.1.0 \
 		pkg-config-0.3.25 \
-		pretty-hex-0.2.1 \
+		pretty-hex-0.3.0 \
 		pretty_env_logger-0.4.0 \
-		proc-macro-crate-0.1.5 \
 		proc-macro-crate-1.1.3 \
 		proc-macro-error-1.0.4 \
 		proc-macro-error-attr-1.0.4 \
 		proc-macro2-1.0.37 \
 		quick-error-1.2.3 \
-		quick-xml-0.22.0 \
 		quote-1.0.18 \
 		regex-1.5.5 \
 		regex-syntax-0.6.25 \
@@ -75,26 +90,18 @@ CARGO_CRATES=	aho-corasick-0.7.18 \
 		serde-1.0.136 \
 		slab-0.4.6 \
 		smallvec-1.8.0 \
-		strum-0.18.0 \
-		strum_macros-0.18.0 \
 		syn-1.0.91 \
-		system-deps-1.3.2 \
 		system-deps-6.0.2 \
 		temp-dir-0.1.11 \
 		termcolor-1.1.3 \
 		thiserror-1.0.30 \
 		thiserror-impl-1.0.30 \
 		toml-0.5.8 \
 		ucd-trie-0.1.3 \
-		unicode-segmentation-1.9.0 \
 		unicode-xid-0.2.2 \
-		version-compare-0.0.10 \
 		version-compare-0.1.0 \
 		version_check-0.9.4 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-util-0.1.5 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		gdk4,gdk4-sys,gsk4,gsk4-sys,gtk4,gtk4-macros,gtk4-sys@git+https://github.com/gtk-rs/gtk4-rs\#851001b57ce913bc7f416845d401a8922630c64a \
-		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/gtk-rs-core\#597c827646a7ab73346226c9433b7fb9631e4ad4 \
-		libadwaita,libadwaita-sys@git+https://gitlab.gnome.org/World/Rust/libadwaita-rs\#9d5e5e7eba9257ad557e9f16b68ef9f6c99e5d3e
+		winapi-x86_64-pc-windows-gnu-0.4.0