Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 21 Mar 2020 06:04:34 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r528827 - head/x11/libwacom
Message-ID:  <202003210604.02L64YU9069556@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: jbeich
Date: Sat Mar 21 06:04:34 2020
New Revision: 528827
URL: https://svnweb.freebsd.org/changeset/ports/528827

Log:
  x11/libwacom: unbreak "make test"
  
  [0/1] /usr/local/bin/meson test --no-rebuild --print-errorlogs
  Traceback (most recent call last):
    File "/usr/local/lib/python3.7/site-packages/mesonbuild/mesonmain.py", line 129, in run
      return options.run_func(options)
    File "/usr/local/lib/python3.7/site-packages/mesonbuild/mtest.py", line 1045, in run
      return th.doit()
    File "/usr/local/lib/python3.7/site-packages/mesonbuild/mtest.py", line 802, in doit
      self.run_tests(tests)
    File "/usr/local/lib/python3.7/site-packages/mesonbuild/mtest.py", line 954, in run_tests
      self.drain_futures(futures)
    File "/usr/local/lib/python3.7/site-packages/mesonbuild/mtest.py", line 970, in drain_futures
      self.process_test_result(result.result())
    File "/usr/local/lib/python3.7/concurrent/futures/_base.py", line 435, in result
      return self.__get_result()
    File "/usr/local/lib/python3.7/concurrent/futures/_base.py", line 384, in __get_result
      raise self._exception
    File "/usr/local/lib/python3.7/concurrent/futures/thread.py", line 57, in run
      result = self.fn(*self.args, **self.kwargs)
    File "/usr/local/lib/python3.7/site-packages/mesonbuild/mtest.py", line 494, in run
      return self._run_cmd(wrap + cmd + self.test.cmd_args + self.options.test_args)
    File "/usr/local/lib/python3.7/site-packages/mesonbuild/mtest.py", line 549, in _run_cmd
      preexec_fn=preexec_fn if not is_windows() else None)
    File "/usr/local/lib/python3.7/subprocess.py", line 800, in __init__
      restore_signals, start_new_session)
    File "/usr/local/lib/python3.7/subprocess.py", line 1551, in _execute_child
      raise child_exception_type(errno_num, err_msg, err_filename)
  FileNotFoundError: [Errno 2] No such file or directory: '/usr/ports/x11/libwacom/work/libwacom-libwacom-1.2/data/check-files-in-git.sh': '/usr/ports/x11/libwacom/work/libwacom-libwacom-1.2/data/check-files-in-git.sh'
  FAILED: meson-test
  /usr/local/bin/meson test --no-rebuild --print-errorlogs
  ninja: build stopped: subcommand failed.
  
  Requested by:	John Hein
  Approved by:	zeising (x11)
  Differential Revision:	https://reviews.freebsd.org/D24001

Modified:
  head/x11/libwacom/Makefile   (contents, props changed)
  head/x11/libwacom/distinfo   (contents, props changed)

Modified: head/x11/libwacom/Makefile
==============================================================================
--- head/x11/libwacom/Makefile	Sat Mar 21 04:32:24 2020	(r528826)
+++ head/x11/libwacom/Makefile	Sat Mar 21 06:04:34 2020	(r528827)
@@ -11,6 +11,7 @@ PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PRO
 PATCHFILES+=	bb3aa6bd57c3.patch:-p1 # https://github.com/linuxwacom/libwacom/pull/217
 PATCHFILES+=	a97e09fd2da9.patch:-p1 # required to avoid patch conflict
 PATCHFILES+=	c94f60920a22.patch:-p1 # https://github.com/linuxwacom/libwacom/pull/219
+PATCHFILES+=	7725bb895e80.patch:-p1 # https://github.com/linuxwacom/libwacom/pull/221
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Adds tablet support to libinput
@@ -19,6 +20,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgudev-1.0.so:devel/libgudev
+TEST_DEPENDS=	bash:shells/bash
 
 USES=		gnome meson pkgconfig
 USE_GITHUB=	yes

Modified: head/x11/libwacom/distinfo
==============================================================================
--- head/x11/libwacom/distinfo	Sat Mar 21 04:32:24 2020	(r528826)
+++ head/x11/libwacom/distinfo	Sat Mar 21 06:04:34 2020	(r528827)
@@ -7,3 +7,5 @@ SHA256 (a97e09fd2da9.patch) = 5c8e1002c768ecad4c87b619
 SIZE (a97e09fd2da9.patch) = 1435
 SHA256 (c94f60920a22.patch) = 18d933a95aeb7603a2c284da5051b75c96dd9e581735c3185165688ca0f9740c
 SIZE (c94f60920a22.patch) = 1674
+SHA256 (7725bb895e80.patch) = 946e6e8e25f61b91a5a29153d4d0aae20a179fd252999a393555e9fed83ae714
+SIZE (7725bb895e80.patch) = 2504

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003210604.02L64YU9069556>