Attachment #201874 for bug #235630




# adwaita-icon-theme, gnome-themes-standard and mate-themes

PORTNAME=	gtk
PORTVERSION=	3.24.5
PORTREVISION=	4
CATEGORIES=	x11-toolkits
MASTER_SITES=	GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMESUFFIX=	3

USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes
USE_GNOME=	atk cairo gdkpixbuf2 introspection:build pango
#gtk-update-icon-cache
USES=		compiler:c11 gettext gmake gnome libtool localbase \
		pathfix perl5 pkgconfig tar:xz
USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \

INSTALLS_ICONS=	yes
INSTALL_TARGET=	install-strip

LIBVERSION=	0.2404.1
PLIST_SUB+=	LIBVERSION=${LIBVERSION}

GLIB_SCHEMAS=	org.gtk.Demo.gschema.xml \

WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland \
			libxkbcommon.so:x11/libxkbcommon
WAYLAND_RUN_DEPENDS=	wayland-protocols>=0:graphics/wayland-protocols
WAYLAND_USES=		gl
WAYLAND_USE=		GL=egl

post-patch:

Lines 1-3 Link Here

(-)x11-toolkits/gtk30/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1524773157	1	TIMESTAMP = 1549709459
2	SHA256 (gnome/gtk+-3.22.30.tar.xz) = a1a4a5c12703d4e1ccda28333b87ff462741dc365131fbc94c218ae81d9a6567	2	SHA256 (gnome/gtk+-3.24.5.tar.xz) = 0be5fb0d302bc3de26ab58c32990d895831e2b7c7418d0ffea1206d6a3ddb02f
3	SIZE (gnome/gtk+-3.22.30.tar.xz) = 18946084	3	SIZE (gnome/gtk+-3.24.5.tar.xz) = 21012108




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

Return to bug 235630

Lines 4-11 Link Here

(-)x11-toolkits/gtk30/Makefile (-4 / +3 lines)
4	# adwaita-icon-theme, gnome-themes-standard and mate-themes	4	# adwaita-icon-theme, gnome-themes-standard and mate-themes
5		5
6	PORTNAME= gtk	6	PORTNAME= gtk
7	PORTVERSION= 3.22.30	7	PORTVERSION= 3.24.5
8	PORTREVISION= 4
9	CATEGORIES= x11-toolkits	8	CATEGORIES= x11-toolkits
10	MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}	9	MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
11	PKGNAMESUFFIX= 3	10	PKGNAMESUFFIX= 3
Lines 33-39 Link Here
33	USE_LDCONFIG= yes	32	USE_LDCONFIG= yes
34	GNU_CONFIGURE= yes	33	GNU_CONFIGURE= yes
35	USE_GNOME= atk cairo gdkpixbuf2 introspection:build pango	34	USE_GNOME= atk cairo gdkpixbuf2 introspection:build pango
36	#gtk-update-icon-cache
37	USES= compiler:c11 gettext gmake gnome libtool localbase \	35	USES= compiler:c11 gettext gmake gnome libtool localbase \
38	pathfix perl5 pkgconfig tar:xz	36	pathfix perl5 pkgconfig tar:xz
39	USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \	37	USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
Lines 44-50 Link Here
44	INSTALLS_ICONS= yes	42	INSTALLS_ICONS= yes
45	INSTALL_TARGET= install-strip	43	INSTALL_TARGET= install-strip
46		44
47	LIBVERSION= 0.2200.30	45	LIBVERSION= 0.2404.1
48	PLIST_SUB+= LIBVERSION=${LIBVERSION}	46	PLIST_SUB+= LIBVERSION=${LIBVERSION}
49		47
50	GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \	48	GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \
Lines 84-89 Link Here
84	WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland \	82	WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland \
85	libxkbcommon.so:x11/libxkbcommon	83	libxkbcommon.so:x11/libxkbcommon
86	WAYLAND_RUN_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols	84	WAYLAND_RUN_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols
		85	WAYLAND_USES= gl
87	WAYLAND_USE= GL=egl	86	WAYLAND_USE= GL=egl
88		87
89	post-patch:	88	post-patch:

Lines 1-15 Link Here

(-)x11-toolkits/gtk30/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 249-254 Link Here

(-)x11-toolkits/gtk30/pkg-plist (+9 lines)
249	include/gtk-3.0/gtk/gtkenums.h	249	include/gtk-3.0/gtk/gtkenums.h
250	include/gtk-3.0/gtk/gtkeventbox.h	250	include/gtk-3.0/gtk/gtkeventbox.h
251	include/gtk-3.0/gtk/gtkeventcontroller.h	251	include/gtk-3.0/gtk/gtkeventcontroller.h
		252	include/gtk-3.0/gtk/gtkeventcontrollerkey.h
		253	include/gtk-3.0/gtk/gtkeventcontrollermotion.h
		254	include/gtk-3.0/gtk/gtkeventcontrollerscroll.h
