Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 5 Mar 2020 12:37:18 +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: r527829 - head/x11/libwacom
Message-ID:  <202003051237.025CbICw080746@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Thu Mar  5 12:37:18 2020
New Revision: 527829
URL: https://svnweb.freebsd.org/changeset/ports/527829

Log:
  x11/libwacom: unbreak after r244554 when libxml2 isn't bootlegged
  
  PR:		244554
  Reported by:	Matthias Pfaller
  Approved by:	manu, imp, zeising (x11)
  Differential Revision:	https://reviews.freebsd.org/D23930

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

Modified: head/x11/libwacom/Makefile
==============================================================================
--- head/x11/libwacom/Makefile	Thu Mar  5 12:22:23 2020	(r527828)
+++ head/x11/libwacom/Makefile	Thu Mar  5 12:37:18 2020	(r527829)
@@ -9,6 +9,8 @@ CATEGORIES=	x11
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 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
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Adds tablet support to libinput

Modified: head/x11/libwacom/distinfo
==============================================================================
--- head/x11/libwacom/distinfo	Thu Mar  5 12:22:23 2020	(r527828)
+++ head/x11/libwacom/distinfo	Thu Mar  5 12:37:18 2020	(r527829)
@@ -3,3 +3,7 @@ SHA256 (linuxwacom-libwacom-libwacom-1.2_GH0.tar.gz) =
 SIZE (linuxwacom-libwacom-libwacom-1.2_GH0.tar.gz) = 110520
 SHA256 (bb3aa6bd57c3.patch) = 1537641da75342469e1160b586e8790c4387ed989186dec00b5f45779b6b831b
 SIZE (bb3aa6bd57c3.patch) = 3896
+SHA256 (a97e09fd2da9.patch) = 5c8e1002c768ecad4c87b619ba5ee647498ebae13a2f211d1a60339867336f14
+SIZE (a97e09fd2da9.patch) = 1435
+SHA256 (c94f60920a22.patch) = 18d933a95aeb7603a2c284da5051b75c96dd9e581735c3185165688ca0f9740c
+SIZE (c94f60920a22.patch) = 1674



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