devel/gnome-builder: Update to 41.1

3 files changed, 66 insertions, 29 deletions

diff --git a/devel/gnome-builder/Makefile b/devel/gnome-builder/Makefile
index f6273cab22da..8d06d39c3dc8 100644
--- a/devel/gnome-builder/Makefile
+++ b/devel/gnome-builder/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gnome-builder
-PORTVERSION=	3.40.2
+PORTVERSION=	41.1
 CATEGORIES=	devel gnome
-MASTER_SITES=	GNOME
+MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -10,22 +10,24 @@ COMMENT=	IDE for writing software for GNOME
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
-		libjson-glib-1.0.so:devel/json-glib \
-		libpeas-1.0.so:devel/libpeas \
-		libjsonrpc-glib-1.0.so:devel/jsonrpc-glib \
-		libtemplate_glib-1.0.so:devel/template-glib \
+LIB_DEPENDS=	libcmark.so:textproc/cmark \
 		libdazzle-1.0.so:x11-toolkits/libdazzle \
-		libenchant-2.so:textproc/enchant2 \
-		libgspell-1.so:textproc/gspell \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
 		libdevhelp-3.so:devel/devhelp \
+		libenchant-2.so:textproc/enchant2 \
+		libfontconfig.so:x11-fonts/fontconfig \
 		libgit2-glib-1.0.so:devel/libgit2-glib \
-		libsoup-2.4.so:devel/libsoup \
+		libgit2.so:devel/libgit2 \
+		libgladeui-2.so:devel/glade \
+		libgspell-1.so:textproc/gspell \
+		libjson-glib-1.0.so:devel/json-glib \
+		libjsonrpc-glib-1.0.so:devel/jsonrpc-glib \
 		libpcre.so:devel/pcre \
+		libpeas-1.0.so:devel/libpeas \
+		libportal.so:deskutils/libportal \
+		libsoup-2.4.so:devel/libsoup \
+		libtemplate_glib-1.0.so:devel/template-glib \
 		libvala-0.48.so:lang/vala \
-		libgit2.so:devel/libgit2 \
-		libgladeui-2.so:devel/glade
+		libwebkit2gtk-4.0.so:www/webkit2-gtk3
 
 PORTSCOUT=	limitw:1,even
 PORTDOCS=	*
@@ -33,19 +35,19 @@ PORTDOCS=	*
 CONFLICTS_BUILD=	gnome-builder-3.16.*
 
 USES=		compiler:c++11-lang desktop-file-utils gettext gnome \
-		localbase:lfdlags meson pkgconfig python:3.6+,build tar:xz \
-		shebangfix
+		localbase:lfdlags meson pkgconfig python:3.6+,build shebangfix \
+		tar:xz
 USE_GNOME=	cairo gtksourceview4 introspection libxml2 vte3
-SHEBANG_FILES=	${WRKSRC}/src/plugins/maven/maven_plugin.py \
-		${WRKSRC}/src/plugins/gradle/gradle_plugin.py
+SHEBANG_FILES=	${WRKSRC}/src/plugins/gradle/gradle_plugin.py \
+		${WRKSRC}/src/plugins/maven/maven_plugin.py
 USE_LDCONFIG=	yes
 BINARY_ALIAS=	python3=${PYTHON_VERSION}
 
 MESON_ARGS=	-Dplugin_color_picker=false \
 		-Dplugin_flatpak=false \
-		-Dplugin_sysprof=false \
-		-Dplugin_qemu=false \
 		-Dplugin_jhbuild=false \
+		-Dplugin_qemu=false \
+		-Dplugin_sysprof=false \
 		-Dplugin_update_manager=false
 
 PLIST_SUB=	BUILDER_VERSION=${PORTVERSION:R}
@@ -68,13 +70,13 @@ GLIB_SCHEMAS=	org.gnome.builder.build.gschema.xml \
 		org.gnome.builder.terminal.gschema.xml \
 		org.gnome.builder.workbench.gschema.xml
 
-OPTIONS_SUB=	YES
-OPTIONS_DEFINE=	CLANG DOCS
+OPTIONS_SUB=		YES
+OPTIONS_DEFINE=		CLANG DOCS
 OPTIONS_DEFAULT=	CLANG
 
 # track the latest llvm/clang version, the config script picks the newest available
