Re: git: ac51135afd4b - main - audio/py-mutagen: Update to 1.45.1
Date: Mon, 10 Jan 2022 03:41:05 UTC
Hello,
I pretty messed with this commit, IDK how but for some reason I
accidentally added WIP ports files mixed with this specific one.
Fortunately most ports are maintained by me...
Anyway, how is the best way to solve it?
Sorry about that.
Thank you.
On Mon, Jan 10, 2022 at 03:26:13AM +0000, Alexandre C. Guimarães wrote:
> The branch main has been updated by rigoletto:
>
> URL: https://cgit.FreeBSD.org/ports/commit/?id=ac51135afd4b80e453a540c5d8e09d522ef607ed
>
> commit ac51135afd4b80e453a540c5d8e09d522ef607ed
> Author: Alexandre C. Guimarães <rigoletto@FreeBSD.org>
> AuthorDate: 2022-01-10 03:18:16 +0000
> Commit: Alexandre C. Guimarães <rigoletto@FreeBSD.org>
> CommitDate: 2022-01-10 03:24:13 +0000
>
> audio/py-mutagen: Update to 1.45.1
>
> PR: 259241
> ---
> audio/beets/Makefile | 8 ++++----
> audio/beets/distinfo | 6 +++---
> audio/py-mutagen/Makefile | 6 ++----
> audio/py-mutagen/distinfo | 6 +++---
> editors/texstudio/Makefile | 2 +-
> editors/texstudio/distinfo | 6 +++---
> x11-wm/leftwm/Makefile | 4 +++-
> x11-wm/leftwm/distinfo | 6 +++---
> ...rc_display__servers_xlib__display__server_xwrap_getters.rs | 11 -----------
> 9 files changed, 22 insertions(+), 33 deletions(-)
>
> diff --git a/audio/beets/Makefile b/audio/beets/Makefile
> index be43c7e2d2b2..007622fa6991 100644
> --- a/audio/beets/Makefile
> +++ b/audio/beets/Makefile
> @@ -1,12 +1,11 @@
> # Created by: Mark Felder <feld@FreeBSD.org>
>
> PORTNAME= beets
> -PORTVERSION= 1.4.9
> -PORTREVISION= 4
> +DISTVERSION= 1.5.0
> CATEGORIES= audio python
> MASTER_SITES= CHEESESHOP
>
> -MAINTAINER= stiginge@pvv.org
> +MAINTAINER= rigoletto@FreeBSD.org
> COMMENT= Media library management system for obsessive-compulsive music geeks
>
> LICENSE= MIT
> @@ -14,6 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
>
> RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}confuse>=1.0.0:devel/py-confuse@${PY_FLAVOR} \
> ${PYTHON_PKGNAMEPREFIX}jellyfish>=0:devel/py-jellyfish@${PY_FLAVOR} \
> + ${PYTHON_PKGNAMEPREFIX}mediafile>=0:devel/py-mediafile@${PY_FLAVOR} \
> ${PYTHON_PKGNAMEPREFIX}munkres>=0:math/py-munkres@${PY_FLAVOR} \
> ${PYTHON_PKGNAMEPREFIX}musicbrainzngs>=0.4:audio/py-musicbrainzngs@${PY_FLAVOR} \
> ${PYTHON_PKGNAMEPREFIX}mutagen>=1.33:audio/py-mutagen@${PY_FLAVOR} \
> @@ -68,7 +68,7 @@ DISCOGS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}discogs-client>=2.2.1:audio/py-disco
> EMBYUPDATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
> FETCHART_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
> FFMPEG_RUN_DEPENDS= ffmpeg>=2:multimedia/ffmpeg
> -IMAGEMAGICK_USES= magick:6,run
> +IMAGEMAGICK_RUN_DEPENDS= convert:graphics/ImageMagick6
> IPFS_RUN_DEPENDS= ipfs-go:sysutils/ipfs-go
> KODIUPDATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
> LASTFM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pylast>=0:audio/py-pylast@${PY_FLAVOR}
> diff --git a/audio/beets/distinfo b/audio/beets/distinfo
> index fe8945c5f1dc..d546ec7c00f1 100644
> --- a/audio/beets/distinfo
> +++ b/audio/beets/distinfo
> @@ -1,3 +1,3 @@
> -TIMESTAMP = 1563041253
> -SHA256 (beets-1.4.9.tar.gz) = d29b432cab0c80947b5229f548762948c4dd4a430e5d02760bfeb95da3cc8054
> -SIZE (beets-1.4.9.tar.gz) = 1494459
> +TIMESTAMP = 1634494538
> +SHA256 (beets-1.5.0.tar.gz) = 887f7bbac0fc14c49469e50d406fd216f914a27acf3818c6503c223f9825342b
> +SIZE (beets-1.5.0.tar.gz) = 1694845
> diff --git a/audio/py-mutagen/Makefile b/audio/py-mutagen/Makefile
> index ad90d2aee013..a4a062123221 100644
> --- a/audio/py-mutagen/Makefile
> +++ b/audio/py-mutagen/Makefile
> @@ -1,8 +1,7 @@
> # Created by: Byung-Hee HWANG <bh@izb.knu.ac.kr>
>
> PORTNAME= mutagen
> -PORTVERSION= 1.42.0
> -PORTREVISION= 2
> +DISTVERSION= 1.45.1
> CATEGORIES= audio python
> MASTER_SITES= CHEESESHOP
> PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
> @@ -13,9 +12,8 @@ COMMENT= Python-based audio metadata tag reader and writer
> LICENSE= GPLv2+
> LICENSE_FILE= ${WRKSRC}/COPYING
>
> -NO_ARCH= yes
> USES= python:3.6+ shebangfix
> USE_PYTHON= autoplist concurrent distutils
> -SHEBANG_FILES= tools/*
> +NO_ARCH= yes
>
> .include <bsd.port.mk>
> diff --git a/audio/py-mutagen/distinfo b/audio/py-mutagen/distinfo
> index 0929daca39bc..04426425bed8 100644
> --- a/audio/py-mutagen/distinfo
> +++ b/audio/py-mutagen/distinfo
> @@ -1,3 +1,3 @@
> -TIMESTAMP = 1545878369
> -SHA256 (mutagen-1.42.0.tar.gz) = bb61e2456f59a9a4a259fbc08def6d01ba45a42da8eeaa97d00633b0ec5de71c
> -SIZE (mutagen-1.42.0.tar.gz) = 925894
> +TIMESTAMP = 1634514061
> +SHA256 (mutagen-1.45.1.tar.gz) = 6397602efb3c2d7baebd2166ed85731ae1c1d475abca22090b7141ff5034b3e1
> +SIZE (mutagen-1.45.1.tar.gz) = 1285455
> diff --git a/editors/texstudio/Makefile b/editors/texstudio/Makefile
> index 34e1a2091f01..9c94580de4e7 100644
> --- a/editors/texstudio/Makefile
> +++ b/editors/texstudio/Makefile
> @@ -1,5 +1,5 @@
> PORTNAME= texstudio
> -DISTVERSION= 4.1.2
> +DISTVERSION= 4.2.0
> CATEGORIES= editors
>
> MAINTAINER= rigoletto@FreeBSD.org
> diff --git a/editors/texstudio/distinfo b/editors/texstudio/distinfo
> index 3b9425643d5e..dc4558566da2 100644
> --- a/editors/texstudio/distinfo
> +++ b/editors/texstudio/distinfo
> @@ -1,3 +1,3 @@
> -TIMESTAMP = 1639584586
> -SHA256 (texstudio-org-texstudio-4.1.2_GH0.tar.gz) = 824cd1a2a806a6edb53f6cf3b64b623749c57586187989a94beda39960c9e644
> -SIZE (texstudio-org-texstudio-4.1.2_GH0.tar.gz) = 88666134
> +TIMESTAMP = 1641771298
> +SHA256 (texstudio-org-texstudio-4.2.0_GH0.tar.gz) = 89f18449205333e66f3505d1dc0a1965004f1eaf7b24166e5884194c6259c5bd
> +SIZE (texstudio-org-texstudio-4.2.0_GH0.tar.gz) = 88795988
> diff --git a/x11-wm/leftwm/Makefile b/x11-wm/leftwm/Makefile
> index 35ad34edc9a4..8dd7e1e8d56d 100644
> --- a/x11-wm/leftwm/Makefile
> +++ b/x11-wm/leftwm/Makefile
> @@ -1,5 +1,6 @@
> PORTNAME= leftwm
> -DISTVERSION= 0.2.11
> +DISTVERSION= 0.2.11-14
> +DISTVERSIONSUFFIX= -gacf2407
> CATEGORIES= x11-wm
>
> MAINTAINER= rigoletto@FreeBSD.org
> @@ -12,6 +13,7 @@ USES= cargo xorg
> USE_XORG= xinerama xrandr
>
> USE_GITHUB= yes
> +GH_TAGNAME= acf2407bc48286ff5388a3d301b5adef59150d52
>
> CARGO_CRATES= aho-corasick-0.7.18 \
> ansi_term-0.11.0 \
> diff --git a/x11-wm/leftwm/distinfo b/x11-wm/leftwm/distinfo
> index af165ec9fb07..c50a0a96fe57 100644
> --- a/x11-wm/leftwm/distinfo
> +++ b/x11-wm/leftwm/distinfo
> @@ -1,4 +1,4 @@
> -TIMESTAMP = 1639403261
> +TIMESTAMP = 1641072040
> SHA256 (rust/crates/aho-corasick-0.7.18.crate) = 1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f
> SIZE (rust/crates/aho-corasick-0.7.18.crate) = 112923
> SHA256 (rust/crates/ansi_term-0.11.0.crate) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b
> @@ -259,5 +259,5 @@ SHA256 (rust/crates/x11-dl-2.19.1.crate) = ea26926b4ce81a6f5d9d0f3a0bc401e5a37c6
> SIZE (rust/crates/x11-dl-2.19.1.crate) = 64664
> SHA256 (rust/crates/xdg-2.4.0.crate) = 3a23fe958c70412687039c86f578938b4a0bb50ec788e96bce4d6ab00ddd5803
> SIZE (rust/crates/xdg-2.4.0.crate) = 14035
> -SHA256 (leftwm-leftwm-0.2.11_GH0.tar.gz) = 3a2bd59f12566d94b6be3b162c95d280acbaec1b40da415cb42fe07332a5b709
> -SIZE (leftwm-leftwm-0.2.11_GH0.tar.gz) = 8548395
> +SHA256 (leftwm-leftwm-0.2.11-14-gacf2407-acf2407bc48286ff5388a3d301b5adef59150d52_GH0.tar.gz) = 48c602825e3461dd10c079fbdcc4e5a067bc1fa63edf14e1decec1253d049b7e
> +SIZE (leftwm-leftwm-0.2.11-14-gacf2407-acf2407bc48286ff5388a3d301b5adef59150d52_GH0.tar.gz) = 8552235
> diff --git a/x11-wm/leftwm/files/patch-leftwm-core_src_display__servers_xlib__display__server_xwrap_getters.rs b/x11-wm/leftwm/files/patch-leftwm-core_src_display__servers_xlib__display__server_xwrap_getters.rs
> deleted file mode 100644
> index 9b88f79804b0..000000000000
> --- a/x11-wm/leftwm/files/patch-leftwm-core_src_display__servers_xlib__display__server_xwrap_getters.rs
> +++ /dev/null
> @@ -1,11 +0,0 @@
> ---- leftwm-core/src/display_servers/xlib_display_server/xwrap/getters.rs.orig 2021-12-12 17:42:31 UTC
> -+++ leftwm-core/src/display_servers/xlib_display_server/xwrap/getters.rs
> -@@ -575,7 +575,7 @@ impl XWrap {
> - if status == 0 {
> - return Err(XlibError::FailedStatus);
> - }
> -- if let Ok(s) = CString::from_raw(text_prop.value.cast::<i8>()).into_string() {
> -+ if let Ok(s) = CString::from_raw(text_prop.value.cast::<nix::libc::c_char>()).into_string() {
> - return Ok(s);
> - }
> - };
--
rigoletto@FreeBSD.org | PGP 0x9921FCC0384017D9