audio/gnome-music: Update to 42.0

3 files changed, 38 insertions, 19 deletions

diff --git a/audio/gnome-music/Makefile b/audio/gnome-music/Makefile
index 9625f212969a..76e8f2c0912b 100644
--- a/audio/gnome-music/Makefile
+++ b/audio/gnome-music/Makefile
@@ -1,14 +1,11 @@
 # Created by: Gustau Perez <gustau.perez@gmail.com>
 
 PORTNAME=	gnome-music
-PORTVERSION=	41.0
+PORTVERSION=	42.0
 CATEGORIES=	audio gnome
 MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 DIST_SUBDIR=	gnome3
 
-PATCH_SITES=	https://gitlab.gnome.org/GNOME/${PORTNAME}/-/commit/
-PATCHFILES+=	d9f35b542adb.patch:-p1 # https://gitlab.gnome.org/GNOME/gnome-music/-/merge_requests/899
-
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME music playing application
 
@@ -18,7 +15,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	appstream-util:devel/appstream-glib \
 		grilo-plugins>0:net/grilo-plugins \
 		itstool:textproc/itstool
-LIB_DEPENDS=	libdazzle-1.0.so:x11-toolkits/libdazzle \
+LIB_DEPENDS=	libadwaita-1.so:x11-toolkits/libadwaita \
+		libdazzle-1.0.so:x11-toolkits/libdazzle \
 		libgoa-1.0.so:net/gnome-online-accounts \
 		libgrilo-0.3.so:net/grilo \
 		libhandy-1.so:x11-toolkits/libhandy \
@@ -31,7 +29,7 @@ PORTSCOUT=	limitw:1,even
 USES=		desktop-file-utils gettext gnome localbase meson pkgconfig \
 		python:3.4+ shebangfix tar:xz
 USE_LDCONFIG=	yes
-USE_GNOME=	cairo gtk30 introspection pygobject3
+USE_GNOME=	cairo gtk40 introspection pygobject3
 USE_GSTREAMER1=	mpg123 ogg
 SHEBANG_FILES=	gnome-music.in
 BINARY_ALIAS=	python3=${PYTHON_VERSION}
diff --git a/audio/gnome-music/distinfo b/audio/gnome-music/distinfo
index 35ca6544c984..66704ed96135 100644
--- a/audio/gnome-music/distinfo
+++ b/audio/gnome-music/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1632712899
-SHA256 (gnome3/gnome-music-41.0.tar.xz) = 69b13567a87dc77dcf0c926d71d0fa2ebfa5a97f37817828df71d8a1b0129fd2
-SIZE (gnome3/gnome-music-41.0.tar.xz) = 898652
-SHA256 (gnome3/d9f35b542adb.patch) = a9167b7ad5c8d3b91ff8f2dbd9c13b3aa2bfb737fa7c82362192b3c0dfb75961
-SIZE (gnome3/d9f35b542adb.patch) = 1035
+TIMESTAMP = 1648060634
+SHA256 (gnome3/gnome-music-42.0.tar.xz) = 9d68198f9852bde0f834584b96a812897d310cb71728b6a4f098bcb29b19c5d0
+SIZE (gnome3/gnome-music-42.0.tar.xz) = 1651960
diff --git a/audio/gnome-music/pkg-plist b/audio/gnome-music/pkg-plist
index 5b74f78cb589..225c4747d881 100644
--- a/audio/gnome-music/pkg-plist
+++ b/audio/gnome-music/pkg-plist
@@ -1,7 +1,4 @@
 bin/gnome-music
-lib/org.gnome.Music/girepository-1.0/Gfm-0.1.typelib
-lib/org.gnome.Music/libgfm-0.1.so
-lib/org.gnome.Music/pkgconfig/gfm-0.1.pc
 %%PYTHON_SITELIBDIR%%/gnomemusic/__init__.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/albumart.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/application.py
@@ -15,25 +12,27 @@ lib/org.gnome.Music/pkgconfig/gfm-0.1.pc
 %%PYTHON_SITELIBDIR%%/gnomemusic/coremodel.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/coreselection.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/coresong.py