252	include/gtk-3.0/gtk/gtkexpander.h	255	include/gtk-3.0/gtk/gtkexpander.h
253	include/gtk-3.0/gtk/gtkfilechooser.h	256	include/gtk-3.0/gtk/gtkfilechooser.h
254	include/gtk-3.0/gtk/gtkfilechooserbutton.h	257	include/gtk-3.0/gtk/gtkfilechooserbutton.h
Lines 270-275 Link Here
270	include/gtk-3.0/gtk/gtkgesturepan.h	273	include/gtk-3.0/gtk/gtkgesturepan.h
271	include/gtk-3.0/gtk/gtkgesturerotate.h	274	include/gtk-3.0/gtk/gtkgesturerotate.h
272	include/gtk-3.0/gtk/gtkgesturesingle.h	275	include/gtk-3.0/gtk/gtkgesturesingle.h
		276	include/gtk-3.0/gtk/gtkgesturestylus.h
273	include/gtk-3.0/gtk/gtkgestureswipe.h	277	include/gtk-3.0/gtk/gtkgestureswipe.h
274	include/gtk-3.0/gtk/gtkgesturezoom.h	278	include/gtk-3.0/gtk/gtkgesturezoom.h
275	include/gtk-3.0/gtk/gtkglarea.h	279	include/gtk-3.0/gtk/gtkglarea.h
Lines 425-430 Link Here
425	lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ti-et.so	429	lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ti-et.so
426	lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-viqr.so	430	lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-viqr.so
427	%%WAYLAND%%lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-wayland.so	431	%%WAYLAND%%lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-wayland.so
		432	%%WAYLAND%%lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-waylandgtk.so
428	lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-xim.so	433	lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-xim.so
429	%%CLOUDPRINT%%lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-cloudprint.so	434	%%CLOUDPRINT%%lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-cloudprint.so
430	%%CUPS%%lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-cups.so	435	%%CUPS%%lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-cups.so
Lines 711-716 Link Here
711	%%DATADIR%%-doc/html/gtk3/GtkEntryCompletion.html	716	%%DATADIR%%-doc/html/gtk3/GtkEntryCompletion.html
712	%%DATADIR%%-doc/html/gtk3/GtkEventBox.html	717	%%DATADIR%%-doc/html/gtk3/GtkEventBox.html
713	%%DATADIR%%-doc/html/gtk3/GtkEventController.html	718	%%DATADIR%%-doc/html/gtk3/GtkEventController.html
		719	%%DATADIR%%-doc/html/gtk3/GtkEventControllerKey.html
		720	%%DATADIR%%-doc/html/gtk3/GtkEventControllerMotion.html
		721	%%DATADIR%%-doc/html/gtk3/GtkEventControllerScroll.html
714	%%DATADIR%%-doc/html/gtk3/GtkExpander.html	722	%%DATADIR%%-doc/html/gtk3/GtkExpander.html
715	%%DATADIR%%-doc/html/gtk3/GtkFileChooser.html	723	%%DATADIR%%-doc/html/gtk3/GtkFileChooser.html
716	%%DATADIR%%-doc/html/gtk3/GtkFileChooserButton.html	724	%%DATADIR%%-doc/html/gtk3/GtkFileChooserButton.html
Lines 734-739 Link Here
734	%%DATADIR%%-doc/html/gtk3/GtkGesturePan.html	742	%%DATADIR%%-doc/html/gtk3/GtkGesturePan.html
735	%%DATADIR%%-doc/html/gtk3/GtkGestureRotate.html	743	%%DATADIR%%-doc/html/gtk3/GtkGestureRotate.html
736	%%DATADIR%%-doc/html/gtk3/GtkGestureSingle.html	744	%%DATADIR%%-doc/html/gtk3/GtkGestureSingle.html
		745	%%DATADIR%%-doc/html/gtk3/GtkGestureStylus.html
737	%%DATADIR%%-doc/html/gtk3/GtkGestureSwipe.html	746	%%DATADIR%%-doc/html/gtk3/GtkGestureSwipe.html
738	%%DATADIR%%-doc/html/gtk3/GtkGestureZoom.html	747	%%DATADIR%%-doc/html/gtk3/GtkGestureZoom.html
739	%%DATADIR%%-doc/html/gtk3/GtkGrid.html	748	%%DATADIR%%-doc/html/gtk3/GtkGrid.html