diff options
Diffstat (limited to 'app-i18n/uim/files')
-rw-r--r-- | app-i18n/uim/files/uim-1.8.8-c++11.patch | 23 | ||||
-rw-r--r-- | app-i18n/uim/files/uim-1.8.8-desktop.patch | 35 | ||||
-rw-r--r-- | app-i18n/uim/files/uim-kde.patch | 72 | ||||
-rw-r--r-- | app-i18n/uim/files/uim-slibtool.patch | 14 |
4 files changed, 144 insertions, 0 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 new file mode 100644 index 000000000000..07e082840967 --- /dev/null +++ b/app-i18n/uim/files/uim-1.8.8-c++11.patch @@ -0,0 +1,23 @@ +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 new file mode 100644 index 000000000000..5e0687547915 --- /dev/null +++ b/app-i18n/uim/files/uim-1.8.8-desktop.patch @@ -0,0 +1,35 @@ +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-kde.patch b/app-i18n/uim/files/uim-kde.patch new file mode 100644 index 000000000000..8a291650ae3d --- /dev/null +++ b/app-i18n/uim/files/uim-kde.patch @@ -0,0 +1,72 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1449,6 +1449,28 @@ + + AM_CONDITIONAL(KDE4_APPLET, test "x$enable_kde4_applet" = xyes) + ++dnl **************************** ++dnl *** test for KDE5 applet *** ++dnl **************************** ++AC_ARG_ENABLE(kde5-applet, ++ AC_HELP_STRING([--disable-kde5-applet], ++ [do not build uim KDE Plasma 5 widget]), ++ [], ++ [enable_kde5_applet=yes]) ++ ++if test "x$enable_kde5_applet" != xno; then ++ if test "x$with_qt5" != xyes; then ++ enable_kde5_applet=no ++ fi ++fi ++ ++if test "x$enable_kde5_applet" = xyes && test "x$CMAKE" = xno; then ++ AC_MSG_WARN([no CMake found]) ++ enable_kde5_applet=no ++fi ++ ++AM_CONDITIONAL(KDE5_APPLET, test "x$enable_kde5_applet" = xyes) ++ + AC_ARG_ENABLE(pref, + AC_HELP_STRING([--disable-pref], + [do not build graphical utility to edit user settings]), +@@ -1948,12 +1970,15 @@ + qt5_immodule_option="DEFINES+=QT5_IMMODULE" + fi + set -e +- # FIXME: move CMAKE_CXX_FLAGS into cmake_option +- ${CMAKE} \ +- -B ${ac_abs_top_builddir}/qt5/applet.cmake \ +- -S ${ac_abs_top_srcdir}/qt5/applet \ +- -DCMAKE_CXX_FLAGS="${CXXFLAGS} ${X_CFLAGS}" \ +- ${cmake_option} ++ # Generate a Makefile for KDE5 applet by cmake ++ if test "x$enable_kde5_applet" = xyes; then ++ # FIXME: move CMAKE_CXX_FLAGS into cmake_option ++ ${CMAKE} \ ++ -B ${ac_abs_top_builddir}/qt5/applet.cmake \ ++ -S ${ac_abs_top_srcdir}/qt5/applet \ ++ -DCMAKE_CXX_FLAGS="${CXXFLAGS} ${X_CFLAGS}" \ ++ ${cmake_option} ++ fi + ${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 @@ + Qt5 immodule : ${with_qt5_immodule} + KDE3 Applet : ${enable_kde_applet} + KDE4 Applet : ${enable_kde4_applet} ++ KDE5 Applet : ${enable_kde5_applet} + FEP : ${enable_fep} + Emacs : ${enable_emacs} + XIM : ${use_xim} +--- a/qt5/applet/Makefile.am ++++ b/qt5/applet/Makefile.am +@@ -6,6 +6,8 @@ + plasmoid + + if QT5 ++if KDE5_APPLET + all clean install uninstall: + $(MAKE) $(AM_MAKEFLAGS) -C ../applet.cmake $@ + endif ++endif diff --git a/app-i18n/uim/files/uim-slibtool.patch b/app-i18n/uim/files/uim-slibtool.patch new file mode 100644 index 000000000000..51560d439e25 --- /dev/null +++ b/app-i18n/uim/files/uim-slibtool.patch @@ -0,0 +1,14 @@ +--- a/qt4/common.pro.in ++++ b/qt4/common.pro.in +@@ -4,8 +4,9 @@ + @abs_top_srcdir@ @abs_top_srcdir@/uim \ + @abs_top_srcdir@/replace + QMAKE_LIBDIR += @abs_top_builddir@/uim @abs_top_builddir@/replace \ +- @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 ++LIBS += -lreplace -luim -luim-scm -lgcroots + !win32:!embedded:!mac { + LIBS += -luim-x-util + } |