From owner-svn-ports-head@freebsd.org Mon Mar 26 22:50:00 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D0C5FF4D4EB; Mon, 26 Mar 2018 22:49:59 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 83ED2798AB; Mon, 26 Mar 2018 22:49:59 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 64AA513465; Mon, 26 Mar 2018 22:49:59 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2QMnxZE088522; Mon, 26 Mar 2018 22:49:59 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2QMnwJC088518; Mon, 26 Mar 2018 22:49:58 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201803262249.w2QMnwJC088518@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Mon, 26 Mar 2018 22:49:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465644 - in head/x11-toolkits/gtk30: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/x11-toolkits/gtk30: . files X-SVN-Commit-Revision: 465644 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Mar 2018 22:50:00 -0000 Author: tobik Date: Mon Mar 26 22:49:58 2018 New Revision: 465644 URL: https://svnweb.freebsd.org/changeset/ports/465644 Log: x11-toolkits/gtk30: Add new non-default WAYLAND option It enables building of Gdk's Wayland backend. PR: 219040 Submitted by: Johannes Lundberg (based on) Approved by: gnome (maintainer timeout, ~9 months) Added: head/x11-toolkits/gtk30/files/patch-gdk_wayland_Makefile.in (contents, props changed) head/x11-toolkits/gtk30/files/patch-gdk_wayland_gdkdevice-wayland.c (contents, props changed) Modified: head/x11-toolkits/gtk30/Makefile head/x11-toolkits/gtk30/pkg-plist Modified: head/x11-toolkits/gtk30/Makefile ============================================================================== --- head/x11-toolkits/gtk30/Makefile Mon Mar 26 22:36:06 2018 (r465643) +++ head/x11-toolkits/gtk30/Makefile Mon Mar 26 22:49:58 2018 (r465644) @@ -44,7 +44,6 @@ USES+= compiler:c11 gettext gmake gnome libtool local 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 @@ -58,8 +57,9 @@ GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \ 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_EXCLUDE_FreeBSD_10= WAYLAND OPTIONS_SUB= yes BROADWAY_DESC= Enable GDK Broadway backend for showing GTK+ in the webbrowser using HTML5 and web sockets. @@ -79,6 +79,13 @@ CLOUDPRINT_LIB_DEPENDS= librest-0.7.so:devel/librest \ # don't explicitly disable debug, this causes segfaults. ports r437293 DEBUG_CONFIGURE_ON= --enable-debug=yes + +WAYLAND_BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols +WAYLAND_CONFIGURE_ENABLE= wayland-backend +WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \ + libwayland-egl.so:graphics/mesa-libs \ + libxkbcommon.so:x11/libxkbcommon +WAYLAND_RUN_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols post-patch: @${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \ Added: head/x11-toolkits/gtk30/files/patch-gdk_wayland_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/gtk30/files/patch-gdk_wayland_Makefile.in Mon Mar 26 22:49:58 2018 (r465644) @@ -0,0 +1,23 @@ +Use portable sed syntax in gdk/wayland/Makefile.in + +Replace non-portable \<, \>, \+ with \(, \), \{, \} to avoid build +failure on systems not using GNU sed. + +https://git.gnome.org/browse/gtk/commit/gdk/wayland/Makefile.am?h=gtk-3-22&id=b68e55ecce38dec47c3f9119e603b81773e5294a + +--- gdk/wayland/Makefile.in.orig 2018-03-25 16:20:44 UTC ++++ gdk/wayland/Makefile.in +@@ -1028,11 +1028,11 @@ check-local: test-cwd + .SECONDEXPANSION: + + define protostability +-$(shell echo $1 | sed 's/.*\(\\|\\).*/\1/') ++$(if $(findstring unstable,$1),unstable,stable) + endef + + define protoname +-$(shell echo $1 | sed 's/\([a-z\-]\+\)-[a-z]\+-v[0-9]\+/\1/') ++$(shell echo $1 | sed 's/\([a-z\-]\{1,\}\)-[a-z]\{1,\}-v[0-9]\{1,\}/\1/') + endef + + %-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml Added: head/x11-toolkits/gtk30/files/patch-gdk_wayland_gdkdevice-wayland.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/gtk30/files/patch-gdk_wayland_gdkdevice-wayland.c Mon Mar 26 22:49:58 2018 (r465644) @@ -0,0 +1,15 @@ +--- gdk/wayland/gdkdevice-wayland.c.orig 2018-03-25 16:25:12 UTC ++++ gdk/wayland/gdkdevice-wayland.c +@@ -38,11 +38,9 @@ + + #include + +-#include +- + #include + #include +-#include ++#include + + #define BUTTON_BASE (BTN_LEFT - 1) /* Used to translate to 1-indexed buttons */ + Modified: head/x11-toolkits/gtk30/pkg-plist ============================================================================== --- head/x11-toolkits/gtk30/pkg-plist Mon Mar 26 22:36:06 2018 (r465643) +++ head/x11-toolkits/gtk30/pkg-plist Mon Mar 26 22:49:58 2018 (r465644) @@ -58,8 +58,15 @@ include/gtk-3.0/gdk/gdkthreads.h 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/gdkwaylandmonitor.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 +441,12 @@ lib/libgtk-3.so.%%LIBVERSION%% 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