+%%PYTHON_SITELIBDIR%%/gnomemusic/coverpaintable.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/defaulticon.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/embeddedart.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/fileexistsasync.py
+%%PYTHON_SITELIBDIR%%/gnomemusic/griloartqueue.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/grilowrappers/__init__.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/grilowrappers/grlsearchwrapper.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/grilowrappers/grltrackerplaylists.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/grilowrappers/grltrackerwrapper.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/gstplayer.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/inhibitsuspend.py
-%%PYTHON_SITELIBDIR%%/gnomemusic/mediakeys.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/mpris.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/musiclogger.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/notificationmanager.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/pauseonsuspend.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/player.py
+%%PYTHON_SITELIBDIR%%/gnomemusic/playlisttoast.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/scrobbler.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/search.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/songart.py
-%%PYTHON_SITELIBDIR%%/gnomemusic/songliststore.py
+%%PYTHON_SITELIBDIR%%/gnomemusic/songtoast.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/storeart.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/trackerwrapper.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/utils.py
@@ -53,10 +52,9 @@ lib/org.gnome.Music/pkgconfig/gfm-0.1.pc
 %%PYTHON_SITELIBDIR%%/gnomemusic/widgets/artistsearchtile.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/widgets/artisttile.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/widgets/artstack.py
-%%PYTHON_SITELIBDIR%%/gnomemusic/widgets/disclistboxwidget.py
+%%PYTHON_SITELIBDIR%%/gnomemusic/widgets/discbox.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/widgets/headerbar.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/widgets/lastfmdialog.py
-%%PYTHON_SITELIBDIR%%/gnomemusic/widgets/notificationspopup.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/widgets/playertoolbar.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/widgets/playlistcontrols.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/widgets/playlistdialog.py
@@ -321,6 +319,19 @@ share/help/ro/gnome-music/playlist-remove-songs.page
 share/help/ro/gnome-music/playlist-repeat.page
 share/help/ro/gnome-music/playlist-shuffle.page
 share/help/ro/gnome-music/search.page
+share/help/ru/gnome-music/figures/org.gnome.Music.svg
+share/help/ru/gnome-music/index.page
+share/help/ru/gnome-music/introduction.page
+share/help/ru/gnome-music/legal.xml
+share/help/ru/gnome-music/play-music.page
+share/help/ru/gnome-music/playlist-create-albums.page
+share/help/ru/gnome-music/playlist-create-artists.page
+share/help/ru/gnome-music/playlist-create-songs.page
+share/help/ru/gnome-music/playlist-delete.page
+share/help/ru/gnome-music/playlist-remove-songs.page
+share/help/ru/gnome-music/playlist-repeat.page
+share/help/ru/gnome-music/playlist-shuffle.page
+share/help/ru/gnome-music/search.page
 share/help/sv/gnome-music/figures/org.gnome.Music.svg
 share/help/sv/gnome-music/index.page
 share/help/sv/gnome-music/introduction.page
@@ -334,6 +345,19 @@ share/help/sv/gnome-music/playlist-remove-songs.page
 share/help/sv/gnome-music/playlist-repeat.page
 share/help/sv/gnome-music/playlist-shuffle.page
 share/help/sv/gnome-music/search.page
+share/help/tr/gnome-music/figures/org.gnome.Music.svg
+share/help/tr/gnome-music/index.page
+share/help/tr/gnome-music/introduction.page
+share/help/tr/gnome-music/legal.xml
+share/help/tr/gnome-music/play-music.page
+share/help/tr/gnome-music/playlist-create-albums.page
+share/help/tr/gnome-music/playlist-create-artists.page
+share/help/tr/gnome-music/playlist-create-songs.page
+share/help/tr/gnome-music/playlist-delete.page
+share/help/tr/gnome-music/playlist-remove-songs.page
+share/help/tr/gnome-music/playlist-repeat.page
+share/help/tr/gnome-music/playlist-shuffle.page
+share/help/tr/gnome-music/search.page
 share/help/uk/gnome-music/figures/org.gnome.Music.svg
 share/help/uk/gnome-music/index.page
 share/help/uk/gnome-music/introduction.page
@@ -415,5 +439,4 @@ share/locale/zh_CN/LC_MESSAGES/org.gnome.Music.mo
 share/locale/zh_HK/LC_MESSAGES/org.gnome.Music.mo
 share/locale/zh_TW/LC_MESSAGES/org.gnome.Music.mo
 share/metainfo/org.gnome.Music.appdata.xml
-share/org.gnome.Music/gir-1.0/Gfm-0.1.gir
 share/org.gnome.Music/org.gnome.Music.gresource