From owner-freebsd-x11@freebsd.org Tue Oct 8 15:38:35 2019 Return-Path: Delivered-To: freebsd-x11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6830D12DDDB for ; Tue, 8 Oct 2019 15:38:35 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 46nhMb29pcz47kD for ; Tue, 8 Oct 2019 15:38:35 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 4AAC912DDDA; Tue, 8 Oct 2019 15:38:35 +0000 (UTC) Delivered-To: x11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4A72312DDD8 for ; Tue, 8 Oct 2019 15:38:35 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46nhMb1BtCz47kC for ; Tue, 8 Oct 2019 15:38:35 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0D57D20FA for ; Tue, 8 Oct 2019 15:38:35 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id x98FcYRt016870 for ; Tue, 8 Oct 2019 15:38:34 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id x98FcYdQ016869 for x11@FreeBSD.org; Tue, 8 Oct 2019 15:38:34 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: www set sender to bugzilla-noreply@freebsd.org using -f Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8" From: bugzilla-noreply@freebsd.org To: x11@FreeBSD.org Subject: maintainer-approval requested: [Bug 240964] x11-toolkits/qt5-gui: 5.13.0 fails to build : [Attachment 208179] devel/evdev-proto: Use the same include guard as base Date: Tue, 08 Oct 2019 15:38:34 +0000 X-Bugzilla-Type: request X-Bugzilla-Product: Ports & Packages X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Some People X-Bugzilla-Who: X-Bugzilla-Status: In Progress X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: kde@FreeBSD.org X-Bugzilla-Flags: maintainer-feedback? merge-quarterly? Message-ID: In-Reply-To: References: X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Oct 2019 15:38:35 -0000 Ting-Wei Lan has asked freebsd-x11 mailing list for maintainer-approval: Bug 240964: x11-toolkits/qt5-gui: 5.13.0 fails to build https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D240964 Attachment 208179: devel/evdev-proto: Use the same include guard as base https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D208179&action=3Dedit --- Comment #17 from Ting-Wei Lan --- Created attachment 208179 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D208179&action= =3Dedit devel/evdev-proto: Use the same include guard as base In order to prevent a source file from including both dev/evdev/input.h from base and linux/input.h from ports, these files should be the same include guards. This should fix the qt5-gui error caused by redefinition of structs. This patch also adds devel/evdev-proto to RUN_DEPENDS of devel/libmtdev bec= ause mtdev.h needs linux/input.h. I haven't tested the patch with poudriere. I only tested it with portmaster= on my desktop computer running FreeBSD 12.1-BETA3.