Attachment 51539 Details for Bug 78260 – patch-textproc-scim

patch-textproc-scim

patch-textproc-scim (text/plain), 9.83 KB, created by Jie Gao on 2005-03-02 01:50:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jie Gao

Created: 2005-03-02 01:50:05 UTC

Size: 9.83 KB

patch

obsolete

>Index: textproc/scim/Makefile
>===================================================================
>RCS file: /home/grads/gaoj/repository/ports/textproc/scim/Makefile,v
>retrieving revision 1.10
>diff -u -r1.10 Makefile
>--- textproc/scim/Makefile	25 Jan 2005 15:41:34 -0000	1.10
>+++ textproc/scim/Makefile	2 Mar 2005 01:28:27 -0000
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	scim
>-PORTVERSION=	1.0.2
>-PORTREVISION=	1
>+PORTVERSION=	1.2.0
> CATEGORIES=	textproc
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=scim
>@@ -15,7 +14,7 @@
> MAINTAINER=	gaoj@cpsc.ucalgary.ca
> COMMENT=	Smart Common Input Method platform
> 
>-USE_GNOME=	gconf2 gnomehier gtk20 intlhack
>+USE_GNOME=	gnomehack gnomehier gtk20 intlhack
> 
> USE_X_PREFIX=	yes
> USE_ICONV=	yes
>@@ -26,8 +25,6 @@
> CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
> 		PTHREAD_LIBS="${PTHREAD_LIBS}"
> 
>-GCONF_SCHEMAS=	scim.schemas
>-
> .include <bsd.port.pre.mk>
> 
> .if ${OSVERSION} < 500035
>@@ -36,7 +33,6 @@
> CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/stlport" \
> 		LDFLAGS="-L${LOCALBASE}/lib -lstlport_gcc -lintl ${PTHREAD_LIBS}"
> EXTRA_PATCHES=	${FILESDIR}/extra-patch-4-stable
>-PLIST_SUB=	NOSTABLE="@comment "
> .else
> CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
> 		LDFLAGS="-L${LOCALBASE}/lib -lintl"
>@@ -44,8 +40,6 @@
> .endif
> 
> post-patch:
>-	${REINPLACE_CMD} '/^pkgconfigdir/s|$$(libdir)|$${exec_prefix}/libdata|' \
>-			${WRKSRC}/Makefile.in
> 	${REINPLACE_CMD} 's|$$(datadir)/pixmaps|$$(prefix)/share/gnome/pixmaps|' \
> 			${WRKSRC}/data/pixmaps/Makefile.in
> 	${REINPLACE_CMD} -e 's|$$(datadir)/app|$$(prefix)/share/gnome/app| ; \
>Index: textproc/scim/distinfo
>===================================================================
>RCS file: /home/grads/gaoj/repository/ports/textproc/scim/distinfo,v
>retrieving revision 1.5
>diff -u -r1.5 distinfo
>--- textproc/scim/distinfo	19 Jan 2005 22:00:30 -0000	1.5
>+++ textproc/scim/distinfo	2 Mar 2005 01:28:27 -0000
>@@ -1,2 +1,2 @@
>-MD5 (scim-1.0.2.tar.gz) = aa31acc70b8fc98f6874a4fa67745142
>-SIZE (scim-1.0.2.tar.gz) = 2403219
>+MD5 (scim-1.2.0.tar.gz) = af0882ad74769a465be0674abe76279c
>+SIZE (scim-1.2.0.tar.gz) = 2223147
>Index: textproc/scim/pkg-message
>===================================================================
>RCS file: /home/grads/gaoj/repository/ports/textproc/scim/pkg-message,v
>retrieving revision 1.1
>diff -u -r1.1 pkg-message
>--- textproc/scim/pkg-message	6 Aug 2004 00:24:37 -0000	1.1
>+++ textproc/scim/pkg-message	2 Mar 2005 01:28:27 -0000
>@@ -7,8 +7,9 @@
> 
>  Chinese:
>   chinese/scim-tables	Table based input methods: Array30, CangJie, Cantonese,
>-                        Dayi, Erbi, EZ, Jyutping, Simplex, Wubi, Ziranma, ZhuYin
>-  chinese/scim-chinese	Smart pinyin
>+                        Dayi, Erbi, EZ, Jyutping, Simplex, Stroke, Wubi,
>+                        Ziranma, ZhuYin
>+  chinese/scim-pinyin	Smart pinyin
>     
>  Korean:
>   korean/scim-tables	Table based input methods: Hangul, Hanja
>Index: textproc/scim/pkg-plist
>===================================================================
>RCS file: /home/grads/gaoj/repository/ports/textproc/scim/pkg-plist,v
>retrieving revision 1.7
>diff -u -r1.7 pkg-plist
>--- textproc/scim/pkg-plist	25 Jan 2005 15:50:56 -0000	1.7
>+++ textproc/scim/pkg-plist	2 Mar 2005 01:28:27 -0000
>@@ -1,6 +1,5 @@
> bin/scim
> bin/scim-config-agent
>-%%NOSTABLE%%bin/scim-make-table
> bin/scim-setup
> etc/scim/config
> etc/scim/global
>@@ -22,6 +21,10 @@
> include/scim-1.0/scim_frontend.h
> include/scim-1.0/scim_frontend_module.h
> include/scim-1.0/scim_global_config.h
>+include/scim-1.0/scim_helper.h
>+include/scim-1.0/scim_helper_manager.h
>+include/scim-1.0/scim_helper_module.h
>+include/scim-1.0/scim_hotkey.h
> include/scim-1.0/scim_iconv.h
> include/scim-1.0/scim_imengine.h
> include/scim-1.0/scim_imengine_module.h
>@@ -34,27 +37,30 @@
> include/scim-1.0/scim_signals.h
> include/scim-1.0/scim_slot.h
> include/scim-1.0/scim_socket.h
>-include/scim-1.0/scim_socket_transaction.h
>+include/scim-1.0/scim_trans_commands.h
>+include/scim-1.0/scim_transaction.h
> include/scim-1.0/scim_types.h
> include/scim-1.0/scim_utility.h
>+lib/gtk-2.0/immodules/im-scim.so
> lib/libscim-1.0.a
> lib/libscim-1.0.so
>-lib/libscim-1.0.so.5
>+lib/libscim-1.0.so.6
> lib/libscim-gtkutils-1.0.a
> lib/libscim-gtkutils-1.0.so
>-lib/libscim-gtkutils-1.0.so.5
>-lib/gtk-2.0/immodules/im-scim.so
>-lib/scim-1.0/1.0.0/Config/gconf.so
>-lib/scim-1.0/1.0.0/Config/simple.so
>-lib/scim-1.0/1.0.0/Config/socket.so
>-lib/scim-1.0/1.0.0/FrontEnd/socket.so
>-lib/scim-1.0/1.0.0/FrontEnd/x11.so
>-lib/scim-1.0/1.0.0/IMEngine/rawcode.so
>-lib/scim-1.0/1.0.0/IMEngine/socket.so
>-lib/scim-1.0/1.0.0/IMEngine/table.so
>-lib/scim-1.0/1.0.0/SetupUI/panel-gtk-setup.so
>-lib/scim-1.0/1.0.0/SetupUI/table-imengine-setup.so
>-lib/scim-1.0/1.0.0/SetupUI/x11-frontend-setup.so
>+lib/libscim-gtkutils-1.0.so.6
>+lib/scim-1.0/1.2.0/Config/simple.so
>+lib/scim-1.0/1.2.0/Config/socket.so
>+lib/scim-1.0/1.2.0/FrontEnd/socket.so
>+lib/scim-1.0/1.2.0/FrontEnd/x11.so
>+lib/scim-1.0/1.2.0/Helper/setup.so
>+lib/scim-1.0/1.2.0/IMEngine/rawcode.so
>+lib/scim-1.0/1.2.0/IMEngine/socket.so
>+lib/scim-1.0/1.2.0/SetupUI/aaa-imengine-setup.so
>+lib/scim-1.0/1.2.0/SetupUI/frontend-hotkeys-setup.so
>+lib/scim-1.0/1.2.0/SetupUI/panel-gtk-setup.so
>+lib/scim-1.0/1.2.0/SetupUI/x11-frontend-setup.so
>+lib/scim-1.0/scim-helper-launcher
>+lib/scim-1.0/scim-helper-manager
> lib/scim-1.0/scim-launcher
> lib/scim-1.0/scim-panel-gtk
> libdata/pkgconfig/scim-gtkutils.pc
>@@ -64,6 +70,7 @@
> share/gnome/pixmaps/scim-setup.png
> share/locale/de/LC_MESSAGES/scim.mo
> share/locale/fr/LC_MESSAGES/scim.mo
>+share/locale/it/LC_MESSAGES/scim.mo
> share/locale/ja/LC_MESSAGES/scim.mo
> share/locale/ko/LC_MESSAGES/scim.mo
> share/locale/zh_CN/LC_MESSAGES/scim.mo
>@@ -76,23 +83,23 @@
> %%DATADIR%%/icons/help.png
> %%DATADIR%%/icons/keyboard.png
> %%DATADIR%%/icons/left.png
>+%%DATADIR%%/icons/menu.png
> %%DATADIR%%/icons/pin-down.png
> %%DATADIR%%/icons/pin-up.png
> %%DATADIR%%/icons/rawcode.png
> %%DATADIR%%/icons/right.png
> %%DATADIR%%/icons/setup.png
>-%%DATADIR%%/icons/table.png
> %%DATADIR%%/icons/trademark.png
> %%DATADIR%%/icons/up.png
> @dirrm etc/scim
> @dirrm include/scim-1.0/gtk
> @dirrm include/scim-1.0
> @unexec rmdir %D/lib/gtk-2.0/immodules 2>/dev/null || true
>-@dirrm lib/scim-1.0/1.0.0/Config
>-@dirrm lib/scim-1.0/1.0.0/FrontEnd
>-@dirrm lib/scim-1.0/1.0.0/IMEngine
>-@dirrm lib/scim-1.0/1.0.0/SetupUI
>-@dirrm lib/scim-1.0/1.0.0
>+@dirrm lib/scim-1.0/1.2.0/Config
>+@dirrm lib/scim-1.0/1.2.0/FrontEnd
>+@dirrm lib/scim-1.0/1.2.0/IMEngine
>+@dirrm lib/scim-1.0/1.2.0/SetupUI
>+@dirrm lib/scim-1.0/1.2.0
> @dirrm lib/scim-1.0
> @dirrm %%DATADIR%%/icons
> @dirrm %%DATADIR%%
>Index: textproc/scim/files/extra-patch-4-stable
>===================================================================
>RCS file: /home/grads/gaoj/repository/ports/textproc/scim/files/extra-patch-4-stable,v
>retrieving revision 1.2
>diff -u -r1.2 extra-patch-4-stable
>--- textproc/scim/files/extra-patch-4-stable	25 Jan 2005 15:41:34 -0000	1.2
>+++ textproc/scim/files/extra-patch-4-stable	2 Mar 2005 01:28:27 -0000
>@@ -1,22 +1,8 @@
>---- modules/Config/scim_gconf_config.cpp.orig	Wed Aug  4 19:42:16 2004
>-+++ modules/Config/scim_gconf_config.cpp	Wed Aug  4 19:49:22 2004
>-@@ -496,11 +498,11 @@
>-     std::vector <String> strs;
>-     if (scim_split_string_list (strs, str, ':') == 2) {
>-         time_t sec = (time_t) strtol (strs [0].c_str (), 0, 10);
>--        suseconds_t usec = (suseconds_t) strtol (strs [1].c_str (), 0, 10);
>-+        long usec = (long) strtol (strs [1].c_str (), 0, 10);
>-         // The config file is newer, so load it.
>-         if (m_update_timestamp.tv_sec < sec || (m_update_timestamp.tv_sec == sec && m_update_timestamp.tv_usec < usec)) {
>-             m_update_timestamp.tv_sec = (time_t) sec;
>--            m_update_timestamp.tv_usec = (suseconds_t) usec;
>-+            m_update_timestamp.tv_usec = (long) usec;
>-             m_need_reload = true;
>-         }
>-     }
>---- modules/Config/scim_simple_config.cpp.orig	Wed Aug  4 19:50:05 2004
>-+++ modules/Config/scim_simple_config.cpp	Wed Aug  4 19:50:46 2004
>-@@ -596,13 +596,13 @@
>+Index: modules/Config/scim_simple_config.cpp
>+diff -u modules/Config/scim_simple_config.cpp.orig modules/Config/scim_simple_config.cpp
>+--- modules/Config/scim_simple_config.cpp.orig	Mon Jan 10 17:30:45 2005
>++++ modules/Config/scim_simple_config.cpp	Wed Mar  2 01:41:40 2005
>+@@ -595,13 +595,13 @@
>          std::vector <String> strs;
>          if (scim_split_string_list (strs, it->second, ':') == 2) {
>              time_t sec = (time_t) strtol (strs [0].c_str (), 0, 10);
>@@ -32,9 +18,11 @@
>                  return true;
>              }
>          }
>---- modules/Config/scim_socket_config.cpp.orig	Wed Aug  4 19:51:15 2004
>-+++ modules/Config/scim_socket_config.cpp	Wed Aug  4 19:51:44 2004
>-@@ -581,7 +581,7 @@
>+Index: modules/Config/scim_socket_config.cpp
>+diff -u modules/Config/scim_socket_config.cpp.orig modules/Config/scim_socket_config.cpp
>+--- modules/Config/scim_socket_config.cpp.orig	Mon Jan 10 17:30:45 2005
>++++ modules/Config/scim_socket_config.cpp	Wed Mar  2 01:41:40 2005
>+@@ -582,7 +582,7 @@
>                      std::vector <String> strs;
>                      if (scim_split_string_list (strs, str, ':') == 2) {
>                          time_t sec = (time_t) strtol (strs [0].c_str (), 0, 10);
>@@ -43,15 +31,3 @@
>   
>                          // The config file is newer, so load it.
>                          if (m_update_timestamp.tv_sec < sec ||
>---- modules/IMEngine/Makefile.in.orig	Thu Dec 30 05:53:21 2004
>-+++ modules/IMEngine/Makefile.in	Mon Jan 24 14:35:28 2005
>-@@ -88,8 +88,7 @@
>- table_la_OBJECTS = $(am_table_la_OBJECTS)
>- @SCIM_BUILD_IMENGINE_TABLE_TRUE@am_table_la_rpath = -rpath \
>- @SCIM_BUILD_IMENGINE_TABLE_TRUE@	$(moduledir)
>--@SCIM_BUILD_IMENGINE_TABLE_TRUE@am__EXEEXT_1 =  \
>--@SCIM_BUILD_IMENGINE_TABLE_TRUE@	scim-make-table$(EXEEXT)
>-+@SCIM_BUILD_IMENGINE_TABLE_TRUE@am__EXEEXT_1 =
>- binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
>- PROGRAMS = $(bin_PROGRAMS)
>- am_scim_make_table_OBJECTS = scim_make_table.$(OBJEXT)

Actions: View

Attachments on bug 78260: 51539