Index: head/textproc/scim/Makefile =================================================================== --- head/textproc/scim/Makefile (revision 331254) +++ head/textproc/scim/Makefile (revision 331255) @@ -1,39 +1,31 @@ # Created by: Jie Gao # $FreeBSD$ PORTNAME= scim PORTVERSION= 1.4.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MASTER_SITES= SF MAINTAINER= lx@FreeBSD.org COMMENT= Smart Common Input Method platform -USE_GNOME= gnomehack gnomehier gtk20 intlhack +LICENSE= LGPL21 -USE_AUTOTOOLS= libtool -USE_GCC= any +USE_GNOME= gnomehier gtk20 intlhack USE_XORG= x11 xpm USE_LDCONFIG= yes -USES= gettext gmake iconv pkgconfig +USES= gettext gmake iconv pathfix pkgconfig GNU_CONFIGURE= yes -CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" -NO_STAGE= yes -.include - CPPFLAGS+= -I${LOCALBASE}/include -D__STDC_ISO_10646__ LDFLAGS+= -L${LOCALBASE}/lib -lintl ${ICONV_LIB} post-patch: - ${REINPLACE_CMD} -e '/^libscim@SCIM_EPOCH@_la_LDFLAGS/s|=|= ${PTHREAD_LIBS}|' \ - ${WRKSRC}/src/Makefile.in + @${REINPLACE_CMD} 's/-lstdc++//' \ + ${WRKSRC}/extras/gtk2_immodule/Makefile.in \ + ${WRKSRC}/extras/setup/Makefile.in \ + ${WRKSRC}/src/Makefile.in \ + ${WRKSRC}/tests/Makefile.in -post-install: - @${LOCALBASE}/bin/gtk-query-immodules-2.0 > ${LOCALBASE}/etc/gtk-2.0/gtk.immodules - @${CAT} ${PKGMESSAGE} - @${ECHO} To display this message again, type ${PKG_INFO} -D ${PKGNAME} - -.include +.include Index: head/textproc/scim/distinfo =================================================================== --- head/textproc/scim/distinfo (revision 331254) +++ head/textproc/scim/distinfo (revision 331255) Property changes on: head/textproc/scim/distinfo ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/scim/files/patch-configure =================================================================== --- head/textproc/scim/files/patch-configure (revision 331254) +++ head/textproc/scim/files/patch-configure (nonexistent) @@ -1,14 +0,0 @@ ---- configure.old Tue Jun 26 11:51:09 2007 -+++ configure Tue Jun 26 11:51:34 2007 -@@ -36877,10 +36877,7 @@ - - fi - GTK_BINARY_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` -- GTK_LIBDIR=`$PKG_CONFIG --variable=libdir gtk+-2.0` -- if test -z "$GTK_LIBDIR)"; then -- GTK_LIBDIR="$libdir" -- fi -+ GTK_LIBDIR="$libdir" - GTK_IM_MODULEDIR=$GTK_LIBDIR/gtk-2.0/immodules - - Property changes on: head/textproc/scim/files/patch-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/textproc/scim/files/patch-extras-gtk2_immodule-gtkimcontextscim.cpp =================================================================== --- head/textproc/scim/files/patch-extras-gtk2_immodule-gtkimcontextscim.cpp (nonexistent) +++ head/textproc/scim/files/patch-extras-gtk2_immodule-gtkimcontextscim.cpp (revision 331255) @@ -0,0 +1,11 @@ +--- extras/gtk2_immodule/gtkimcontextscim.cpp.orig 2008-11-02 07:43:15.000000000 +0100 ++++ extras/gtk2_immodule/gtkimcontextscim.cpp 2013-10-08 18:16:29.000000000 +0200 +@@ -1710,7 +1710,7 @@ + // And set manual to false. + if (!check_socket_frontend ()) { + std::cerr << "Launching a SCIM daemon with Socket FrontEnd...\n"; +- char *new_argv [] = { static_cast ("--no-stay"), 0 }; ++ char *new_argv [] = { const_cast ("--no-stay"), 0 }; + scim_launch (true, + config_module_name, + (load_engine_list.size () ? scim_combine_string_list (load_engine_list, ',') : "all"), Property changes on: head/textproc/scim/files/patch-extras-gtk2_immodule-gtkimcontextscim.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/scim/files/patch-src-scim_helper_manager_server.cpp =================================================================== --- head/textproc/scim/files/patch-src-scim_helper_manager_server.cpp (nonexistent) +++ head/textproc/scim/files/patch-src-scim_helper_manager_server.cpp (revision 331255) @@ -0,0 +1,21 @@ +--- src/scim_helper_manager_server.cpp.orig 2008-11-02 07:42:38.000000000 +0100 ++++ src/scim_helper_manager_server.cpp 2013-10-08 17:37:59.000000000 +0200 +@@ -95,9 +95,8 @@ + // so I added a workaround: have an array of modules and unload them all together in the end only. + // TODO Need to figure out what's going on with this issue. + +- HelperModule module[mod_list.size ()]; +- + if (mod_list.size ()) { ++ HelperModule *module = new HelperModule[mod_list.size ()]; + + for (size_t i = 0; i < mod_list.size (); ++i) { + +@@ -120,6 +119,7 @@ + for (size_t i = 0; i < mod_list.size (); ++i) { + module[i].unload (); + } ++ delete[] module; + } + } + Property changes on: head/textproc/scim/files/patch-src-scim_helper_manager_server.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/scim/pkg-descr =================================================================== --- head/textproc/scim/pkg-descr (revision 331254) +++ head/textproc/scim/pkg-descr (revision 331255) Property changes on: head/textproc/scim/pkg-descr ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/scim/pkg-message =================================================================== --- head/textproc/scim/pkg-message (revision 331254) +++ head/textproc/scim/pkg-message (revision 331255) Property changes on: head/textproc/scim/pkg-message ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/scim/pkg-plist =================================================================== --- head/textproc/scim/pkg-plist (revision 331254) +++ head/textproc/scim/pkg-plist (revision 331255) Property changes on: head/textproc/scim/pkg-plist ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property