Skip to content

Commit

Permalink
x11-toolkits/gtk40: remove CLOUDPRINT option; fix cups configure (+)
Browse files Browse the repository at this point in the history
* Cloudprint support was removed since gtk40 4.3.2
* The correct spelling for the cups option (for meson configuration) is 'print-cups'.

PR:		257986
  • Loading branch information
fluffykhv committed Aug 21, 2021
1 parent 418488f commit 1f14609
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 10 deletions.
12 changes: 3 additions & 9 deletions x11-toolkits/gtk40/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
PORTNAME= gtk
PORTVERSION= 4.3.2
PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
PKGNAMESUFFIX= 4
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion x11-toolkits/gtk40/pkg-plist
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1f14609

Please sign in to comment.