From owner-dev-commits-ports-all@freebsd.org Sat Sep 4 11:20:31 2021 Return-Path: Delivered-To: dev-commits-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 A953566049A; Sat, 4 Sep 2021 11:20:31 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H1sf71XTmz3Msr; Sat, 4 Sep 2021 11:20:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8654016CC6; Sat, 4 Sep 2021 11:20:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 184BKU3M052807; Sat, 4 Sep 2021 11:20:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 184BKUYK052806; Sat, 4 Sep 2021 11:20:30 GMT (envelope-from git) Date: Sat, 4 Sep 2021 11:20:30 GMT Message-Id: <202109041120.184BKUYK052806@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: ce0e0139a4ee - main - net/freerdp: add workaround for focus bug of WM MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce0e0139a4eea8fb76d6a49558903f7a9653c574 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Sep 2021 11:20:31 -0000 The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=ce0e0139a4eea8fb76d6a49558903f7a9653c574 commit ce0e0139a4eea8fb76d6a49558903f7a9653c574 Author: Felix Palmen AuthorDate: 2021-09-04 09:31:06 +0000 Commit: Tobias C. Berner CommitDate: 2021-09-04 11:16:14 +0000 net/freerdp: add workaround for focus bug of WM Some WMs (for example fvwm and fluxbox) intermittently steal focus during attempts to drag something with the mouse on the remote machine, effectively making it impossible to drag. This behavior seems to also depend on the configuration of the WM. Add an optional patch to work around this problem, activated by the new option BROKENFOCUS. Note that this workaround may lead to a wrong state of keyboard modifiers after focus changes, so only enable if if you really need to. PR: 254908 Approved by: VVD (maintainer) --- net/freerdp/Makefile | 8 ++++++-- net/freerdp/files/extra-patch-focusbug.diff | 10 ++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile index b0b09c9e47cf..f532caae4a2a 100644 --- a/net/freerdp/Makefile +++ b/net/freerdp/Makefile @@ -39,8 +39,9 @@ CMAKE_OFF= WITH_DSP_EXPERIMENTAL WITH_GPROF WITH_GSTREAMER_0_10 WITH_IPP \ CMAKE_ARGS_aarch64+= -DWITH_NEON=ON CFLAGS_aarch64+= -D__ARM_NEON__=__ARM_NEON # clang -OPTIONS_DEFINE= ALSA CUPS FAAC FAAD FFMPEG GSM GSTREAMER ICU JPEG KERBEROS \ - LAME MANPAGES OPENH264 PCSC PULSEAUDIO SOXR WAYLAND X11 +OPTIONS_DEFINE= ALSA BROKENFOCUS CUPS FAAC FAAD FFMPEG GSM GSTREAMER \ + ICU JPEG KERBEROS LAME MANPAGES OPENH264 PCSC \ + PULSEAUDIO SOXR WAYLAND X11 OPTIONS_DEFAULT= CUPS GSTREAMER ICU KERBEROS MANPAGES SWSCALE WAYLAND X11 OPTIONS_RADIO= SCALE OPTIONS_RADIO_SCALE= CAIRO SWSCALE @@ -55,6 +56,9 @@ OPTIONS_DEFAULT_amd64= SSE ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CMAKE_BOOL= WITH_ALSA +BROKENFOCUS_DESC= Work around focus bug in some WMs (PR \#254908) +BROKENFOCUS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-focusbug.diff + CAIRO_DESC= Use CAIRO image library for screen resizing CAIRO_LIB_DEPENDS= libcairo.so:graphics/cairo CAIRO_CMAKE_BOOL= WITH_CAIRO diff --git a/net/freerdp/files/extra-patch-focusbug.diff b/net/freerdp/files/extra-patch-focusbug.diff new file mode 100644 index 000000000000..39587df075a0 --- /dev/null +++ b/net/freerdp/files/extra-patch-focusbug.diff @@ -0,0 +1,10 @@ +--- client/X11/xf_keyboard.c.orig 2021-09-02 06:23:36 UTC ++++ client/X11/xf_keyboard.c +@@ -183,7 +183,6 @@ void xf_keyboard_release_all_keypress(xfContext* xfc) + xfc->KeyboardState[keycode] = FALSE; + } + } +- xf_sync_kbd_state(xfc); + } + + BOOL xf_keyboard_key_pressed(xfContext* xfc, KeySym keysym)