From owner-svn-ports-all@freebsd.org Mon Mar 23 20:55:09 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 910FF26E82D; Mon, 23 Mar 2020 20:55:09 +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 48mRTn39trz46S0; Mon, 23 Mar 2020 20:55:09 +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 4B3FB1C613; Mon, 23 Mar 2020 20:55:09 +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 02NKt98M035632; Mon, 23 Mar 2020 20:55:09 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02NKt8w4035630; Mon, 23 Mar 2020 20:55:08 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <202003232055.02NKt8w4035630@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Mon, 23 Mar 2020 20:55:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529003 - in head: . x11/libxkbcommon X-SVN-Group: ports-head X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: in head: . x11/libxkbcommon X-SVN-Commit-Revision: 529003 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, 23 Mar 2020 20:55:09 -0000 Author: zeising Date: Mon Mar 23 20:55:08 2020 New Revision: 529003 URL: https://svnweb.freebsd.org/changeset/ports/529003 Log: x11/libxkbcommon: swtch to legacy rules on 11 x11/libxkbcommon was switched to use evdev rules in r528813, but FreeBSD 11 still needs the legacy rules. Switch back to the legacy rules, but only on FreeBSD 11. Adjust the UPDATING entry to indicate that the switch to evdev rules by default is only on FreeBSD 12 and later, and that FreeBSD 11 still uses the legacy rules. Modified: head/UPDATING head/x11/libxkbcommon/Makefile Modified: head/UPDATING ============================================================================== --- head/UPDATING Mon Mar 23 19:21:13 2020 (r529002) +++ head/UPDATING Mon Mar 23 20:55:08 2020 (r529003) @@ -26,15 +26,15 @@ you update your ports collection, before attempting an The libxkbcommon library (x11/libxkbcommon), used to handle keyboards in some applications, most notably kde and wayland, have been switched - to use evdev rules by default. Some keys, most notably arrow keys, - may not work in applications using libxkbcommon if you are using - xf86-input-keyboard rather than xf86-input-libinput. + to use evdev rules by default on FreeBSD 12 and later. Some keys, most + notably arrow keys, may not work in applications using libxkbcommon if + you are using xf86-input-keyboard rather than xf86-input-libinput. If you have trouble with the keyboard keys, and if /var/log/Xorg.*.log shows that the "kbd" or "keyboard" driver is being used, you need to switch to legacy rules by setting the environment variable XKB_DEFAULT_RULES to xorg. This switch is made to match the default configuration on FreeBSD 12.1 and - later, the default configuration on FreeBSD 11.3 still requres the legacy + later, the default configuration on FreeBSD 11.3 still uses the legacy rules. 20200316: Modified: head/x11/libxkbcommon/Makefile ============================================================================== --- head/x11/libxkbcommon/Makefile Mon Mar 23 19:21:13 2020 (r529002) +++ head/x11/libxkbcommon/Makefile Mon Mar 23 20:55:08 2020 (r529003) @@ -2,7 +2,7 @@ PORTNAME= libxkbcommon PORTVERSION= 0.10.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= https://xkbcommon.org/download/ DIST_SUBDIR= xorg/lib @@ -21,4 +21,10 @@ MESON_ARGS= -Denable-docs=false \ -Denable-wayland=false \ -Dx-locale-root="${PREFIX}/lib/X11/locale" -.include +.include + +.if ${OSVERSION} < 1200000 +MESON_ARGS+= -Ddefault-rules=xorg +.endif + +.include