From owner-dev-commits-ports-all@freebsd.org Wed Aug 18 09:30:37 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 427236743D1; Wed, 18 Aug 2021 09:30:37 +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 4GqN1917DYz3kRm; Wed, 18 Aug 2021 09:30:37 +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 0EEA96CDC; Wed, 18 Aug 2021 09:30:37 +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 17I9UaOj059971; Wed, 18 Aug 2021 09:30:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17I9UaeM059970; Wed, 18 Aug 2021 09:30:36 GMT (envelope-from git) Date: Wed, 18 Aug 2021 09:30:36 GMT Message-Id: <202108180930.17I9UaeM059970@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 327f6f14b6f2 - main - x11-toolkits/gtk40: unbreak packaging against various options. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 327f6f14b6f2a83def81f5ef06010307d869ba32 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: Wed, 18 Aug 2021 09:30:37 -0000 The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=327f6f14b6f2a83def81f5ef06010307d869ba32 commit 327f6f14b6f2a83def81f5ef06010307d869ba32 Author: Alexey Dokuchaev AuthorDate: 2021-08-18 09:26:34 +0000 Commit: Alexey Dokuchaev CommitDate: 2021-08-18 09:29:04 +0000 x11-toolkits/gtk40: unbreak packaging against various options. --- x11-toolkits/gtk40/pkg-plist | 77 ++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 38 deletions(-) diff --git a/x11-toolkits/gtk40/pkg-plist b/x11-toolkits/gtk40/pkg-plist index 88bd94615487..7514e501ba2e 100644 --- a/x11-toolkits/gtk40/pkg-plist +++ b/x11-toolkits/gtk40/pkg-plist @@ -1,4 +1,4 @@ -bin/gtk4-broadwayd +%%BROADWAY%%bin/gtk4-broadwayd bin/gtk4-builder-tool bin/gtk4-demo bin/gtk4-demo-application @@ -9,11 +9,11 @@ bin/gtk4-print-editor bin/gtk4-query-settings bin/gtk4-update-icon-cache bin/gtk4-widget-factory -include/gtk-4.0/gdk/broadway/gdkbroadway.h -include/gtk-4.0/gdk/broadway/gdkbroadwaycursor.h -include/gtk-4.0/gdk/broadway/gdkbroadwaydisplay.h -include/gtk-4.0/gdk/broadway/gdkbroadwaymonitor.h -include/gtk-4.0/gdk/broadway/gdkbroadwaysurface.h +%%BROADWAY%%include/gtk-4.0/gdk/broadway/gdkbroadway.h +%%BROADWAY%%include/gtk-4.0/gdk/broadway/gdkbroadwaycursor.h +%%BROADWAY%%include/gtk-4.0/gdk/broadway/gdkbroadwaydisplay.h +%%BROADWAY%%include/gtk-4.0/gdk/broadway/gdkbroadwaymonitor.h +%%BROADWAY%%include/gtk-4.0/gdk/broadway/gdkbroadwaysurface.h include/gtk-4.0/gdk/gdk-autocleanup.h include/gtk-4.0/gdk/gdk.h include/gtk-4.0/gdk/gdkapplaunchcontext.h @@ -63,30 +63,30 @@ include/gtk-4.0/gdk/gdktoplevelsize.h include/gtk-4.0/gdk/gdktypes.h include/gtk-4.0/gdk/gdkversionmacros.h include/gtk-4.0/gdk/gdkvulkancontext.h -include/gtk-4.0/gdk/wayland/gdkwayland.h -include/gtk-4.0/gdk/wayland/gdkwaylanddevice.h -include/gtk-4.0/gdk/wayland/gdkwaylanddisplay.h -include/gtk-4.0/gdk/wayland/gdkwaylandglcontext.h -include/gtk-4.0/gdk/wayland/gdkwaylandmonitor.h -include/gtk-4.0/gdk/wayland/gdkwaylandseat.h -include/gtk-4.0/gdk/wayland/gdkwaylandsurface.h -include/gtk-4.0/gdk/x11/gdkx-autocleanups.h -include/gtk-4.0/gdk/x11/gdkx.h -include/gtk-4.0/gdk/x11/gdkx11applaunchcontext.h -include/gtk-4.0/gdk/x11/gdkx11device-xi2.h -include/gtk-4.0/gdk/x11/gdkx11device.h -include/gtk-4.0/gdk/x11/gdkx11devicemanager-xi2.h -include/gtk-4.0/gdk/x11/gdkx11devicemanager.h -include/gtk-4.0/gdk/x11/gdkx11display.h -include/gtk-4.0/gdk/x11/gdkx11dnd.h -include/gtk-4.0/gdk/x11/gdkx11glcontext.h -include/gtk-4.0/gdk/x11/gdkx11monitor.h -include/gtk-4.0/gdk/x11/gdkx11property.h -include/gtk-4.0/gdk/x11/gdkx11screen.h -include/gtk-4.0/gdk/x11/gdkx11selection.h -include/gtk-4.0/gdk/x11/gdkx11surface.h -include/gtk-4.0/gdk/x11/gdkx11utils.h -include/gtk-4.0/gsk/broadway/gskbroadwayrenderer.h +%%WAYLAND%%include/gtk-4.0/gdk/wayland/gdkwayland.h +%%WAYLAND%%include/gtk-4.0/gdk/wayland/gdkwaylanddevice.h +%%WAYLAND%%include/gtk-4.0/gdk/wayland/gdkwaylanddisplay.h +%%WAYLAND%%include/gtk-4.0/gdk/wayland/gdkwaylandglcontext.h +%%WAYLAND%%include/gtk-4.0/gdk/wayland/gdkwaylandmonitor.h +%%WAYLAND%%include/gtk-4.0/gdk/wayland/gdkwaylandseat.h +%%WAYLAND%%include/gtk-4.0/gdk/wayland/gdkwaylandsurface.h +%%X11%%include/gtk-4.0/gdk/x11/gdkx-autocleanups.h +%%X11%%include/gtk-4.0/gdk/x11/gdkx.h +%%X11%%include/gtk-4.0/gdk/x11/gdkx11applaunchcontext.h +%%X11%%include/gtk-4.0/gdk/x11/gdkx11device-xi2.h +%%X11%%include/gtk-4.0/gdk/x11/gdkx11device.h +%%X11%%include/gtk-4.0/gdk/x11/gdkx11devicemanager-xi2.h +%%X11%%include/gtk-4.0/gdk/x11/gdkx11devicemanager.h +%%X11%%include/gtk-4.0/gdk/x11/gdkx11display.h +%%X11%%include/gtk-4.0/gdk/x11/gdkx11dnd.h +%%X11%%include/gtk-4.0/gdk/x11/gdkx11glcontext.h +%%X11%%include/gtk-4.0/gdk/x11/gdkx11monitor.h +%%X11%%include/gtk-4.0/gdk/x11/gdkx11property.h +%%X11%%include/gtk-4.0/gdk/x11/gdkx11screen.h +%%X11%%include/gtk-4.0/gdk/x11/gdkx11selection.h +%%X11%%include/gtk-4.0/gdk/x11/gdkx11surface.h +%%X11%%include/gtk-4.0/gdk/x11/gdkx11utils.h +%%BROADWAY%%include/gtk-4.0/gsk/broadway/gskbroadwayrenderer.h include/gtk-4.0/gsk/gl/gskglrenderer.h include/gtk-4.0/gsk/gl/gsknglrenderer.h include/gtk-4.0/gsk/gsk-autocleanup.h @@ -370,22 +370,23 @@ include/gtk-4.0/unix-print/gtk/gtkprintunixdialog.h include/gtk-4.0/unix-print/gtk/gtkunixprint-autocleanups.h include/gtk-4.0/unix-print/gtk/gtkunixprint.h lib/girepository-1.0/Gdk-4.0.typelib -lib/girepository-1.0/GdkWayland-4.0.typelib -lib/girepository-1.0/GdkX11-4.0.typelib +%%WAYLAND%%lib/girepository-1.0/GdkWayland-4.0.typelib +%%X11%%lib/girepository-1.0/GdkX11-4.0.typelib 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 -lib/gtk-4.0/4.0.0/printbackends/libprintbackend-cups.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 lib/libgtk-4.so lib/libgtk-4.so.1 lib/libgtk-4.so.1.200.1 -libdata/pkgconfig/gtk4-broadway.pc +%%BROADWAY%%libdata/pkgconfig/gtk4-broadway.pc libdata/pkgconfig/gtk4-unix-print.pc -libdata/pkgconfig/gtk4-wayland.pc -libdata/pkgconfig/gtk4-x11.pc +%%WAYLAND%%libdata/pkgconfig/gtk4-wayland.pc +%%X11%%libdata/pkgconfig/gtk4-x11.pc libdata/pkgconfig/gtk4.pc share/applications/org.gtk.Demo4.desktop share/applications/org.gtk.IconBrowser4.desktop @@ -394,8 +395,8 @@ share/applications/org.gtk.WidgetFactory4.desktop share/gettext/its/gtk4builder.its share/gettext/its/gtk4builder.loc share/gir-1.0/Gdk-4.0.gir -share/gir-1.0/GdkWayland-4.0.gir -share/gir-1.0/GdkX11-4.0.gir +%%WAYLAND%%share/gir-1.0/GdkWayland-4.0.gir +%%X11%%share/gir-1.0/GdkX11-4.0.gir share/gir-1.0/Gsk-4.0.gir share/gir-1.0/Gtk-4.0.gir %%DATADIR%%-4.0/emoji/de.gresource