git: 1f146095af54 - main - x11-toolkits/gtk40: remove CLOUDPRINT option; fix cups configure (+)

[Dima Panov]

The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1f146095af5492ccd864bb7514a24650b1002b0a

commit 1f146095af5492ccd864bb7514a24650b1002b0a
Author:     Dima Panov <fluffy at FreeBSD.org>
AuthorDate: 2021-08-21 19:44:16 +0000
Commit:     Dima Panov <fluffy at FreeBSD.org>
CommitDate: 2021-08-21 19:48:13 +0000

    x11-toolkits/gtk40: remove CLOUDPRINT option; fix cups configure (+)
    
    * Cloudprint support was removed since gtk40 4.3.2
    * The correct spelling for the cups option (for meson configuration) is 'print-cups'.
    
    PR:             257986
---
 x11-toolkits/gtk40/Makefile  | 12 +++---------
 x11-toolkits/gtk40/pkg-plist |  1 -
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/x11-toolkits/gtk40/Makefile b/x11-toolkits/gtk40/Makefile
index 305c99a4254e..afe2e452bf33 100644
--- a/x11-toolkits/gtk40/Makefile
+++ b/x11-toolkits/gtk40/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	gtk
 PORTVERSION=	4.3.2
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	4
@@ -47,7 +48,7 @@ GLIB_SCHEMAS=	org.gtk.Demo4.gschema.xml \
 LDFLAGS+=	-fuse-ld=lld
 .endif
 
-OPTIONS_DEFINE=	CUPS CLOUDPRINT COLORD DEBUG BROADWAY FFMPEG \
+OPTIONS_DEFINE=	CUPS COLORD DEBUG BROADWAY FFMPEG \
 		GSTREAMER VULKAN WAYLAND X11
 OPTIONS_DEFAULT=CUPS COLORD BROADWAY VULKAN WAYLAND X11
 OPTIONS_SUB=	yes
@@ -60,14 +61,7 @@ COLORD_LIB_DEPENDS=	libcolord.so:graphics/colord
 COLORD_MESON_ENABLED=	colord
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
-CUPS_MESON_ENABLED=	cups
-
-CLOUDPRINT_DESC=	Cloud printing support
-CLOUDPRINT_MESON_ENABLED=	cloudprint
-CLOUDPRINT_USE=		gnome=libxml2
-CLOUDPRINT_LIB_DEPENDS=	librest-0.7.so:devel/librest \
-			libsoup-2.4.so:devel/libsoup \
-			libjson-glib-1.0.so:devel/json-glib
+CUPS_MESON_ENABLED=	print-cups
 
 FFMPEG_DESC=		FFmpeg multimedia backend
 FFMPEG_MESON_ENABLED=	media-ffmpeg
diff --git a/x11-toolkits/gtk40/pkg-plist b/x11-toolkits/gtk40/pkg-plist
index 643d2d33ad1a..15d8ad054542 100644
--- a/x11-toolkits/gtk40/pkg-plist
+++ b/x11-toolkits/gtk40/pkg-plist
@@ -377,7 +377,6 @@ lib/girepository-1.0/Gsk-4.0.typelib
 lib/girepository-1.0/Gtk-4.0.typelib
 %%FFMPEG%%lib/gtk-4.0/4.0.0/media/libmedia-ffmpeg.so
 %%GSTREAMER%%lib/gtk-4.0/4.0.0/media/libmedia-gstreamer.so
-%%CLOUDPRINT%%lib/gtk-4.0/4.0.0/printbackends/libprintbackend-cloudprint.so
 %%CUPS%%lib/gtk-4.0/4.0.0/printbackends/libprintbackend-cups.so
 lib/gtk-4.0/4.0.0/printbackends/libprintbackend-file.so
 %%NO_CUPS%%lib/gtk-4.0/4.0.0/printbackends/libprintbackend-lpr.so