9 files changed, 104 insertions, 86 deletions
diff --git a/app-i18n/uim/files/uim-1.8.8-c++11.patch b/app-i18n/uim/files/uim-1.8.8-c++11.patch
deleted file mode 100644
index 07e082840967..000000000000
--- a/app-i18n/uim/files/uim-1.8.8-c++11.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From bb25aac568359efbfb68e52dd8d9ee85e65d754b Mon Sep 17 00:00:00 2001
-From: Haelwenn Monnier <lanodan@users.noreply.github.com>
-Date: Thu, 25 Oct 2018 09:10:16 +0200
-Subject: [PATCH] xim/main.cpp: FIx build against clang
-
-main.cpp:68:55: error: invalid suffix on literal; C++11 requires a space between literal and identifier
----
- xim/main.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xim/main.cpp b/xim/main.cpp
-index a0b0beceb..c5818ca4a 100644
---- a/xim/main.cpp
-+++ b/xim/main.cpp
-@@ -65,7 +65,7 @@ int g_option_mask;
- int scr_width, scr_height;
- int host_byte_order;
- 
--#define VERSION_NAME "uim-xim under the way! Version "PACKAGE_VERSION"\n"
-+#define VERSION_NAME "uim-xim under the way! Version " PACKAGE_VERSION "\n"
- const char *version_name=VERSION_NAME;
- const char *usage=
- "--help , --version :Show usage or version\n"
diff --git a/app-i18n/uim/files/uim-1.8.8-desktop.patch b/app-i18n/uim/files/uim-1.8.8-desktop.patch
deleted file mode 100644
index 5e0687547915..000000000000
--- a/app-i18n/uim/files/uim-1.8.8-desktop.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 63cda66c1665b8ccc9ae11a5a4fb341afb8c5ac0 Mon Sep 17 00:00:00 2001
-From: OBATA Akio <obache@users.noreply.github.com>
-Date: Mon, 30 Dec 2019 22:26:11 +0900
-Subject: [PATCH] Fix to use pref tool with default toolkit (#151)
-
----
- configure.ac      | 1 +
- uim.desktop.in.in | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 472c67f02..d530bc081 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1188,6 +1188,7 @@ AM_CONDITIONAL(DEFAULT_TOOLKIT_GTK3, test "x$default_toolkit" = xgtk3)
- AM_CONDITIONAL(DEFAULT_TOOLKIT_QT,  test "x$default_toolkit" = xqt)
- AM_CONDITIONAL(DEFAULT_TOOLKIT_QT4, test "x$default_toolkit" = xqt4)
- AM_CONDITIONAL(DEFAULT_TOOLKIT_QT5, test "x$default_toolkit" = xqt5)
-+AC_SUBST(default_toolkit)
- 
- AC_ARG_ENABLE(fep,
-   AC_HELP_STRING([--disable-fep],
-diff --git a/uim.desktop.in.in b/uim.desktop.in.in
-index b4a4d4f50..38c5c6d5e 100644
---- a/uim.desktop.in.in
-+++ b/uim.desktop.in.in
-@@ -3,7 +3,7 @@ Type=Application
- _Name=Input Method
- _Comment=Customize uim input method environment
- _Keywords=input;method;
--Exec=uim-pref-gtk
-+Exec=uim-pref-@default_toolkit@
- Icon=@uim_pixmapsdir@/uim-icon.png
- Terminal=false
- Categories=Settings;X-GNOME-PersonalSettings;
diff --git a/app-i18n/uim/files/uim-1.8.8-fno-common.patch b/app-i18n/uim/files/uim-1.8.8-fno-common.patch
deleted file mode 100644
index ff974bb5d5b2..000000000000
--- a/app-i18n/uim/files/uim-1.8.8-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/sigscheme/libgcroots/include/private/gc_priv.h
-+++ b/sigscheme/libgcroots/include/private/gc_priv.h
-@@ -1979,7 +1979,7 @@
-   /* the signal mask.						*/
- # define SETJMP(env) sigsetjmp(env, 1)
- # define LONGJMP(env, val) siglongjmp(env, val)
--# define JMP_BUF sigjmp_buf
-+# define JMP_BUF extern sigjmp_buf
- #else
- # ifdef ECOS
- #   define SETJMP(env)  hal_setjmp(env)
diff --git a/app-i18n/uim/files/uim-Wconversion.patch b/app-i18n/uim/files/uim-Wconversion.patch
new file mode 100644
index 000000000000..d90433b414bf
--- /dev/null
+++ b/app-i18n/uim/files/uim-Wconversion.patch
@@ -0,0 +1,13 @@
+--- a/qt4/common.pro.in
++++ b/qt4/common.pro.in
+@@ -20,10 +20,6 @@
+ QMAKE_CXX               = @CXX@
+ QMAKE_CXXFLAGS_DEBUG   += @CXXFLAGS@ @CPPFLAGS@ @X_CFLAGS@
+ QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @CPPFLAGS@ @X_CFLAGS@
+-# Remove "-Wconversion" from CXXFLAGS to avoid lots of warnings
+-# from Qt4 header files
+-QMAKE_CXXFLAGS_DEBUG    = $$replace(QMAKE_CXXFLAGS_DEBUG, "-Wconversion", "")
+-QMAKE_CXXFLAGS_RELEASE  = $$replace(QMAKE_CXXFLAGS_RELEASE, "-Wconversion", "")
+ QMAKE_LINK              = @CXX@
+ QMAKE_LFLAGS            = @LDFLAGS@
+ QMAKE_STRIP             =
diff --git a/app-i18n/uim/files/uim-clang-16.patch b/app-i18n/uim/files/uim-clang-16.patch
new file mode 100644
index 000000000000..b8b32532881a
--- /dev/null
+++ b/app-i18n/uim/files/uim-clang-16.patch
@@ -0,0 +1,44 @@
+Part of this went upstream as https://github.com/uim/uim/commit/99fd890fa601b81ff99e5e0f1977fe309f56b90e.
+
+The rest was done in https://github.com/uim/uim/pull/198.
+--- a/configure.ac
++++ b/configure.ac
+@@ -601,6 +601,7 @@ if test "x$ac_cv_func_snprintf" = xyes; then
+ 	AC_RUN_IFELSE(
+ 		[AC_LANG_SOURCE([[
+ #include <stdio.h>
++#include <stdlib.h>
+ int main(void){char b[5];snprintf(b,5,"123456789");exit(b[4]!='\0');}
+ 		]])],
+ 		[AC_MSG_RESULT(yes)],
+--- a/m4/openssl.m4
++++ b/m4/openssl.m4
+@@ -76,6 +76,7 @@ AC_MSG_CHECKING([OpenSSL header version])
+ AC_RUN_IFELSE(
+ 	[AC_LANG_SOURCE([[
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <openssl/opensslv.h>
+ #define DATA "conftest.sslincver"
+@@ -156,7 +157,9 @@ AC_ARG_WITH(openssl-header-check,
+ AC_MSG_CHECKING([whether OpenSSL's headers match the library])
+ AC_RUN_IFELSE(
+ 	[AC_LANG_SOURCE([[
++#include <stdlib.h>
+ #include <string.h>
++#include <openssl/crypto.h>
+ #include <openssl/opensslv.h>
+ int main(void) { exit(SSLeay() == OPENSSL_VERSION_NUMBER ? 0 : 1); }
+ 	]])],
+@@ -220,8 +223,8 @@ int main(void) { DTLSv1_method(); }
+ AC_MSG_CHECKING([if programs using OpenSSL functions will link])
+ AC_LINK_IFELSE(
+ 	[AC_LANG_SOURCE([[
+-#include <openssl/evp.h>
+-int main(void) { SSLeay_add_all_algorithms(); }
++#include <openssl/crypto.h>
++int main(void) { OpenSSL_version_num(); }
+ 	]])],
+ 	[
+ 		AC_MSG_RESULT(yes)
diff --git a/app-i18n/uim/files/uim-gentoo.patch b/app-i18n/uim/files/uim-gentoo.patch
index de498b754d86..649288932259 100644
--- a/app-i18n/uim/files/uim-gentoo.patch
+++ b/app-i18n/uim/files/uim-gentoo.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -38,6 +38,7 @@
+@@ -56,6 +56,7 @@
  AC_PATH_PROGS(SED, sed gsed)
  AX_PATH_QMAKE4
  AX_PATH_QMAKE5
@@ -8,7 +8,19 @@
  
  AM_MAINTAINER_MODE
  
-@@ -1618,7 +1619,7 @@
+@@ -575,6 +576,11 @@
+ AC_CHECK_FUNCS([waitpid])
+ AC_CHECK_FUNCS([daemon])
+ 
++AC_CHECK_DECL([va_copy],
++              [AC_DEFINE(HAVE_VA_COPY, 1, [Define to 1 if you have the `va_copy' macro.])],
++              [AC_CHECK_DECL([__va_copy],
++                             [AC_DEFINE(HAVE___VA_COPY, 1, [Define to 1 if you have the `__va_copy' macro.])])])
++
+ # IRIX has a const char return value for gai_strerror()
+ AC_CHECK_FUNCS(gai_strerror,[
+         AC_DEFINE(HAVE_GAI_STRERROR)
+@@ -1637,7 +1643,7 @@
    fi
    AX_LANG_WNOERROR  # end AC_LANG_WERROR
  
@@ -17,7 +29,7 @@
  else
    CFLAGS="$CFLAGS -DNDEBUG"
    CXXFLAGS="$CXXFLAGS -DNDEBUG"
-@@ -1629,7 +1630,7 @@
+@@ -1648,7 +1654,7 @@
    AX_CFLAGS_GCC_OPTION([-Wno-unused-function], [UIM_SCM_CFLAGS])
    AX_LANG_WNOERROR  # end AC_LANG_WERROR
  
@@ -26,3 +38,13 @@
  fi
  
  AC_ARG_ENABLE(warnings-into-error,
+--- a/sigscheme/src/Makefile.am
++++ b/sigscheme/src/Makefile.am
+@@ -51,7 +51,6 @@
+         functable-srfi60.c
+ 
+ if MAINTAINER_MODE
+-$(FUNC_TABLES): $(top_builddir)/config.status
+ # Core
+ SSCM_CORE_SRCS = \
+ 	$(srcdir)/error.c \
diff --git a/app-i18n/uim/files/uim-kde.patch b/app-i18n/uim/files/uim-kde.patch
index 8a291650ae3d..dfac6b556435 100644
--- a/app-i18n/uim/files/uim-kde.patch
+++ b/app-i18n/uim/files/uim-kde.patch
@@ -29,7 +29,15 @@
  AC_ARG_ENABLE(pref,
    AC_HELP_STRING([--disable-pref],
      [do not build graphical utility to edit user settings]),
-@@ -1948,12 +1970,15 @@
+@@ -1883,7 +1905,6 @@
+   cmake_option="-DCMAKE_BUILD_TYPE=${cmake_build_type}"
+   cmake_option="${cmake_option} -DCMAKE_INSTALL_PREFIX=${prefix}"
+   cmake_option="${cmake_option} -DCMAKE_SKIP_RPATH=true"
+-  cmake_option="${cmake_option} -DKDE4_USE_ALWAYS_FULL_RPATH=false"
+ fi
+ 
+ if test "x$with_qt4" = xyes; then
+@@ -1948,12 +1969,15 @@
      qt5_immodule_option="DEFINES+=QT5_IMMODULE"
    fi
    set -e
@@ -51,7 +59,7 @@
    ${QMAKE5} -o ${ac_abs_top_builddir}/qt5/candwin/Makefile.qmake \
      ${ac_abs_top_builddir}/qt5/candwin/uim-candwin-qt5.pro
    ${QMAKE5} -o ${ac_abs_top_builddir}/qt5/chardict/Makefile.qmake \
-@@ -2007,6 +2032,7 @@
+@@ -2007,6 +2031,7 @@
     Qt5 immodule    : ${with_qt5_immodule}
     KDE3 Applet     : ${enable_kde_applet}
     KDE4 Applet     : ${enable_kde4_applet}
diff --git a/app-i18n/uim/files/uim-slibtool.patch b/app-i18n/uim/files/uim-slibtool.patch
index 51560d439e25..2efec471c2cc 100644
--- a/app-i18n/uim/files/uim-slibtool.patch
+++ b/app-i18n/uim/files/uim-slibtool.patch
@@ -7,7 +7,7 @@
 -                @abs_top_builddir@/replace/.libs @abs_top_builddir@/uim/.libs
 -LIBS += -lreplace -luim -luim-scm
 +                @abs_top_builddir@/replace/.libs @abs_top_builddir@/uim/.libs \
-+		@abs_top_builddir@/sigscheme/libgcroots/.libs
++                @abs_top_builddir@/sigscheme/libgcroots/.libs
 +LIBS += -lreplace -luim -luim-scm -lgcroots
  !win32:!embedded:!mac {
      LIBS += -luim-x-util
diff --git a/app-i18n/uim/files/uim-zh-TW.patch b/app-i18n/uim/files/uim-zh-TW.patch
index f73850013178..dce86724a27a 100644
--- a/app-i18n/uim/files/uim-zh-TW.patch
+++ b/app-i18n/uim/files/uim-zh-TW.patch
@@ -1,11 +1,11 @@
---- a/xim/convdisp.cpp
-+++ b/xim/convdisp.cpp
-@@ -69,7 +69,7 @@
- #endif
- 
- const char *fontset_zhCN = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -isas-fangsong ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0";
--const char *fontset_zhTW = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -taipei-fixed-medium-r-normal--16-150-75-75-c-160-big5-0";
-+const char *fontset_zhTW = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -eten-fixed-medium-r-normal--16-150-75-75-c-160-big5.eten-0";
- const char *fontset_ja = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -jis-fixed-medium-r-normal--16-*-75-75-c-160-jisx0208.1983-0, -sony-fixed-medium-r-normal--16-*-*-*-c-80-jisx0201.1976-0";
- const char *fontset_ko = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -daewoo-gothic-medium-r-normal--16-120-100-100-c-160-ksc5601.1987-0";
- 
+--- a/scm/im-custom.scm
++++ b/scm/im-custom.scm
+@@ -679,7 +679,7 @@
+ (define-custom 'uim-xim-fontset-zh-tw
+   (string-join '(
+     "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1"
+-    "-taipei-fixed-medium-r-normal--16-150-75-75-c-160-big5-0"
++    "-eten-fixed-medium-r-normal--16-150-75-75-c-160-big5.eten-0"
+     ) ",")
+   '(xim xim-preedit)
+   '(string ".*")