From owner-dev-commits-ports-all@freebsd.org Sat Aug 21 19:48:26 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 028C96779A2; Sat, 21 Aug 2021 19:48:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GsTZd6Mkbz3FhP; Sat, 21 Aug 2021 19:48:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C39C712DDF; Sat, 21 Aug 2021 19:48:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17LJmPpB056201; Sat, 21 Aug 2021 19:48:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17LJmPFJ056200; Sat, 21 Aug 2021 19:48:25 GMT (envelope-from git) Date: Sat, 21 Aug 2021 19:48:25 GMT Message-Id: <202108211948.17LJmPFJ056200@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 1f146095af54 - main - x11-toolkits/gtk40: remove CLOUDPRINT option; fix cups configure (+) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f146095af5492ccd864bb7514a24650b1002b0a Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Aug 2021 19:48:26 -0000 The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=1f146095af5492ccd864bb7514a24650b1002b0a commit 1f146095af5492ccd864bb7514a24650b1002b0a Author: Dima Panov AuthorDate: 2021-08-21 19:44:16 +0000 Commit: Dima Panov 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