Attachment 191807 Details for Bug 219040 – gtk30-wayland.diff

[patch] gtk30-wayland.diff

gtk3-wayland.diff (text/plain), 4.90 KB, created by Tobias Kortkamp on 2018-03-25 17:10:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2018-03-25 17:10:37 UTC

Size: 4.90 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 465525)
>+++ Makefile	(working copy)
>@@ -44,7 +44,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
>@@ -58,7 +57,7 @@
> 		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
> 
>@@ -80,6 +79,12 @@
> # 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
>+
> post-patch:
> 	@${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \
> 		${WRKSRC}/configure
>Index: files/patch-gdk_wayland_Makefile.in
>===================================================================
>--- files/patch-gdk_wayland_Makefile.in	(nonexistent)
>+++ files/patch-gdk_wayland_Makefile.in	(working copy)
>@@ -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/.*$\<unstable\>\|\<stable\>$.*/\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
>
>Property changes on: files/patch-gdk_wayland_Makefile.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-gdk_wayland_gdkdevice-wayland.c
>===================================================================
>--- files/patch-gdk_wayland_gdkdevice-wayland.c	(nonexistent)
>+++ files/patch-gdk_wayland_gdkdevice-wayland.c	(working copy)
>@@ -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 <xkbcommon/xkbcommon.h>
>+ 
>+-#include <linux/input.h>
>+-
>+ #include <sys/time.h>
>+ #include <sys/mman.h>
>+-#include <linux/input.h>
>++#include <dev/evdev/input.h>
>+ 
>+ #define BUTTON_BASE (BTN_LEFT - 1) /* Used to translate to 1-indexed buttons */
>+ 
>
>Property changes on: files/patch-gdk_wayland_gdkdevice-wayland.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 465525)
>+++ pkg-plist	(working copy)
>@@ -58,8 +58,15 @@
> 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 @@
> 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

Actions: View | Diff

Attachments on bug 219040: 182272 | 182273 | 191807 | 191817