From owner-svn-ports-all@freebsd.org Mon May 4 16:08:17 2020 Return-Path: Delivered-To: svn-ports-all@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 9259D2D3D81; Mon, 4 May 2020 16:08:17 +0000 (UTC) (envelope-from zeising@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 49G77P3Msjz4Nn8; Mon, 4 May 2020 16:08:17 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (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 6F05326C4A; Mon, 4 May 2020 16:08:17 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 044G8HnN087183; Mon, 4 May 2020 16:08:17 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 044G8HKP087181; Mon, 4 May 2020 16:08:17 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <202005041608.044G8HKP087181@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Mon, 4 May 2020 16:08:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r533929 - branches/2020Q2/x11-servers/xorg-server X-SVN-Group: ports-branches X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: branches/2020Q2/x11-servers/xorg-server X-SVN-Commit-Revision: 533929 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 May 2020 16:08:17 -0000 Author: zeising Date: Mon May 4 16:08:16 2020 New Revision: 533929 URL: https://svnweb.freebsd.org/changeset/ports/533929 Log: MFH: r533807 xorg-server: Do not send spurious focus events Apply an upstream patch to avoid sending focus evens when grab actually does not change. This fixes certain full screen applications. [1] Ensure that we actually don't try to find and link against HAL even if it's around on the system we're compiling on [2] Add CPE information [3] PR: 245854 [1] (with changes), 245604 [2], 197712 [3] Submitted by: naddy@ [1], mi@ [2], arrowd [3] Reported by: shun [3] Approved by: ports-secteam (joenum) Modified: branches/2020Q2/x11-servers/xorg-server/Makefile branches/2020Q2/x11-servers/xorg-server/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/x11-servers/xorg-server/Makefile ============================================================================== --- branches/2020Q2/x11-servers/xorg-server/Makefile Mon May 4 15:03:58 2020 (r533928) +++ branches/2020Q2/x11-servers/xorg-server/Makefile Mon May 4 16:08:16 2020 (r533929) @@ -3,6 +3,7 @@ PORTNAME?= xorg-server PORTVERSION?= 1.20.8 +PORTREVISION?= 1 PORTEPOCH?= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver @@ -11,6 +12,9 @@ DISTNAME= xorg-server-${PORTVERSION} MAINTAINER= x11@FreeBSD.org COMMENT?= X.Org X server and related programs +PATCH_SITES= https://gitlab.freedesktop.org/xorg/xserver/commit/ +PATCHFILES= 271934db9f3b1297754b29855646e0a4ee01db59.diff:-p1 + LICENSE= MIT RUN_DEPENDS+= xkeyboard-config>=2.5:x11/xkeyboard-config \ @@ -55,15 +59,16 @@ DEFAULT_FONTPATH_LIST= \ DEFAULT_FONTPATH_CMD=${ECHO_CMD} ${DEFAULT_FONTPATH_LIST} | ${TR} ' ' , PLIST_SUB+= FONTPATHD="${FONTPATHD:S,^${PREFIX}/,,}" -USES= compiler:c11 gl gmake perl5 ssl xorg xorg-cat:xserver +USES= compiler:c11 cpe gl gmake perl5 ssl xorg xorg-cat:xserver USE_PERL5= build USE_GL+= gl USE_XORG+= pixman xau xdmcp xfont2 xkbfile xorgproto xshmfence xtrans CONFIGURE_ARGS+=--without-doxygen --without-xmlto --without-fop \ --with-default-font-path="$$(${DEFAULT_FONTPATH_CMD})" \ - --without-dtrace --with-shared-memory-dir=/tmp \ + --without-dtrace --disable-config-hal \ --disable-install-setuid --disable-unit-tests INSTALL_TARGET= install-strip +CPE_VENDOR= x.org .if ${SLAVE_PORT} == "no" || ${PORTNAME} == "xephyr" || ${PORTNAME} == "xwayland" LIB_DEPENDS+= libdrm.so:graphics/libdrm \ Modified: branches/2020Q2/x11-servers/xorg-server/distinfo ============================================================================== --- branches/2020Q2/x11-servers/xorg-server/distinfo Mon May 4 15:03:58 2020 (r533928) +++ branches/2020Q2/x11-servers/xorg-server/distinfo Mon May 4 16:08:16 2020 (r533929) @@ -1,3 +1,5 @@ -TIMESTAMP = 1585642684 +TIMESTAMP = 1588512348 SHA256 (xorg/xserver/xorg-server-1.20.8.tar.bz2) = d17b646bee4ba0fb7850c1cc55b18e3e8513ed5c02bdf38da7e107f84e2d0146 SIZE (xorg/xserver/xorg-server-1.20.8.tar.bz2) = 6309640 +SHA256 (xorg/xserver/271934db9f3b1297754b29855646e0a4ee01db59.diff) = b29a3af8f6d93a5b6e1d4652fca0a76e438884dee8caf03f89148fbc47c98f71 +SIZE (xorg/xserver/271934db9f3b1297754b29855646e0a4ee01db59.diff) = 1262