From patchwork Mon Jun 26 18:49:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 696477 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3389142wrm; Mon, 26 Jun 2023 12:09:17 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7+cAVXKFJV42h1MX/DhavD7yZpH7K1KJG93G2QmtUpve9WmzGP59Z14HW1/UxcijmFQg3P X-Received: by 2002:a05:6214:c66:b0:635:da80:e53a with SMTP id t6-20020a0562140c6600b00635da80e53amr5519360qvj.12.1687806557055; Mon, 26 Jun 2023 12:09:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687806557; cv=none; d=google.com; s=arc-20160816; b=XD0FtcSWit0UAd0FU4OgH5X8sLyXt+fZwfCAoYi1MvTyew9qu6KxO31ret9TKI1KaH i7nYnPnm/EarjilBtofniusXdSCZUyVuthPaFC0bsbfpUldxu/HPCBxqIlKmPc+IHqp3 WIJq9DURAQlT4WeUVgHDaeddUJQfQc6i62masoR6W7/7ZnRnOrABh3eE38bRhBnsey3B 94okRPbr5PDPSnYK8aAZFuucU3jAxE3r9p62ZRqkzW77mmjd2Q3tfi+X7ENWlW7au+GR DYXIOhmOwzan/R8MlJaC0s3K4XZ8yJVOXdrwkF+hoM9M6HMgRSr/SKmp8jjxUh2SO+rD kObA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=0t3Vbu2F2xhgOOMsPbnqYyceSdtg/9W8syS5MlRtldw=; fh=gnRLUxcSQFkqqnlDk6nT9jvYFtrM8UOZN4Rv8c8Mu8k=; b=xS2loK/+PTd3mqXcbwhRc3mtP3I1M3Ulkzl4wI5u9CXn9ZE5+xezVk8i4PcPqrRts7 a8HCMkocbMgjU3Epttg0zfNqs015LFwJIB3aeL8efTwf/brBHHO6dc03DUbpPeI5N5LG XRp7HmAWnC4IEzdeeDbDu0691ziuH64VwAeJJ8rM2pkzGRrh9UZlu4Z6icUGfcFrLZi6 ynPFfVcCFQ5WRrqQvegfM44HTyLS8XmGRfLr/GB59xSEn1POadFwDtHAOkTN2DwuxnaD sQROLcYJjrItYhBjHZcwIpjLNkrszFSPAoeQw7uC+sMAyddWX9dXfA89gmnNupZNZMee uWWw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id iu4-20020ad45cc4000000b006286abef063si2299731qvb.77.2023.06.26.12.09.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jun 2023 12:09:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDrNA-00044j-OG; Mon, 26 Jun 2023 14:55:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qDrMS-00021w-9F; Mon, 26 Jun 2023 14:54:52 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qDrME-0005k5-RN; Mon, 26 Jun 2023 14:54:40 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 16646EF45; Mon, 26 Jun 2023 21:50:30 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id A54BEF7D4; Mon, 26 Jun 2023 21:50:28 +0300 (MSK) Received: (nullmailer pid 1574097 invoked by uid 1000); Mon, 26 Jun 2023 18:50:16 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org, qemu-stable@nongnu.org Cc: Peter Maydell , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , =?utf-8?q?Daniel_P_=2E_Berran?= =?utf-8?q?g=C3=A9?= , Michael Tokarev Subject: [Stable-8.0.3 46/54] pc-bios/keymaps: Use the official xkb name for Arabic layout, not the legacy synonym Date: Mon, 26 Jun 2023 21:49:53 +0300 Message-Id: <20230626185002.1573836-46-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Peter Maydell The xkb official name for the Arabic keyboard layout is 'ara'. However xkb has for at least the past 15 years also permitted it to be named via the legacy synonym 'ar'. In xkeyboard-config 2.39 this synoynm was removed, which breaks compilation of QEMU: FAILED: pc-bios/keymaps/ar /home/fred/qemu-git/src/qemu/build-full/qemu-keymap -f pc-bios/keymaps/ar -l ar xkbcommon: ERROR: Couldn't find file "symbols/ar" in include paths xkbcommon: ERROR: 1 include paths searched: xkbcommon: ERROR: /usr/share/X11/xkb xkbcommon: ERROR: 3 include paths could not be added: xkbcommon: ERROR: /home/fred/.config/xkb xkbcommon: ERROR: /home/fred/.xkb xkbcommon: ERROR: /etc/xkb xkbcommon: ERROR: Abandoning symbols file "(unnamed)" xkbcommon: ERROR: Failed to compile xkb_symbols xkbcommon: ERROR: Failed to compile keymap The upstream xkeyboard-config change removing the compat mapping is: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/470ad2cd8fea84d7210377161d86b31999bb5ea6 Make QEMU always ask for the 'ara' xkb layout, which should work on both older and newer xkeyboard-config. We leave the QEMU name for this keyboard layout as 'ar'; it is not the only one where our name for it deviates from the xkb standard name. Cc: qemu-stable@nongnu.org Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Message-id: 20230620162024.1132013-1-peter.maydell@linaro.org Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1709 (cherry picked from commit 497fad38979c16b6412388927401e577eba43d26) Signed-off-by: Michael Tokarev diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build index 158a3b410c..1cbcdebefa 100644 --- a/pc-bios/keymaps/meson.build +++ b/pc-bios/keymaps/meson.build @@ -1,5 +1,5 @@ keymaps = { - 'ar': '-l ar', + 'ar': '-l ara', 'bepo': '-l fr -v dvorak', 'cz': '-l cz', 'da': '-l dk',