From a04e9209207acf9da8d2ce4acbe33da17032d54a Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 25 Feb 2025 16:44:51 +0900 Subject: [PATCH] New upstream release. Resolves: rhbz#2347165 Disable OpenSSL support. OpenSSL plugin isn't packaged. should be no harm. --- sources | 1 + uim-configure-c99.patch | 20 -------------------- uim-fix-bufferoverflow.patch | 12 ------------ uim-fix-emacs29.patch | 35 ----------------------------------- uim.spec | 17 ++++++++++------- 5 files changed, 11 insertions(+), 74 deletions(-) delete mode 100644 uim-configure-c99.patch delete mode 100644 uim-fix-bufferoverflow.patch delete mode 100644 uim-fix-emacs29.patch diff --git a/sources b/sources index e1f4fca..30def35 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (uim-1.8.9.tar.bz2) = 342bda32f27b9875bf1458adbfb3d3cdd92d98daf8068647e3cb01f9757fda6befbb44a7b9ba2b25b03e14b1de68c7e2d6b57362e84d6aae8bcff3959aaa12df +SHA512 (uim-1.9.0.tar.bz2) = f83aa3baf83131397ef495ed52270f6753273c058d6214acb0f08cf9d6e1698093b6325d8b6342352c3712f5177f690d387da3d24c60b3870ca78ec426a0f79e diff --git a/uim-configure-c99.patch b/uim-configure-c99.patch deleted file mode 100644 index e631421..0000000 --- a/uim-configure-c99.patch +++ /dev/null @@ -1,20 +0,0 @@ -Avoid an undeclared exit function call in the snprintf configure check. -This improves compatibility with strict(er) C99 compilers, which may -not support implicit function declarations because they were removed -from the C language in 1999. - -Submitted upstream: - -diff --git a/configure.ac b/configure.ac -index 042d68927b76435c..84fcd38c9d3245db 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -595,7 +595,7 @@ if test "x$ac_cv_func_snprintf" = xyes; then - AC_RUN_IFELSE( - [AC_LANG_SOURCE([[ - #include --int main(void){char b[5];snprintf(b,5,"123456789");exit(b[4]!='\0');} -+int main(void){char b[5];snprintf(b,5,"123456789");return b[4]!='\0';} - ]])], - [AC_MSG_RESULT(yes)], - [ diff --git a/uim-fix-bufferoverflow.patch b/uim-fix-bufferoverflow.patch deleted file mode 100644 index eff6d6f..0000000 --- a/uim-fix-bufferoverflow.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -pruN uim-1.8.6.orig/uim/m17nlib.c uim-1.8.6/uim/m17nlib.c ---- uim-1.8.6.orig/uim/m17nlib.c 2013-06-30 13:26:09.000000000 +0900 -+++ uim-1.8.6/uim/m17nlib.c 2018-02-27 20:01:51.098951178 +0900 -@@ -232,7 +232,7 @@ static char * - convert_mtext2str(MText *mtext) - { - mconv_rebind_buffer(converter, (unsigned char *)buffer_for_converter, -- sizeof(buffer_for_converter)); -+ sizeof(buffer_for_converter)-1); - mconv_encode(converter, mtext); - buffer_for_converter[converter->nbytes] = 0; - diff --git a/uim-fix-emacs29.patch b/uim-fix-emacs29.patch deleted file mode 100644 index e7af158..0000000 --- a/uim-fix-emacs29.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 7b903ddf144344e49da12cc070f7c11f82ae61db Mon Sep 17 00:00:00 2001 -From: Sutou Kouhei -Date: Fri, 11 Aug 2023 10:44:26 +0900 -Subject: [PATCH] emacs: use set-face-underline - -set-face-underline-p is removed in Emacs 29. ---- - emacs/uim-var.el | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -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) --- -2.43.0 - diff --git a/uim.spec b/uim.spec index e2d4347..d090054 100644 --- a/uim.spec +++ b/uim.spec @@ -1,12 +1,12 @@ %global inst_xinput %{_sbindir}/update-alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf 50 %global uninst_xinput %{_sbindir}/update-alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf -%global srcver 1.8.9 +%global srcver 1.9.0 %bcond_with canna Name: uim -Version: 1.8.9 -Release: 10%{?dist} +Version: 1.9.0 +Release: 1%{?dist} # uim itself is licensed under BSD # scm/py.scm, helper/eggtrayicon.[ch], qt/pref-kseparator.{cpp,h} # and qt/chardict/chardict-kseparator.{cpp,h} is licensed under LGPLv2+ @@ -34,8 +34,6 @@ Source0: https://github.com/uim/uim/releases/download/%{version}/uim-%{version}. Source1: xinput.d-uim Source2: uim-init.el Patch1: uim-emacs-utf8.patch -Patch2: uim-configure-c99.patch -Patch3: uim-fix-emacs29.patch Patch4: uim-ftbfs.patch @@ -210,7 +208,7 @@ autoconf --enable-kde4-applet \ --with-curl \ --with-expat \ - --enable-openssl --with-ssl-engine \ + --disable-openssl \ --with-sqlite3 \ --with-lispdir=%{_datadir}/emacs/site-lisp \ --enable-pref @@ -384,7 +382,6 @@ fi %{_libdir}/uim/plugin/libuim-fileio.so %{_libdir}/uim/plugin/libuim-lolevel.so %{_libdir}/uim/plugin/libuim-look.so -# %%{_libdir}/uim/plugin/libuim-openssl.so %{_libdir}/uim/plugin/libuim-process.so %{_libdir}/uim/plugin/libuim-socket.so %{_libdir}/uim/plugin/libuim-sqlite3.so @@ -498,6 +495,12 @@ fi %dir %{_datadir}/uim %changelog +* Tue Feb 25 2025 Akira TAGOH - 1.9.0-1 +- New upstream release. + Resolves: rhbz#2347165 +- Disable OpenSSL support. + OpenSSL plugin isn't packaged. should be no harm. + * Wed Jan 29 2025 Akira TAGOH - 1.8.9-10 - Fix FTBFS Resolves: rhbz#2341480