Attachment #188691 for bug #224226

View | Details | Raw Unified | Return to bug 224226
Collapse All | Expand All

Lines 3-8 Link Here

(-)b/graphics/wayland/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= wayland	4	PORTNAME= wayland
5	PORTVERSION= 1.14.0	5	PORTVERSION= 1.14.0
		6	PORTREVISION= 1
6	CATEGORIES= graphics wayland	7	CATEGORIES= graphics wayland
7	MASTER_SITES= http://wayland.freedesktop.org/releases/	8	MASTER_SITES= http://wayland.freedesktop.org/releases/
8		9
Lines 25-31 USE_GNOME= libxslt:build Link Here
25	USE_LDCONFIG= yes	26	USE_LDCONFIG= yes
26	GNU_CONFIGURE= yes	27	GNU_CONFIGURE= yes
27	CONFIGURE_ARGS= --disable-documentation	28	CONFIGURE_ARGS= --disable-documentation
28	CONFIGURE_ENV= ac_cv_func_posix_fallocate=no # EINVAL for many FS on 12.0
29	INSTALL_TARGET= install-strip	29	INSTALL_TARGET= install-strip
30		30
31	.include <bsd.port.mk>	31	.include <bsd.port.mk>




--- cursor/os-compatibility.c.orig	2017-08-08 18:20:52 UTC
+++ cursor/os-compatibility.c
@@ -131,18 +131,17 @@ os_create_anonymous_file(off_t size)
 
 #ifdef HAVE_POSIX_FALLOCATE
 	ret = posix_fallocate(fd, 0, size);
-	if (ret != 0) {
+	if (ret != EINVAL && ret != EOPNOTSUPP) {
 		close(fd);
 		errno = ret;
 		return -1;
 	}
-#else
+#endif
 	ret = ftruncate(fd, size);
 	if (ret < 0) {
 		close(fd);
 		return -1;
 	}
-#endif
 
 	return fd;
 }

Added Link Here

(-)b/graphics/wayland/files/patch-cursor_wayland-cursor.c (+11 lines)
1	--- cursor/wayland-cursor.c.orig 2017-08-08 18:20:52 UTC
2	+++ cursor/wayland-cursor.c
3	@@ -88,7 +88,7 @@ shm_pool_resize(struct shm_pool *pool, int size)
4
5	#ifdef HAVE_POSIX_FALLOCATE
6	errno = posix_fallocate(pool->fd, 0, size);
7	- if (errno != 0)
8	+ if (errno != EINVAL && errno != EOPNOTSUPP)
9	return 0;
10	#endif
11

Return to bug 224226

Added Link Here

(-)b/graphics/wayland/files/patch-cursor_os-compatibility.c (+23 lines)
1	--- cursor/os-compatibility.c.orig 2017-08-08 18:20:52 UTC
2	+++ cursor/os-compatibility.c
3	@@ -131,18 +131,17 @@ os_create_anonymous_file(off_t size)
4
5	#ifdef HAVE_POSIX_FALLOCATE
6	ret = posix_fallocate(fd, 0, size);
7	- if (ret != 0) {
8	+ if (ret != EINVAL && ret != EOPNOTSUPP) {
9	close(fd);
10	errno = ret;
11	return -1;
12	}
13	-#else
14	+#endif
15	ret = ftruncate(fd, size);
16	if (ret < 0) {
17	close(fd);
18	return -1;
19	}
20	-#endif
21
22	return fd;
23	}