diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
commit | f516638b7fe9592837389826a6152a7e1b251c54 (patch) | |
tree | 8bfecb640b7b6403d7a3d662d923eed630033da7 /app-i18n/uim/files | |
parent | 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff) |
gentoo resync : 30.05.2020
Diffstat (limited to 'app-i18n/uim/files')
-rw-r--r-- | app-i18n/uim/files/uim-1.8.6-gentoo.patch | 28 | ||||
-rw-r--r-- | app-i18n/uim/files/uim-1.8.6-libressl.patch | 79 | ||||
-rw-r--r-- | app-i18n/uim/files/uim-1.8.6-qt.patch | 16 | ||||
-rw-r--r-- | app-i18n/uim/files/uim-1.8.6-tinfo.patch | 65 |
4 files changed, 0 insertions, 188 deletions
diff --git a/app-i18n/uim/files/uim-1.8.6-gentoo.patch b/app-i18n/uim/files/uim-1.8.6-gentoo.patch deleted file mode 100644 index 0feee5a70997..000000000000 --- a/app-i18n/uim/files/uim-1.8.6-gentoo.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -36,6 +36,7 @@ - AC_PATH_PROGS(SHA1, sha1 sha1sum) - AC_PATH_PROGS(SED, sed gsed) - AX_PATH_QMAKE4 -+PKG_PROG_PKG_CONFIG - - AM_MAINTAINER_MODE - -@@ -1792,7 +1793,7 @@ - fi - AX_LANG_WNOERROR # end AC_LANG_WERROR - -- QT_CONFIG_OPTS="debug" -+ QT_CONFIG_OPTS="debug nostrip" - else - CFLAGS="$CFLAGS -DNDEBUG" - CXXFLAGS="$CXXFLAGS -DNDEBUG" -@@ -1810,7 +1811,7 @@ - AX_CFLAGS_GCC_OPTION([-Wno-unused-variable], [SCIM_CFLAGS]) - AX_LANG_WNOERROR # end AC_LANG_WERROR - -- QT_CONFIG_OPTS="release" -+ QT_CONFIG_OPTS="release nostrip" - fi - - AC_ARG_ENABLE(warnings-into-error, diff --git a/app-i18n/uim/files/uim-1.8.6-libressl.patch b/app-i18n/uim/files/uim-1.8.6-libressl.patch deleted file mode 100644 index b14de58433aa..000000000000 --- a/app-i18n/uim/files/uim-1.8.6-libressl.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 7a281b1131399f04627986e6f9a54499b08e239d Mon Sep 17 00:00:00 2001 -From: Felix Janda <felix.janda@posteo.de> -Date: Thu, 21 Apr 2016 23:12:10 +0200 -Subject: [PATCH] Make openssl SSLv2 and SSLv3 support optional - -Fixes compilation with libressl ---- - uim/openssl.c | 30 ++++++++++++++++++++++++++++++ - 1 file changed, 30 insertions(+) - -diff --git a/uim/openssl.c b/uim/openssl.c -index ba1b238..35ca1ca 100644 ---- a/uim/openssl.c -+++ b/uim/openssl.c -@@ -208,34 +208,64 @@ c_SSL_write(uim_lisp s_, uim_lisp buf_) - static uim_lisp - c_SSLv2_method(void) - { -+#ifndef OPENSSL_NO_SSL2 - return MAKE_PTR(SSLv2_method()); -+#else -+ uim_notify_fatal(N_("uim-openssl: SSLv2_method() is not supported on this system")); -+ return uim_scm_f(); -+#endif - } - static uim_lisp - c_SSLv2_server_method(void) - { -+#ifndef OPENSSL_NO_SSL2 - return MAKE_PTR(SSLv2_server_method()); -+#else -+ uim_notify_fatal(N_("uim-openssl: SSLv2_server_method() is not supported on this system")); -+ return uim_scm_f(); -+#endif - } - static uim_lisp - c_SSLv2_client_method(void) - { -+#ifndef OPENSSL_NO_SSL2 - return MAKE_PTR(SSLv2_client_method()); -+#else -+ uim_notify_fatal(N_("uim-openssl: SSLv2_client_method() is not supported on this system")); -+ return uim_scm_f(); -+#endif - } - - /* SSLv3 */ - static uim_lisp - c_SSLv3_method(void) - { -+#ifndef OPENSSL_NO_SSL3 - return MAKE_PTR(SSLv3_method()); -+#else -+ uim_notify_fatal(N_("uim-openssl: SSLv3_method() is not supported on this system")); -+ return uim_scm_f(); -+#endif - } - static uim_lisp - c_SSLv3_server_method(void) - { -+#ifndef OPENSSL_NO_SSL3 - return MAKE_PTR(SSLv3_server_method()); -+#else -+ uim_notify_fatal(N_("uim-openssl: SSLv3_server_method() is not supported on this system")); -+ return uim_scm_f(); -+#endif - } - static uim_lisp - c_SSLv3_client_method(void) - { -+#ifndef OPENSSL_NO_SSL3 - return MAKE_PTR(SSLv3_client_method()); -+#else -+ uim_notify_fatal(N_("uim-openssl: SSLv3_client_method() is not supported on this system")); -+ return uim_scm_f(); -+#endif - } - - /* SSLv3 but can rollback to v2 */ diff --git a/app-i18n/uim/files/uim-1.8.6-qt.patch b/app-i18n/uim/files/uim-1.8.6-qt.patch deleted file mode 100644 index 6c0cb7eee667..000000000000 --- a/app-i18n/uim/files/uim-1.8.6-qt.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/m4/ax_path_qmake4.m4 -+++ b/m4/ax_path_qmake4.m4 -@@ -23,10 +23,10 @@ - # the copyright notice and this notice are preserved. - - AC_DEFUN([AX_PATH_QMAKE4], [ -- ax_guessed_qt4_dirs="/usr/lib/qt4/bin:/usr/local/lib/qt4/bin:/usr/qt4/bin:/usr/local/qt4/bin:${QT4DIR}/bin:${QTDIR}/bin" -+ ax_guessed_qt4_dirs="${QT4DIR}/bin:${QTDIR}/bin" - AC_PROG_EGREP -- AC_PATH_PROGS(_QMAKE4, [qmake-qt4 qmake4], [], ["$PATH:$ax_guessed_qt4_dirs"]) -- AC_PATH_PROGS(_QMAKE, [qmake], [], ["$PATH:$ax_guessed_qt4_dirs"]) -+ AC_PATH_PROGS(_QMAKE4, [qmake-qt4 qmake4], [], ["$ax_guessed_qt4_dirs:$PATH"]) -+ AC_PATH_PROGS(_QMAKE, [qmake], [], ["$ax_guessed_qt4_dirs:$PATH"]) - - AC_CACHE_CHECK([for Qt4 version of qmake], ax_cv_path_QMAKE4, [ - ax_cv_path_QMAKE4=no diff --git a/app-i18n/uim/files/uim-1.8.6-tinfo.patch b/app-i18n/uim/files/uim-1.8.6-tinfo.patch deleted file mode 100644 index 51105c909f54..000000000000 --- a/app-i18n/uim/files/uim-1.8.6-tinfo.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -1058,27 +1058,25 @@ - ;; - yes|*) - use_uim_fep="yes" -- AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD", -- [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD", -- AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")]) -- AC_CHECK_FUNCS(forkpty) -- if test $ac_cv_func_forkpty = no; then -- AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"]) -- fi -- AC_SUBST(FEP_LIBADD) - ;; - esac - ], -- [ use_uim_fep="yes" -- AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD", -- [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD", -- AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")]) -- AC_CHECK_FUNCS(forkpty) -- if test $ac_cv_func_forkpty = no; then -- AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"]) -- fi -- AC_SUBST(FEP_LIBADD) -- ]) -+ [use_uim_fep="yes"]) -+ -+if test "x$use_uim_fep" != "xno"; then -+ PKG_CHECK_MODULES(CURSES, ncurses, -+ [FEP_LIBADD="$CURSES_LIBS $FEP_LIBADD"], -+ [ -+ AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD", -+ [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD", -+ AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")]) -+ ]) -+ AC_CHECK_FUNCS(forkpty) -+ if test $ac_cv_func_forkpty = no; then -+ AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"]) -+ fi -+ AC_SUBST(FEP_LIBADD) -+fi - - AC_ARG_ENABLE(emacs, - AC_HELP_STRING([--disable-emacs], -@@ -1210,10 +1208,14 @@ - saved_LDFLAGS=$LDFLAGS - CPPFLAGS="${CPPFLAGS} -I$libedit_path/include" - LDFLAGS="${LDFLAGS} -L$libedit_path/lib" -- AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses", -- [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses", -- AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...") -- use_libedit="no")]) -+ PKG_CHECK_MODULES(CURSES, ncurses, -+ [LIBEDIT_LIBS="$CURSES_LIBS"], -+ [ -+ AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses", -+ [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses", -+ AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...") -+ use_libedit="no")]) -+ ]) - if test "x$use_libedit" != "xno"; then - AC_CHECK_LIB(edit, el_init, - [LIBEDIT_LIBS="-ledit $LIBEDIT_LIBS -L$libedit_path/lib" |