Date: Thu, 12 Jul 2018 14:42:04 +0000 (UTC) From: MANTANI Nobutaka <nobutaka@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474523 - head/textproc/uim/files Message-ID: <201807121442.w6CEg4cK089900@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nobutaka Date: Thu Jul 12 14:42:04 2018 New Revision: 474523 URL: https://svnweb.freebsd.org/changeset/ports/474523 Log: - Fix build error when lang/mono is installed. - Regenerate patches to pet portlint. PR: 229674 Reported by: Ting-Wei Lan <lantw44@gmail.com> Added: head/textproc/uim/files/patch-scm_Makefile.in (contents, props changed) Modified: head/textproc/uim/files/patch-emacs_Makefile.in head/textproc/uim/files/patch-qt4_immodule_plugin.cpp head/textproc/uim/files/patch-sigscheme_doc_Makefile.in head/textproc/uim/files/patch-uim_uim.h Modified: head/textproc/uim/files/patch-emacs_Makefile.in ============================================================================== --- head/textproc/uim/files/patch-emacs_Makefile.in Thu Jul 12 14:30:24 2018 (r474522) +++ head/textproc/uim/files/patch-emacs_Makefile.in Thu Jul 12 14:42:04 2018 (r474523) @@ -1,6 +1,6 @@ ---- emacs/Makefile.in.orig 2016-10-14 09:57:35 UTC +--- emacs/Makefile.in.orig 2018-07-12 14:16:06 UTC +++ emacs/Makefile.in -@@ -872,21 +872,6 @@ mostlyclean-libtool: +@@ -981,21 +981,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs Modified: head/textproc/uim/files/patch-qt4_immodule_plugin.cpp ============================================================================== --- head/textproc/uim/files/patch-qt4_immodule_plugin.cpp Thu Jul 12 14:30:24 2018 (r474522) +++ head/textproc/uim/files/patch-qt4_immodule_plugin.cpp Thu Jul 12 14:42:04 2018 (r474523) @@ -8,14 +8,14 @@ Date: Sun Mar 2 13:26:18 2014 +0200 - Stop relying on implicit includes that may not always work and explicitly include <clocale> for the setlocale(3) call. ---- qt4/immodule/plugin.cpp.orig 2013-06-30 04:26:20 UTC +--- qt4/immodule/plugin.cpp.orig 2017-08-14 00:07:27 UTC +++ qt4/immodule/plugin.cpp -@@ -34,6 +34,8 @@ +@@ -36,6 +36,8 @@ - #include "plugin.h" + #include <clocale> +#include <clocale> + #include <QtCore/QStringList> - #include <QtGui/QInputContext> - #ifdef Q_WS_X11 + #if QT_VERSION < 0x050000 + # ifdef Q_WS_X11 Added: head/textproc/uim/files/patch-scm_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/uim/files/patch-scm_Makefile.in Thu Jul 12 14:42:04 2018 (r474523) @@ -0,0 +1,12 @@ +--- scm/Makefile.in.orig 2018-07-12 14:16:06 UTC ++++ scm/Makefile.in +@@ -869,9 +869,6 @@ installed-modules.scm: $(SCM_FILES) + --path $(top_builddir)/scm --register $(module_names) + + json-parser-expanded.scm: macro-expander.scm json-parser-expander.scm packrat.scm.in +- if test -n "$(CSI)"; then \ +- $(CSI) -R syntax-case -q json-parser-expander.scm > json-parser-expanded.scm; \ +- fi + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. Modified: head/textproc/uim/files/patch-sigscheme_doc_Makefile.in ============================================================================== --- head/textproc/uim/files/patch-sigscheme_doc_Makefile.in Thu Jul 12 14:30:24 2018 (r474522) +++ head/textproc/uim/files/patch-sigscheme_doc_Makefile.in Thu Jul 12 14:42:04 2018 (r474523) @@ -1,6 +1,6 @@ ---- sigscheme/doc/Makefile.in.orig 2016-10-14 09:57:35 UTC +--- sigscheme/doc/Makefile.in.orig 2018-07-12 14:16:06 UTC +++ sigscheme/doc/Makefile.in -@@ -210,7 +210,7 @@ build_vendor = @build_vendor@ +@@ -266,7 +266,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ Modified: head/textproc/uim/files/patch-uim_uim.h ============================================================================== --- head/textproc/uim/files/patch-uim_uim.h Thu Jul 12 14:30:24 2018 (r474522) +++ head/textproc/uim/files/patch-uim_uim.h Thu Jul 12 14:42:04 2018 (r474523) @@ -1,6 +1,6 @@ ---- uim/uim.h.orig 2013-06-30 04:26:09 UTC +--- uim/uim.h.orig 2017-08-14 00:07:27 UTC +++ uim/uim.h -@@ -430,7 +430,7 @@ struct uim_code_converter { +@@ -531,7 +531,7 @@ struct uim_code_converter { * * @return 0 on success, otherwise -1 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807121442.w6CEg4cK089900>