-LLVM_VER=	${LLVM_DEFAULT}
-CLANG_DESC=	Build the clang plugin
+LLVM_VER=		${LLVM_DEFAULT}
+CLANG_DESC=		Build the clang plugin
 CLANG_MESON_TRUE=	plugin_clang
 CLANG_BUILD_DEPENDS=	llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
 CLANG_RUN_DEPENDS=	llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
diff --git a/devel/gnome-builder/distinfo b/devel/gnome-builder/distinfo
index 64d17148932c..7fc760d05ce3 100644
--- a/devel/gnome-builder/distinfo
+++ b/devel/gnome-builder/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622307895
-SHA256 (gnome/gnome-builder-3.40.2.tar.xz) = b2844cfde821311939fb6ed3b18a49cd331413aea720393091583ab6a99e719a
-SIZE (gnome/gnome-builder-3.40.2.tar.xz) = 12083992
+TIMESTAMP = 1636831734
+SHA256 (gnome/gnome-builder-41.1.tar.xz) = 5d55e4aaa2a4758a46263d1c7fd009cb3db4455e0ed7f9e44c3a1634861fa38a
+SIZE (gnome/gnome-builder-41.1.tar.xz) = 12702800
diff --git a/devel/gnome-builder/pkg-plist b/devel/gnome-builder/pkg-plist
index c838c2568a46..641f1c54305d 100644
--- a/devel/gnome-builder/pkg-plist
+++ b/devel/gnome-builder/pkg-plist
@@ -268,8 +268,35 @@ include/gnome-builder-%%BUILDER_VERSION%%/libide/vcs/ide-vcs-tag.h
 include/gnome-builder-%%BUILDER_VERSION%%/libide/vcs/ide-vcs-uri.h
 include/gnome-builder-%%BUILDER_VERSION%%/libide/vcs/ide-vcs.h
 include/gnome-builder-%%BUILDER_VERSION%%/libide/vcs/libide-vcs.h
-lib/gnome-builder/girepository-1.0/Ide-%%BUILDER_VERSION%%.typelib
-lib/gnome-builder/pkgconfig/gnome-builder-%%BUILDER_VERSION%%.pc
+include/gnome-builder/gstyle/gstyle-animation.h
+include/gnome-builder/gstyle/gstyle-cielab.h
+include/gnome-builder/gstyle/gstyle-color-component.h
+include/gnome-builder/gstyle/gstyle-color-convert.h
+include/gnome-builder/gstyle/gstyle-color-filter.h
+include/gnome-builder/gstyle/gstyle-color-item.h
+include/gnome-builder/gstyle/gstyle-color-panel-actions.h
+include/gnome-builder/gstyle/gstyle-color-panel-private.h
+include/gnome-builder/gstyle/gstyle-color-panel.h
+include/gnome-builder/gstyle/gstyle-color-plane.h
+include/gnome-builder/gstyle/gstyle-color-predefined.h
+include/gnome-builder/gstyle/gstyle-color-scale.h
+include/gnome-builder/gstyle/gstyle-color-widget-actions.h
+include/gnome-builder/gstyle/gstyle-color-widget.h
+include/gnome-builder/gstyle/gstyle-color.h
+include/gnome-builder/gstyle/gstyle-colorlexer.h
+include/gnome-builder/gstyle/gstyle-css-provider.h
+include/gnome-builder/gstyle/gstyle-hsv.h
+include/gnome-builder/gstyle/gstyle-palette-widget.h
+include/gnome-builder/gstyle/gstyle-palette.h
+include/gnome-builder/gstyle/gstyle-private.h
+include/gnome-builder/gstyle/gstyle-rename-popover.h
+include/gnome-builder/gstyle/gstyle-revealer.h
+include/gnome-builder/gstyle/gstyle-slidein.h
+include/gnome-builder/gstyle/gstyle-types.h
+include/gnome-builder/gstyle/gstyle-utils.h
+include/gnome-builder/gstyle/gstyle-xyz.h
+lib/gnome-builder/girepository-1.0/Ide-%%BUILDER_VERSION%%.0.typelib
+lib/gnome-builder/pkgconfig/gnome-builder-%%BUILDER_VERSION%%.1.pc
 lib/gnome-builder/plugins/cargo.plugin
 lib/gnome-builder/plugins/cargo_plugin.py
 lib/gnome-builder/plugins/copyright.plugin
