Attachment 182269 Details for Bug 219037 – Patch to update graphics/wayland to 1.13

[patch] Patch to update graphics/wayland to 1.13

patch-wayland-1.13.patch (text/plain), 3.49 KB, created by Johannes Lundberg on 2017-05-03 11:24:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johannes Lundberg

Created: 2017-05-03 11:24:11 UTC

Size: 3.49 KB

patch

obsolete

>diff --git a/graphics/wayland/Makefile b/graphics/wayland/Makefile
>index e0ea92859936..341a29702a39 100644
>--- a/graphics/wayland/Makefile
>+++ b/graphics/wayland/Makefile
>@@ -19,7 +19,7 @@
> # and keep diff with upstream minimal.
> 
> PORTNAME=	wayland
>-PORTVERSION=	1.12.0
>+PORTVERSION=	1.13.0
> CATEGORIES=	graphics wayland
> MASTER_SITES=	http://wayland.freedesktop.org/releases/
> 
>diff --git a/graphics/wayland/distinfo b/graphics/wayland/distinfo
>index 1217bc965ee2..1234ab18d13c 100644
>--- a/graphics/wayland/distinfo
>+++ b/graphics/wayland/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1481659324
>-SHA256 (wayland-1.12.0.tar.xz) = d6b4135cba0188abcb7275513c72dede751d6194f6edc5b82183a3ba8b821ab1
>-SIZE (wayland-1.12.0.tar.xz) = 379520
>+TIMESTAMP = 1493798580
>+SHA256 (wayland-1.13.0.tar.xz) = 69b052c031a61e89af7cc8780893d0da1e301492352aa449dee9345043e6fe51
>+SIZE (wayland-1.13.0.tar.xz) = 414508
>diff --git a/graphics/wayland/files/patch-Makefile.am b/graphics/wayland/files/patch-Makefile.am
>index c3b12cae4ba3..fa9c832a786c 100644
>--- a/graphics/wayland/files/patch-Makefile.am
>+++ b/graphics/wayland/files/patch-Makefile.am
>@@ -1,4 +1,4 @@
>---- Makefile.am.orig	2016-02-29 23:30:58 UTC
>+--- Makefile.am.orig	2017-05-03 08:03:42 UTC
> +++ Makefile.am
> @@ -73,7 +73,7 @@ nodist_include_HEADERS =			\
>  	protocol/wayland-client-protocol.h
>@@ -18,7 +18,7 @@
>  libwayland_client_la_LDFLAGS = -version-info 3:0:3
>  libwayland_client_la_SOURCES =			\
>  	src/wayland-client.c
>-@@ -186,7 +186,7 @@ libtest_runner_la_LIBADD =			\
>+@@ -198,7 +198,7 @@ libtest_runner_la_LIBADD =			\
>  	libwayland-util.la			\
>  	libwayland-client.la			\
>  	libwayland-server.la			\
>diff --git a/graphics/wayland/files/patch-configure.ac b/graphics/wayland/files/patch-configure.ac
>index a6c0d1737262..4874ae4f4b05 100644
>--- a/graphics/wayland/files/patch-configure.ac
>+++ b/graphics/wayland/files/patch-configure.ac
>@@ -1,4 +1,4 @@
>---- configure.ac.orig	2016-06-01 00:11:10 UTC
>+--- configure.ac.orig	2017-02-21 21:15:19 UTC
> +++ configure.ac
> @@ -63,6 +63,28 @@ AC_SUBST(GCC_CFLAGS)
>  
>diff --git a/graphics/wayland/files/patch-src_wayland-server.c b/graphics/wayland/files/patch-src_wayland-server.c
>index efc16114e97f..5b0147d90cdf 100644
>--- a/graphics/wayland/files/patch-src_wayland-server.c
>+++ b/graphics/wayland/files/patch-src_wayland-server.c
>@@ -1,5 +1,5 @@
>---- src/wayland-server.c.orig	2016-09-20 17:33:11.000000000 +0000
>-+++ src/wayland-server.c	2016-12-13 20:07:06.878000000 +0000
>+--- src/wayland-server.c.orig	2017-02-07 22:59:06 UTC
>++++ src/wayland-server.c
> @@ -25,6 +25,8 @@
>  
>  #define _GNU_SOURCE
>@@ -21,21 +21,22 @@
>  #include "wayland-util.h"
>  #include "wayland-private.h"
>  #include "wayland-server.h"
>-@@ -79,7 +86,13 @@
>+@@ -79,7 +86,13 @@ struct wl_client {
>  	struct wl_list link;
>  	struct wl_map objects;
>- 	struct wl_signal destroy_signal;
>+ 	struct wl_priv_signal destroy_signal;
>+-	struct ucred ucred;
> +#ifdef HAVE_SYS_UCRED_H
> +	/* FreeBSD */
> +	struct xucred xucred;
> +#else
> +	/* Linux */
>- 	struct ucred ucred;
>++ 	struct ucred ucred;
> +#endif
>  	int error;
>- 	struct wl_signal resource_created_signal;
>+ 	struct wl_priv_signal resource_created_signal;
>  };
>-@@ -466,10 +479,20 @@
>+@@ -503,10 +516,20 @@ wl_client_create(struct wl_display *disp
>  	if (!client->source)
>  		goto err_client;
>  
>@@ -56,7 +57,7 @@
>  
>  	client->connection = wl_connection_create(fd);
>  	if (client->connection == NULL)
>-@@ -523,12 +546,23 @@
>+@@ -560,12 +583,23 @@ WL_EXPORT void
>  wl_client_get_credentials(struct wl_client *client,
>  			  pid_t *pid, uid_t *uid, gid_t *gid)
>  {

Actions: View | Diff

Attachments on bug 219037: 182269