summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZ. Liu <zhixu.liu@gmail.com>2024-12-14 21:56:18 +0800
committerSam James <sam@gentoo.org>2024-12-24 09:19:44 +0000
commitc7a1da8d4b7f114f39af1a8cab5bfb7044729f37 (patch)
tree1c0f05354f259137a77b2980177dfb42c668452f /app-i18n
parentdev-java/fontbox: Stabilize 2.0.32 ppc64, #946185 (diff)
downloadgentoo-c7a1da8d4b7f114f39af1a8cab5bfb7044729f37.tar.gz
gentoo-c7a1da8d4b7f114f39af1a8cab5bfb7044729f37.tar.bz2
gentoo-c7a1da8d4b7f114f39af1a8cab5bfb7044729f37.zip
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 <zhixu.liu@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/39710 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-i18n')
-rw-r--r--app-i18n/uim/files/uim-set-face-underline.patch32
-rw-r--r--app-i18n/uim/uim-1.8.9-r2.ebuild1
2 files changed, 33 insertions, 0 deletions
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 <kou@clear-code.com>
+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 )