@@ -289,6 +316,8 @@ lib/gnome-builder/plugins/gvls_plugin.py
 lib/gnome-builder/plugins/html-preview.plugin
 lib/gnome-builder/plugins/html_preview.gresource
 lib/gnome-builder/plugins/html_preview.py
+lib/gnome-builder/plugins/jedi-language-server.plugin
+lib/gnome-builder/plugins/jedi_language_server_plugin.py
 lib/gnome-builder/plugins/make.plugin
 lib/gnome-builder/plugins/make_plugin.gresource
 lib/gnome-builder/plugins/make_plugin.py
@@ -308,6 +337,8 @@ lib/gnome-builder/plugins/python_gi_imports_completion.py
 lib/gnome-builder/plugins/stylelint.plugin
 lib/gnome-builder/plugins/stylelint_plugin.py
 lib/gnome-builder/plugins/vala-pack.plugin
+lib/gnome-builder/plugins/vala_langserv.plugin
+lib/gnome-builder/plugins/vala_langserv.py
 lib/gnome-builder/plugins/vala_pack_plugin.py
 lib/gnome-builder/plugins/valgrind.plugin
 lib/gnome-builder/plugins/valgrind_plugin.gresource
@@ -320,7 +351,7 @@ libexec/gnome-builder-git
 share/applications/org.gnome.Builder.desktop
 share/dbus-1/services/org.gnome.Builder.service
 %%DATADIR%%/fonts/BuilderBlocks.ttf
-%%DATADIR%%/gir-1.0/Ide-%%BUILDER_VERSION%%.gir
+%%DATADIR%%/gir-1.0/Ide-%%BUILDER_VERSION%%.0.gir
 %%DATADIR%%/icons/hicolor/16x16/actions/builder-build-configure-symbolic.symbolic.png
 %%DATADIR%%/icons/hicolor/16x16/actions/builder-build-symbolic.symbolic.png
 %%DATADIR%%/icons/hicolor/16x16/actions/builder-debugger-symbolic.symbolic.png
@@ -681,6 +712,7 @@ share/dbus-1/services/org.gnome.Builder.service
 %%DATADIR%%/icons/hicolor/64x64/mimetypes/text-x-vala-symbolic.symbolic.png
 %%DATADIR%%/icons/hicolor/64x64/mimetypes/text-xml-symbolic.symbolic.png
 %%DATADIR%%/icons/hicolor/scalable/actions/builder-build-configure-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/builder-build-stop-symbolic.svg
 %%DATADIR%%/icons/hicolor/scalable/actions/builder-build-symbolic.svg
 %%DATADIR%%/icons/hicolor/scalable/actions/builder-debugger-symbolic.svg
 %%DATADIR%%/icons/hicolor/scalable/actions/builder-documentation-symbolic.svg
@@ -688,6 +720,8 @@ share/dbus-1/services/org.gnome.Builder.service
 %%DATADIR%%/icons/hicolor/scalable/actions/builder-move-left-symbolic.svg
 %%DATADIR%%/icons/hicolor/scalable/actions/builder-move-right-symbolic.svg
 %%DATADIR%%/icons/hicolor/scalable/actions/builder-profiler-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/builder-run-start-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/builder-run-stop-symbolic.svg
 %%DATADIR%%/icons/hicolor/scalable/actions/builder-split-tab-left-symbolic.svg
 %%DATADIR%%/icons/hicolor/scalable/actions/builder-split-tab-right-symbolic.svg
 %%DATADIR%%/icons/hicolor/scalable/actions/builder-split-tab-symbolic.svg
@@ -751,6 +785,7 @@ share/dbus-1/services/org.gnome.Builder.service
 %%DATADIR%%/icons/hicolor/scalable/actions/xml-declaration-symbolic.svg
 %%DATADIR%%/icons/hicolor/scalable/actions/xml-element-symbolic.svg
 %%DATADIR%%/icons/hicolor/scalable/apps/org.gnome.Builder-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/apps/org.gnome.Builder.Devel.svg
 %%DATADIR%%/icons/hicolor/scalable/apps/org.gnome.Builder.svg
 %%DATADIR%%/icons/hicolor/scalable/mimetypes/application-x-php-symbolic.svg
 %%DATADIR%%/icons/hicolor/scalable/mimetypes/text-css-symbolic.svg