From owner-svn-ports-all@freebsd.org Sat Oct 27 15:45:38 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 85A5D10C7955; Sat, 27 Oct 2018 15:45:38 +0000 (UTC) (envelope-from nobutaka@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 374B76F155; Sat, 27 Oct 2018 15:45:38 +0000 (UTC) (envelope-from nobutaka@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EA3F812565; Sat, 27 Oct 2018 15:45:37 +0000 (UTC) (envelope-from nobutaka@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9RFjbfC077246; Sat, 27 Oct 2018 15:45:37 GMT (envelope-from nobutaka@FreeBSD.org) Received: (from nobutaka@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9RFjXAr077222; Sat, 27 Oct 2018 15:45:33 GMT (envelope-from nobutaka@FreeBSD.org) Message-Id: <201810271545.w9RFjXAr077222@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: nobutaka set sender to nobutaka@FreeBSD.org using -f From: MANTANI Nobutaka Date: Sat, 27 Oct 2018 15:45:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483145 - in head/japanese/jmode: . files X-SVN-Group: ports-head X-SVN-Commit-Author: nobutaka X-SVN-Commit-Paths: in head/japanese/jmode: . files X-SVN-Commit-Revision: 483145 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Oct 2018 15:45:38 -0000 Author: nobutaka Date: Sat Oct 27 15:45:32 2018 New Revision: 483145 URL: https://svnweb.freebsd.org/changeset/ports/483145 Log: - Fix build error with Clang 6. - Pet portlint. Added: head/japanese/jmode/files/patch-src_anthy.xpm (contents, props changed) head/japanese/jmode/files/patch-src_anthyconv.cpp (contents, props changed) head/japanese/jmode/files/patch-src_anthyconv.h (contents, props changed) head/japanese/jmode/files/patch-src_code.xpm (contents, props changed) head/japanese/jmode/files/patch-src_connection.cpp (contents, props changed) head/japanese/jmode/files/patch-src_convdisp.cpp (contents, props changed) head/japanese/jmode/files/patch-src_kkconv.h (contents, props changed) head/japanese/jmode/files/patch-src_off.xpm (contents, props changed) head/japanese/jmode/files/patch-src_on.xpm (contents, props changed) head/japanese/jmode/files/patch-src_skk.xpm (contents, props changed) head/japanese/jmode/files/patch-src_skkconv.cpp (contents, props changed) head/japanese/jmode/files/patch-src_skkconv.h (contents, props changed) head/japanese/jmode/files/patch-src_ui.cpp (contents, props changed) head/japanese/jmode/files/patch-src_ximic.cpp (contents, props changed) Modified: head/japanese/jmode/Makefile head/japanese/jmode/files/patch-Makefile.in head/japanese/jmode/files/patch-src_dispatch.cpp head/japanese/jmode/files/patch-src_keyatom.cpp head/japanese/jmode/files/patch-src_kkconv.cpp head/japanese/jmode/files/patch-src_main.cpp head/japanese/jmode/files/patch-src_ximim.cpp head/japanese/jmode/files/patch-src_ximpacket.cpp head/japanese/jmode/files/patch-src_ximtrans.cpp Modified: head/japanese/jmode/Makefile ============================================================================== --- head/japanese/jmode/Makefile Sat Oct 27 15:35:46 2018 (r483144) +++ head/japanese/jmode/Makefile Sat Oct 27 15:45:32 2018 (r483145) @@ -10,19 +10,21 @@ MASTER_SITES= OSDN/anthy/5467 MAINTAINER= nobutaka@FreeBSD.org COMMENT?= XIM server for Anthy input method -DEPRECATED= Uses obsolete glib12 -EXPIRATION_DATE= 2018-12-20 - LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +DEPRECATED= Uses obsolete glib12 +EXPIRATION_DATE= 2018-12-20 +NOT_FOR_ARCHS= aarch64 mips mips64 powerpc64 sparc64 + LIB_DEPENDS= libanthy.so:japanese/anthy +USES= gettext-runtime gnome USE_GNOME= gtk12 +USE_XORG= x11 xext xi + GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib - -NOT_FOR_ARCHS= aarch64 amd64 mips mips64 powerpc64 sparc64 .include Modified: head/japanese/jmode/files/patch-Makefile.in ============================================================================== --- head/japanese/jmode/files/patch-Makefile.in Sat Oct 27 15:35:46 2018 (r483144) +++ head/japanese/jmode/files/patch-Makefile.in Sat Oct 27 15:45:32 2018 (r483145) @@ -1,6 +1,6 @@ ---- Makefile.in.orig Mon Apr 14 22:12:05 2003 -+++ Makefile.in Thu May 22 19:00:49 2003 -@@ -430,7 +430,7 @@ +--- Makefile.in.orig 2003-08-11 14:13:27 UTC ++++ Makefile.in +@@ -430,7 +430,7 @@ info: info-recursive info-am: Added: head/japanese/jmode/files/patch-src_anthy.xpm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/jmode/files/patch-src_anthy.xpm Sat Oct 27 15:45:32 2018 (r483145) @@ -0,0 +1,9 @@ +--- src/anthy.xpm.orig 2018-02-10 09:55:51 UTC ++++ src/anthy.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * anthy_xpm[] = { ++static const char * anthy_xpm[] = { + "24 32 81 1", + " c None", + ". c #EAAFC3", Added: head/japanese/jmode/files/patch-src_anthyconv.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/jmode/files/patch-src_anthyconv.cpp Sat Oct 27 15:45:32 2018 (r483145) @@ -0,0 +1,19 @@ +--- src/anthyconv.cpp.orig 2003-06-02 14:50:36 UTC ++++ src/anthyconv.cpp +@@ -5,6 +5,7 @@ + #endif + + #include ++#include + #include "anthy.xpm" + #include "jmode.h" + #include "anthyconv.h" +@@ -147,7 +148,7 @@ KKContext *AnthyConv::createContext(XimI + return anthy; + } + +-char **AnthyConv::getIcon() ++const char **AnthyConv::getIcon() + { + // toolbarに出てくるアイコンを返す。 + return anthy_xpm; Added: head/japanese/jmode/files/patch-src_anthyconv.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/jmode/files/patch-src_anthyconv.h Sat Oct 27 15:45:32 2018 (r483145) @@ -0,0 +1,11 @@ +--- src/anthyconv.h.orig 2003-01-27 13:20:32 UTC ++++ src/anthyconv.h +@@ -13,7 +13,7 @@ class AnthyConv : public KKConv{ + public: + virtual ~AnthyConv(); + KKContext *createContext(XimIC *); +- char **getIcon(); ++ const char **getIcon(); + void onPushIcon(); + virtual char *getModeName(int ); + private: Added: head/japanese/jmode/files/patch-src_code.xpm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/jmode/files/patch-src_code.xpm Sat Oct 27 15:45:32 2018 (r483145) @@ -0,0 +1,9 @@ +--- src/code.xpm.orig 2018-02-10 09:59:43 UTC ++++ src/code.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * code_xpm[] = { ++static const char * code_xpm[] = { + "24 32 13 1", + " c None", + ". c #7FFF00", Added: head/japanese/jmode/files/patch-src_connection.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/jmode/files/patch-src_connection.cpp Sat Oct 27 15:45:32 2018 (r483145) @@ -0,0 +1,10 @@ +--- src/connection.cpp.orig 2003-05-03 13:13:15 UTC ++++ src/connection.cpp +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + #include "xim.h" + #include "xdispatch.h" + #include Added: head/japanese/jmode/files/patch-src_convdisp.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/jmode/files/patch-src_convdisp.cpp Sat Oct 27 15:45:32 2018 (r483145) @@ -0,0 +1,10 @@ +--- src/convdisp.cpp.orig 2003-06-02 15:02:23 UTC ++++ src/convdisp.cpp +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include + #include "xim.h" + #include "kkconv.h" + #include "convdisp.h" Modified: head/japanese/jmode/files/patch-src_dispatch.cpp ============================================================================== --- head/japanese/jmode/files/patch-src_dispatch.cpp Sat Oct 27 15:35:46 2018 (r483144) +++ head/japanese/jmode/files/patch-src_dispatch.cpp Sat Oct 27 15:45:32 2018 (r483145) @@ -1,5 +1,5 @@ ---- src/dispatch.cpp.orig 2014-06-28 22:10:26.000000000 +0900 -+++ src/dispatch.cpp 2014-06-28 22:10:45.000000000 +0900 +--- src/dispatch.cpp.orig 2003-08-11 14:38:20 UTC ++++ src/dispatch.cpp @@ -16,6 +16,7 @@ #include #include Modified: head/japanese/jmode/files/patch-src_keyatom.cpp ============================================================================== --- head/japanese/jmode/files/patch-src_keyatom.cpp Sat Oct 27 15:35:46 2018 (r483144) +++ head/japanese/jmode/files/patch-src_keyatom.cpp Sat Oct 27 15:45:32 2018 (r483145) @@ -1,10 +1,20 @@ ---- src/keyatom.cpp.orig 2014-06-28 22:19:00.000000000 +0900 -+++ src/keyatom.cpp 2014-06-28 22:19:19.000000000 +0900 -@@ -9,6 +9,7 @@ +--- src/keyatom.cpp.orig 2003-01-21 14:26:14 UTC ++++ src/keyatom.cpp +@@ -9,6 +9,8 @@ # include # endif #endif +#include ++#include #include "jmode.h" +@@ -275,7 +277,7 @@ read_conf_file() + strlen(CONF_DIR)+20); + fn[0] = 0; + strcat(fn, homedir); +- strcat(fn, "/."PACKAGE); ++ strcat(fn, "/." PACKAGE); + if (read_a_conf_file(fn)) { + return ; + } Modified: head/japanese/jmode/files/patch-src_kkconv.cpp ============================================================================== --- head/japanese/jmode/files/patch-src_kkconv.cpp Sat Oct 27 15:35:46 2018 (r483144) +++ head/japanese/jmode/files/patch-src_kkconv.cpp Sat Oct 27 15:45:32 2018 (r483145) @@ -1,10 +1,37 @@ ---- src/kkconv.cpp.orig 2014-06-28 22:15:17.000000000 +0900 -+++ src/kkconv.cpp 2014-06-28 22:15:38.000000000 +0900 -@@ -18,6 +18,7 @@ +--- src/kkconv.cpp.orig 2002-06-15 14:05:09 UTC ++++ src/kkconv.cpp +@@ -18,10 +18,12 @@ # include # endif #endif +#include ++#include // キャラクタコード32から、 //このソースはEUCで書かれている。 +-static char *ascii_wide_tab[]={ ++static const char *ascii_wide_tab[]={ + 0,"！","”","＃","＄","％","＆","’", + "（","）","＊","＋","，","−","．","／", + "０","１","２","３","４","５","６","７", +@@ -325,9 +327,9 @@ KKContext *createKKContext(XimIC *ic) + return c; + } + +-char **getKKIcon() ++const char **getKKIcon() + { +- char **c; ++ const char **c; + c = NULL; + if (current_conv) { + c = current_conv->getIcon (); +@@ -338,7 +340,7 @@ char **getKKIcon() + // tool barの仮名漢字変換のボタンが押された。 + void onPushIcon() + { +- char **c=0; ++ const char **c=0; + if (current_conv) { + c = current_conv->getIcon (); + if (c) { Added: head/japanese/jmode/files/patch-src_kkconv.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/jmode/files/patch-src_kkconv.h Sat Oct 27 15:45:32 2018 (r483145) @@ -0,0 +1,20 @@ +--- src/kkconv.h.orig 2018-02-10 10:12:06 UTC ++++ src/kkconv.h +@@ -82,7 +82,7 @@ protected: + class XimIC; + class KKConv { + public: +- virtual char **getIcon()=0; ++ virtual const char **getIcon()=0; + virtual void onPushIcon()=0; + virtual KKContext *createContext(XimIC *)=0; + virtual char *getModeName(int )=0; +@@ -105,7 +105,7 @@ struct Candidates { + + bool init_conv(); + KKContext *createKKContext(XimIC *); +-char **getKKIcon(); ++const char **getKKIcon(); + void onPushIcon(); + + void register_kkconv(KKConv *); Modified: head/japanese/jmode/files/patch-src_main.cpp ============================================================================== --- head/japanese/jmode/files/patch-src_main.cpp Sat Oct 27 15:35:46 2018 (r483144) +++ head/japanese/jmode/files/patch-src_main.cpp Sat Oct 27 15:45:32 2018 (r483145) @@ -1,6 +1,6 @@ ---- src/main.cpp.orig Sat May 3 18:46:15 2003 -+++ src/main.cpp Sat Jul 12 03:40:03 2003 -@@ -27,7 +27,7 @@ +--- src/main.cpp.orig 2003-05-03 09:46:15 UTC ++++ src/main.cpp +@@ -27,11 +27,11 @@ int host_byte_order; //文字列 #ifdef __FreeBSD__ @@ -9,3 +9,8 @@ #else #define LANG "ja_JP" #endif +-#define VERSION_NAME "jmode out of the way! Version "VERSION"\n" ++#define VERSION_NAME "jmode out of the way! Version " VERSION "\n" + char *version_name=VERSION_NAME; + char *usage= + "--help , --version :Show usage or version\n" Added: head/japanese/jmode/files/patch-src_off.xpm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/jmode/files/patch-src_off.xpm Sat Oct 27 15:45:32 2018 (r483145) @@ -0,0 +1,9 @@ +--- src/off.xpm.orig 2018-02-10 09:59:01 UTC ++++ src/off.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * off_xpm[] = { ++static const char * off_xpm[] = { + "12 32 2 1", + " c None", + ". c #FFFF00", Added: head/japanese/jmode/files/patch-src_on.xpm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/jmode/files/patch-src_on.xpm Sat Oct 27 15:45:32 2018 (r483145) @@ -0,0 +1,9 @@ +--- src/on.xpm.orig 2018-02-10 09:57:51 UTC ++++ src/on.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * on_xpm[] = { ++static const char * on_xpm[] = { + "12 32 3 1", + " c None", + ". c #FFFF00", Added: head/japanese/jmode/files/patch-src_skk.xpm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/jmode/files/patch-src_skk.xpm Sat Oct 27 15:45:32 2018 (r483145) @@ -0,0 +1,9 @@ +--- src/skk.xpm.orig 2001-01-29 07:48:17 UTC ++++ src/skk.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * skk_xpm[] = { ++static const char * skk_xpm[] = { + "24 32 13 1", + " c None", + ". c #FFFFFF", Added: head/japanese/jmode/files/patch-src_skkconv.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/jmode/files/patch-src_skkconv.cpp Sat Oct 27 15:45:32 2018 (r483145) @@ -0,0 +1,20 @@ +--- src/skkconv.cpp.orig 2002-06-15 14:35:40 UTC ++++ src/skkconv.cpp +@@ -101,7 +101,7 @@ void SKKConv::init() + bind_str_to_atom("slash", A_skk_begin_latin_conv); + } + +-char **SKKConv::getIcon() ++const char **SKKConv::getIcon() + { + return skk_xpm; + } +@@ -960,7 +960,7 @@ void SKKChildWindow::draw() + void SKKChildWindow::activate(GtkWidget *w, gpointer p) + { + SKKChildContext *c; +- int pos = (int)p; ++ int pos = (uint64_t)p; + c = get_current_context(); + if (c) { + c->stat.setMode(pos); Added: head/japanese/jmode/files/patch-src_skkconv.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/jmode/files/patch-src_skkconv.h Sat Oct 27 15:45:32 2018 (r483145) @@ -0,0 +1,11 @@ +--- src/skkconv.h.orig 2002-06-15 14:10:40 UTC ++++ src/skkconv.h +@@ -35,7 +35,7 @@ class SKKConv : public KKConv{ + public: + virtual ~SKKConv(); + // +- char **getIcon(); ++ const char **getIcon(); + void onPushIcon(); + virtual char *getModeName(int ); + // Added: head/japanese/jmode/files/patch-src_ui.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/jmode/files/patch-src_ui.cpp Sat Oct 27 15:45:32 2018 (r483145) @@ -0,0 +1,47 @@ +--- src/ui.cpp.orig 2018-02-10 10:03:56 UTC ++++ src/ui.cpp +@@ -100,7 +100,7 @@ public: + virtual void motion(GtkWidget *,int x,int y,int b); + private: + void create(); +- void add_icon_to_button(GtkWidget *,char **xpm); ++ void add_icon_to_button(GtkWidget *,const char **xpm); + void add_input_mode(GtkWidget *,char *,int mode); + void init_mode_menu(); + void init_buttons(); +@@ -286,7 +286,7 @@ void ToolBar::create() + gtk_widget_show(m_hbox); + gtk_widget_show(m_win); + //絵を貼る、 +- char **p; ++ const char **p; + p = getKKIcon(); + if (p) { + add_icon_to_button(kk_setting_button,p); +@@ -353,7 +353,7 @@ void ToolBar::set_mode(int s) + } + } + +-void ToolBar::add_icon_to_button(GtkWidget *button,char **xpm) ++void ToolBar::add_icon_to_button(GtkWidget *button,const char **xpm) + { + GtkStyle *style; + GdkBitmap *mask; +@@ -434,7 +434,7 @@ void ToolBar::destroy(GtkWidget *w) + + void ToolBar::activate(GtkWidget *w,gpointer p) + { +- int pos = (int)p; ++ int pos = (uint64_t)p; + gtk_widget_draw(w, NULL); + user_if->change_menu(pos); + } +@@ -581,7 +581,7 @@ GtkWidget *Indicator::get_win() + + void Indicator::draw_stat() + { +- char *m = "OFF"; ++ const char *m = "OFF"; + if (XimIC::isAnyActive()){ + m = "ON"; + } Added: head/japanese/jmode/files/patch-src_ximic.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/jmode/files/patch-src_ximic.cpp Sat Oct 27 15:45:32 2018 (r483145) @@ -0,0 +1,10 @@ +--- src/ximic.cpp.orig 2003-08-11 14:23:54 UTC ++++ src/ximic.cpp +@@ -7,6 +7,7 @@ + #endif + + #include ++#include + #include + #include "xim.h" + #include "convdisp.h" Modified: head/japanese/jmode/files/patch-src_ximim.cpp ============================================================================== --- head/japanese/jmode/files/patch-src_ximim.cpp Sat Oct 27 15:35:46 2018 (r483144) +++ head/japanese/jmode/files/patch-src_ximim.cpp Sat Oct 27 15:45:32 2018 (r483145) @@ -1,5 +1,5 @@ ---- src/ximim.cpp.orig 2014-06-28 22:13:59.000000000 +0900 -+++ src/ximim.cpp 2014-06-28 22:14:31.000000000 +0900 +--- src/ximim.cpp.orig 2003-05-16 16:07:43 UTC ++++ src/ximim.cpp @@ -15,6 +15,7 @@ # include # endif Modified: head/japanese/jmode/files/patch-src_ximpacket.cpp ============================================================================== --- head/japanese/jmode/files/patch-src_ximpacket.cpp Sat Oct 27 15:35:46 2018 (r483144) +++ head/japanese/jmode/files/patch-src_ximpacket.cpp Sat Oct 27 15:45:32 2018 (r483145) @@ -1,5 +1,5 @@ ---- src/ximpacket.cpp.orig 2014-06-28 22:17:36.000000000 +0900 -+++ src/ximpacket.cpp 2014-06-28 22:18:08.000000000 +0900 +--- src/ximpacket.cpp.orig 2003-02-10 15:01:26 UTC ++++ src/ximpacket.cpp @@ -3,6 +3,7 @@ #endif Modified: head/japanese/jmode/files/patch-src_ximtrans.cpp ============================================================================== --- head/japanese/jmode/files/patch-src_ximtrans.cpp Sat Oct 27 15:35:46 2018 (r483144) +++ head/japanese/jmode/files/patch-src_ximtrans.cpp Sat Oct 27 15:45:32 2018 (r483145) @@ -1,10 +1,11 @@ ---- src/ximtrans.cpp.orig 2014-06-28 22:11:37.000000000 +0900 -+++ src/ximtrans.cpp 2014-06-28 22:11:54.000000000 +0900 -@@ -6,6 +6,7 @@ +--- src/ximtrans.cpp.orig 2003-05-27 10:54:52 UTC ++++ src/ximtrans.cpp +@@ -6,6 +6,8 @@ #endif #include +#include ++#include #include "xim.h" #ifndef __GNUC__