Index: x11-toolkits/gtk30/Makefile =================================================================== --- x11-toolkits/gtk30/Makefile +++ x11-toolkits/gtk30/Makefile @@ -43,7 +43,6 @@ USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \ xcomposite CONFIGURE_ARGS= --enable-x11-backend \ - --disable-wayland-backend \ --enable-introspection CPPFLAGS+= -fno-omit-frame-pointer INSTALLS_ICONS= yes @@ -57,10 +56,17 @@ org.gtk.Settings.Debug.gschema.xml \ org.gtk.Settings.FileChooser.gschema.xml -OPTIONS_DEFINE= CUPS CLOUDPRINT COLORD DEBUG BROADWAY +OPTIONS_DEFINE= CUPS CLOUDPRINT COLORD DEBUG BROADWAY WAYLAND OPTIONS_DEFAULT=CUPS COLORD BROADWAY OPTIONS_SUB= yes +WAYLAND_DESC= Enable Wayland backend +WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \ + libwayland-egl.so:graphics/mesa-libs +WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.7:graphics/wayland-protocols \ + wayland-scanner:graphics/wayland +WAYLAND_CONFIGURE_ENABLE= wayland-backend + BROADWAY_DESC= Enable GDK Broadway backend for showing GTK+ in the webbrowser using HTML5 and web sockets. BROADWAY_CONFIGURE_ENABLE= broadway-backend @@ -83,12 +89,17 @@ @${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \ ${WRKSRC}/configure +# Should not have to do this. "make" should find them in $WAYLAND_PROTOCOLS_DATADIR set by automake... +WAYLAND_PROTOCOLS_DATADIR=`pkg-config --variable=pkgdatadir wayland-protocols` + pre-configure: # .if !exists() evaluates too early before cairo has a chance to be installed @if ! pkg-config --exists cairo-xlib; then \ ${ECHO_MSG} "${PKGNAME}: Needs cairo with X11 support enabled."; \ ${FALSE}; \ fi + @cp ${WAYLAND_PROTOCOLS_DATADIR}/stable/*/* ${WRKSRC}/gdk/wayland/protocol/ + @cp ${WAYLAND_PROTOCOLS_DATADIR}/unstable/*/* ${WRKSRC}/gdk/wayland/protocol/ pre-build: @${RM} -r ${WRKSRC}/docs/gtk.info* Index: x11-toolkits/gtk30/pkg-plist =================================================================== --- x11-toolkits/gtk30/pkg-plist +++ x11-toolkits/gtk30/pkg-plist @@ -58,8 +58,14 @@ include/gtk-3.0/gdk/gdktypes.h include/gtk-3.0/gdk/gdkversionmacros.h include/gtk-3.0/gdk/gdkvisual.h +%%WAYLAND%%include/gtk-3.0/gdk/gdkwayland.h include/gtk-3.0/gdk/gdkwindow.h include/gtk-3.0/gdk/gdkx.h +%%WAYLAND%%include/gtk-3.0/gdk/wayland/gdkwaylanddevice.h +%%WAYLAND%%include/gtk-3.0/gdk/wayland/gdkwaylanddisplay.h +%%WAYLAND%%include/gtk-3.0/gdk/wayland/gdkwaylandglcontext.h +%%WAYLAND%%include/gtk-3.0/gdk/wayland/gdkwaylandselection.h +%%WAYLAND%%include/gtk-3.0/gdk/wayland/gdkwaylandwindow.h include/gtk-3.0/gdk/x11/gdkx-autocleanups.h include/gtk-3.0/gdk/x11/gdkx11applaunchcontext.h include/gtk-3.0/gdk/x11/gdkx11cursor.h @@ -434,10 +440,12 @@ libdata/pkgconfig/gail-3.0.pc libdata/pkgconfig/gdk-3.0.pc %%BROADWAY%%libdata/pkgconfig/gdk-broadway-3.0.pc +%%WAYLAND%%libdata/pkgconfig/gdk-wayland-3.0.pc libdata/pkgconfig/gdk-x11-3.0.pc libdata/pkgconfig/gtk+-3.0.pc %%BROADWAY%%libdata/pkgconfig/gtk+-broadway-3.0.pc libdata/pkgconfig/gtk+-unix-print-3.0.pc +%%WAYLAND%%libdata/pkgconfig/gtk+-wayland-3.0.pc libdata/pkgconfig/gtk+-x11-3.0.pc man/man1/gtk-query-immodules-3.0.1.gz share/aclocal/gtk-3.0.m4