From patchwork Mon Jun 26 18:58:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 696482 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3391677wrm; Mon, 26 Jun 2023 12:15:32 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6YDRMKJj+7yW3ePJ8f8euShpjOybhXHPu+eb7KuK56hPupZpvVkWbS14c8RPPmaRUgZgTO X-Received: by 2002:ac8:5903:0:b0:400:aa47:a4a1 with SMTP id 3-20020ac85903000000b00400aa47a4a1mr2988103qty.25.1687806932605; Mon, 26 Jun 2023 12:15:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687806932; cv=none; d=google.com; s=arc-20160816; b=wFev+KUBSbzN12aM8Jp0pbmH6tYZNiMQ4XgNugXL4X6CBc/vEsER5vZ5B1u5rTZqbG lby3buCTZg3Up3N8qxyeZxWVvcurt5ialUSLzqkhe93z14UlTrqpGVEGZmpA0i/F/TEa MzWT9ME2KzzkffPcBSwT3iDqzv9iXxA2vOPNSMTwIzuEAciJS21prz9r9BgH0liqh7ix 38nYTOGtYbYleiZ/mPQpZpfQlzjmeTDJtG/AZzfK/OwoneqL7uCPg8QxNtRTlt8o18t2 Y67DwDzHiYuDjlhFMdhHsdh2XYVsTqoCPaA4fWhyJYD8r8GMU/hPs9rdYmi7RaxSIJm7 11lA== 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=iNA+VUTYfbEdx/vQeF8+9JE2SRU0GW5WPBNix8y3ge4=; fh=gnRLUxcSQFkqqnlDk6nT9jvYFtrM8UOZN4Rv8c8Mu8k=; b=nCLpDxljKoI0zM2Rj3WCU7c/Y5y9IxhCzGy4vJXQzZNwYhSdOHh06XPU893uiejsxF MfMoMYZHJ/X1gnXL7Kl/N+AboAoCodqxNrm2dncPCfYHFJy52esy4dEsh1y+tQGIL7fy ajDr81XqOEGpyVOeTa00TnZnLQGdycaS18YRpZYGTRxUNNlIKKI0xT+m/fJFOOG1GMCW BrTYSojl86uxvbZn5ENuAW9T65K/bn5GXx+bcSydKTU5x+l/DX5SG5LmSv+LheYfw1rY /X/jQ8B0uvQhib0AnpF0M6AWVt6U8ze+dHHo16/FgqzwC2iZB84ttxR/9IdQSEl4fqew P/YA== 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 t15-20020a05622a01cf00b003f4f306ce56si2148557qtw.495.2023.06.26.12.15.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jun 2023 12:15:32 -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 1qDrU0-00033I-T5; Mon, 26 Jun 2023 15:02:42 -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 1qDrTf-0002BZ-Kj; Mon, 26 Jun 2023 15:02:20 -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 1qDrTc-0007to-Kh; Mon, 26 Jun 2023 15:02:19 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id B2CE4EFC6; Mon, 26 Jun 2023 21:59:14 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 4C203F801; Mon, 26 Jun 2023 21:59:13 +0300 (MSK) Received: (nullmailer pid 1575385 invoked by uid 1000); Mon, 26 Jun 2023 18:59:05 -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-7.2.4 36/43] pc-bios/keymaps: Use the official xkb name for Arabic layout, not the legacy synonym Date: Mon, 26 Jun 2023 21:58:54 +0300 Message-Id: <20230626185902.1575177-36-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 06c75e646b..452395b962 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',