svn commit: r494850 - in head/x11/libinput: . files

[Niclas Zeising]

Author: zeising
Date: Wed Mar  6 21:57:42 2019
New Revision: 494850
URL: https://svnweb.freebsd.org/changeset/ports/494850

Log:
  x11/libinput: Fix build on GCC-based architectures
  
  Fix build of x11/libinput on GCC-based architectures.  gnu90 is an alias for
  gnu89, but is not understood by all versions of GCC, most notably, our base
  version.  Switch to use gnu89 instead.
  While here, adjust patch context a bit.
  
  A similar fix has been merged upstream.
  
  PR:		235361
  Submitted by:	Jan Beich (fix)
  Reported by:	Piotr Kubaj (PR)
  MFH:		2019Q1
  X-MFH-note:	If applicable, 2019Q1 might have old libinput version

Modified:
  head/x11/libinput/Makefile
  head/x11/libinput/files/patch-meson.build

Modified: head/x11/libinput/Makefile
==============================================================================
--- head/x11/libinput/Makefile	Wed Mar  6 21:49:00 2019	(r494849)
+++ head/x11/libinput/Makefile	Wed Mar  6 21:57:42 2019	(r494850)
@@ -2,6 +2,7 @@
 
 PORTNAME=	libinput
 PORTVERSION=	1.12.6
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://freedesktop.org/software/${PORTNAME}/
 

Modified: head/x11/libinput/files/patch-meson.build
==============================================================================
--- head/x11/libinput/files/patch-meson.build	Wed Mar  6 21:49:00 2019	(r494849)
+++ head/x11/libinput/files/patch-meson.build	Wed Mar  6 21:57:42 2019	(r494850)
@@ -1,4 +1,4 @@
---- meson.build.orig	2018-12-31 16:13:39 UTC
+--- meson.build.orig	2019-01-21 01:28:48 UTC
 +++ meson.build
 @@ -145,6 +145,8 @@ endif
  
@@ -9,12 +9,21 @@
  executable('libinput-device-group',
  	   'udev/libinput-device-group.c',
  	   dependencies : [dep_udev, dep_libwacom],
-@@ -181,6 +183,8 @@ litest_model_quirks_file = configure_file(input : 'ude
- 					  output : '90-libinput-model-quirks-litest.rules',
+@@ -182,6 +184,8 @@ litest_model_quirks_file = configure_file(input : 'ude
  					  install : false,
  					  configuration : litest_udev_rules_config)
-+
-+endif
  
++endif
++
  ############ libepoll-shim (BSD) ############
  
+ if cc.has_header_symbol('sys/epoll.h', 'epoll_create1', prefix : prefix)
+@@ -634,7 +638,7 @@ executable('test-build-std-gnuc90',
+ 	   'test/build-pedantic.c',
+ 	   dependencies : [dep_udev],
+ 	   include_directories : [includes_src, includes_include],
+-	   c_args : ['-std=gnu90', '-Werror'],
++	   c_args : ['-std=gnu89', '-Werror'],
+ 	   install : false)
+ # test for linking with the minimal linker flags
+ executable('test-build-linker',