Attachment #191817 for bug #219040

View | Details | Raw Unified | Return to bug 219040 | Differences between
Collapse All | Expand All




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

		org.gtk.Settings.Debug.gschema.xml \
		org.gtk.Settings.FileChooser.gschema.xml

OPTIONS_DEFINE=	CUPS CLOUDPRINT COLORD DEBUG BROADWAY WAYLAND
OPTIONS_DEFAULT=CUPS COLORD BROADWAY
OPTIONS_SUB=	yes


# 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' \
		${WRKSRC}/configure




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




--- 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 */
 




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

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

Return to bug 219040

Lines 44-50 Link Here

(-)Makefile (-2 / +8 lines)
44	USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \	44	USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
45	xcomposite	45	xcomposite
46	CONFIGURE_ARGS= --enable-x11-backend \	46	CONFIGURE_ARGS= --enable-x11-backend \
47	--disable-wayland-backend \
48	--enable-introspection	47	--enable-introspection
49	CPPFLAGS+= -fno-omit-frame-pointer	48	CPPFLAGS+= -fno-omit-frame-pointer
50	INSTALLS_ICONS= yes	49	INSTALLS_ICONS= yes
Lines 58-64 Link Here
58	org.gtk.Settings.Debug.gschema.xml \	57	org.gtk.Settings.Debug.gschema.xml \
59	org.gtk.Settings.FileChooser.gschema.xml	58	org.gtk.Settings.FileChooser.gschema.xml
60		59
61	OPTIONS_DEFINE= CUPS CLOUDPRINT COLORD DEBUG BROADWAY	60	OPTIONS_DEFINE= CUPS CLOUDPRINT COLORD DEBUG BROADWAY WAYLAND
62	OPTIONS_DEFAULT=CUPS COLORD BROADWAY	61	OPTIONS_DEFAULT=CUPS COLORD BROADWAY
63	OPTIONS_SUB= yes	62	OPTIONS_SUB= yes
64		63
Lines 80-85 Link Here
80	# don't explicitly disable debug, this causes segfaults. ports r437293	79	# don't explicitly disable debug, this causes segfaults. ports r437293
81	DEBUG_CONFIGURE_ON= --enable-debug=yes	80	DEBUG_CONFIGURE_ON= --enable-debug=yes
82		81
		82	WAYLAND_BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols
		83	WAYLAND_CONFIGURE_ENABLE= wayland-backend
		84	WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \
		85	libwayland-egl.so:graphics/mesa-libs \
		86	libxkbcommon.so:x11/libxkbcommon
		87	WAYLAND_RUN_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols
		88
83	post-patch:	89	post-patch:
84	@${REINPLACE_CMD} -e 's\|[{]libdir[}]/locale\|{datadir}/locale\|g' \	90	@${REINPLACE_CMD} -e 's\|[{]libdir[}]/locale\|{datadir}/locale\|g' \
85	${WRKSRC}/configure	91	${WRKSRC}/configure

Line 0 Link Here

(-)files/patch-gdk_wayland_Makefile.in (+23 lines)
	1	Use portable sed syntax in gdk/wayland/Makefile.in
	2
	3	Replace non-portable \<, \>, \+ with \(, \), \{, \} to avoid build
	4	failure on systems not using GNU sed.
	5
	6	https://git.gnome.org/browse/gtk/commit/gdk/wayland/Makefile.am?h=gtk-3-22&id=b68e55ecce38dec47c3f9119e603b81773e5294a
	7
	8	--- gdk/wayland/Makefile.in.orig 2018-03-25 16:20:44 UTC
	9	+++ gdk/wayland/Makefile.in
	10	@@ -1028,11 +1028,11 @@ check-local: test-cwd
	11	.SECONDEXPANSION:
	12
	13	define protostability
	14	-$(shell echo $1 \| sed 's/.\(\<unstable\>\\|\<stable\>\)./\1/')
	15	+$(if $(findstring unstable,$1),unstable,stable)
	16	endef
	17
	18	define protoname
	19	-$(shell echo $1 \| sed 's/\([a-z\-]\+\)-[a-z]\+-v[0-9]\+/\1/')
	20	+$(shell echo $1 \| sed 's/\([a-z\-]\{1,\}\)-[a-z]\{1,\}-v[0-9]\{1,\}/\1/')
	21	endef
	22
	23	%-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$)/$$(call protoname,$$)/$$*.xml

