From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BD9DC1580FD for ; Tue, 24 Dec 2024 09:21:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D4395E077F; Tue, 24 Dec 2024 09:21:28 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 97D31E077F for ; Tue, 24 Dec 2024 09:21:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A416A33BE26 for ; Tue, 24 Dec 2024 09:21:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0FE29156C for ; Tue, 24 Dec 2024 09:21:25 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1735031984.c7a1da8d4b7f114f39af1a8cab5bfb7044729f37.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/, app-i18n/uim/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/uim/files/uim-set-face-underline.patch app-i18n/uim/uim-1.8.9-r2.ebuild X-VCS-Directories: app-i18n/uim/files/ app-i18n/uim/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c7a1da8d4b7f114f39af1a8cab5bfb7044729f37 X-VCS-Branch: master Date: Tue, 24 Dec 2024 09:21:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ef25ca06-bc63-425c-b97e-c053f29daf47 X-Archives-Hash: e556e7f97e1c674d8269739059b6d627 commit: c7a1da8d4b7f114f39af1a8cab5bfb7044729f37 Author: Z. Liu gmail com> AuthorDate: Sat Dec 14 13:56:18 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Dec 24 09:19:44 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7a1da8d app-i18n/uim: use set-face-underline apply patch from upstream which "s/set-face-underline-p/set-face-underline/g" Closes: https://bugs.gentoo.org/912958 Signed-off-by: Z. Liu gmail.com> Closes: https://github.com/gentoo/gentoo/pull/39710 Signed-off-by: Sam James gentoo.org> app-i18n/uim/files/uim-set-face-underline.patch | 32 +++++++++++++++++++++++++ app-i18n/uim/uim-1.8.9-r2.ebuild | 1 + 2 files changed, 33 insertions(+) diff --git a/app-i18n/uim/files/uim-set-face-underline.patch b/app-i18n/uim/files/uim-set-face-underline.patch new file mode 100644 index 000000000000..bf0d3a9a64d6 --- /dev/null +++ b/app-i18n/uim/files/uim-set-face-underline.patch @@ -0,0 +1,32 @@ +https://github.com/uim/uim/commit/7b903ddf144344e49da12cc070f7c11f82ae61db + +commit 7b903ddf144344e49da12cc070f7c11f82ae61db +Author: Sutou Kouhei +Date: Fri Aug 11 10:44:26 2023 +0900 + + emacs: use set-face-underline + + set-face-underline-p is removed in Emacs 29. + +diff --git a/emacs/uim-var.el b/emacs/uim-var.el +index 189f91c9..ce40b6db 100644 +--- a/emacs/uim-var.el ++++ b/emacs/uim-var.el +@@ -435,7 +435,7 @@ keeps the size of it when showing the candidates.") + (make-face 'uim-preedit-face) + + (copy-face 'uim-preedit-face 'uim-preedit-underline-face) +-(set-face-underline-p 'uim-preedit-underline-face t) ++(set-face-underline 'uim-preedit-underline-face t) + + ;; highlight + (make-face 'uim-preedit-highlight-face) +@@ -443,7 +443,7 @@ keeps the size of it when showing the candidates.") + (set-face-background 'uim-preedit-highlight-face "Blue3") + + (copy-face 'uim-preedit-highlight-face 'uim-preedit-highlight-underline-face) +-(set-face-underline-p 'uim-preedit-highlight-underline-face t) ++(set-face-underline 'uim-preedit-highlight-underline-face t) + + ;; separator + (make-face 'uim-separator-face) diff --git a/app-i18n/uim/uim-1.8.9-r2.ebuild b/app-i18n/uim/uim-1.8.9-r2.ebuild index 8e2c2252a1f1..679e1f61e788 100644 --- a/app-i18n/uim/uim-1.8.9-r2.ebuild +++ b/app-i18n/uim/uim-1.8.9-r2.ebuild @@ -90,6 +90,7 @@ PATCHES=( "${FILESDIR}"/${PN}-Wconversion.patch "${FILESDIR}"/${PN}-xkb.patch "${FILESDIR}"/${PN}-zh-TW.patch + "${FILESDIR}"/${PN}-set-face-underline.patch ) DOCS=( AUTHORS NEWS README RELNOTE doc )