Line 0 Link Here

(-)files/patch-gdk_wayland_gdkdevice-wayland.c (+15 lines)
	1	--- gdk/wayland/gdkdevice-wayland.c.orig 2018-03-25 16:25:12 UTC
	2	+++ gdk/wayland/gdkdevice-wayland.c
	3	@@ -38,11 +38,9 @@
	4
	5	#include <xkbcommon/xkbcommon.h>
	6
	7	-#include <linux/input.h>
	8	-
	9	#include <sys/time.h>
	10	#include <sys/mman.h>
	11	-#include <linux/input.h>
	12	+#include <dev/evdev/input.h>
	13
	14	#define BUTTON_BASE (BTN_LEFT - 1) /* Used to translate to 1-indexed buttons */
	15

Lines 58-65 Link Here

(-)pkg-plist (+9 lines)
58	include/gtk-3.0/gdk/gdktypes.h	58	include/gtk-3.0/gdk/gdktypes.h
59	include/gtk-3.0/gdk/gdkversionmacros.h	59	include/gtk-3.0/gdk/gdkversionmacros.h
60	include/gtk-3.0/gdk/gdkvisual.h	60	include/gtk-3.0/gdk/gdkvisual.h
		61	%%WAYLAND%%include/gtk-3.0/gdk/gdkwayland.h
61	include/gtk-3.0/gdk/gdkwindow.h	62	include/gtk-3.0/gdk/gdkwindow.h
62	include/gtk-3.0/gdk/gdkx.h	63	include/gtk-3.0/gdk/gdkx.h
		64	%%WAYLAND%%include/gtk-3.0/gdk/wayland/gdkwaylanddevice.h
		65	%%WAYLAND%%include/gtk-3.0/gdk/wayland/gdkwaylanddisplay.h
		66	%%WAYLAND%%include/gtk-3.0/gdk/wayland/gdkwaylandglcontext.h
		67	%%WAYLAND%%include/gtk-3.0/gdk/wayland/gdkwaylandmonitor.h
		68	%%WAYLAND%%include/gtk-3.0/gdk/wayland/gdkwaylandselection.h
		69	%%WAYLAND%%include/gtk-3.0/gdk/wayland/gdkwaylandwindow.h
63	include/gtk-3.0/gdk/x11/gdkx-autocleanups.h	70	include/gtk-3.0/gdk/x11/gdkx-autocleanups.h
64	include/gtk-3.0/gdk/x11/gdkx11applaunchcontext.h	71	include/gtk-3.0/gdk/x11/gdkx11applaunchcontext.h
65	include/gtk-3.0/gdk/x11/gdkx11cursor.h	72	include/gtk-3.0/gdk/x11/gdkx11cursor.h
Lines 434-443 Link Here
434	libdata/pkgconfig/gail-3.0.pc	441	libdata/pkgconfig/gail-3.0.pc
435	libdata/pkgconfig/gdk-3.0.pc	442	libdata/pkgconfig/gdk-3.0.pc
436	%%BROADWAY%%libdata/pkgconfig/gdk-broadway-3.0.pc	443	%%BROADWAY%%libdata/pkgconfig/gdk-broadway-3.0.pc
		444	%%WAYLAND%%libdata/pkgconfig/gdk-wayland-3.0.pc
437	libdata/pkgconfig/gdk-x11-3.0.pc	445	libdata/pkgconfig/gdk-x11-3.0.pc
438	libdata/pkgconfig/gtk+-3.0.pc	446	libdata/pkgconfig/gtk+-3.0.pc
439	%%BROADWAY%%libdata/pkgconfig/gtk+-broadway-3.0.pc	447	%%BROADWAY%%libdata/pkgconfig/gtk+-broadway-3.0.pc
440	libdata/pkgconfig/gtk+-unix-print-3.0.pc	448	libdata/pkgconfig/gtk+-unix-print-3.0.pc
		449	%%WAYLAND%%libdata/pkgconfig/gtk+-wayland-3.0.pc
441	libdata/pkgconfig/gtk+-x11-3.0.pc	450	libdata/pkgconfig/gtk+-x11-3.0.pc
442	man/man1/gtk-query-immodules-3.0.1.gz	451	man/man1/gtk-query-immodules-3.0.1.gz
443	share/aclocal/gtk-3.0.m4	452	share/aclocal/gtk-3.0.m4