- Fix build on 4-stable - Support GCONF_SCHEMAS - Install GNOME-related files into suitable location
Dear maintainer of FreeBSD port textproc/scim, please take a look at http://www.freebsd.org/cgi/query-pr.cgi?q=76548 Do you approve this patch? -- Pav Lucistnik <pav@oook.cz> <pav@FreeBSD.org> Orfax's hip flask contained Old Janx Spirit, a mixture of potions of stupidity, paralysis, naivery, ruination, lose memories, confusion, and slime mold juice, with a twist of lemon. - from a post on Angband Community Forum
State Changed From-To: open->feedback Asked maintainer for approval.
Responsible Changed From-To: freebsd-ports-bugs->pav Handle.
>Synopsis: Re: ports/76548: Update port: textproc/scim >Category: ports Hi, all, I have checked the patch above. I agree most if it. (As I am not a gnome user, I overlooked some gnome related issues.) But I suggest that we do not disable the tables im engine. Although we cannot compile scim-make-table executable, we still can use table-based im's if we have pre-compiled binary tables. E.g. build a tgz package of scim-tables on 5.x and install it on 4.x. I tested this several months ago and just now, and it worked without any problem. So below is the revised patch that fix gnome-related and 4.x extra patch problems. --- patch-textproc-scim-1.0.2_1 begins here --- Index: textproc/scim/Makefile =================================================================== RCS file: /home/grads/gaoj/repository/ports/textproc/scim/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- textproc/scim/Makefile 19 Jan 2005 22:00:30 -0000 1.9 +++ textproc/scim/Makefile 24 Jan 2005 22:06:25 -0000 @@ -7,6 +7,7 @@ PORTNAME= scim PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=scim @@ -14,7 +15,7 @@ MAINTAINER= gaoj@cpsc.ucalgary.ca COMMENT= Smart Common Input Method platform -USE_GNOME= gtk20 gconf2 lthack +USE_GNOME= gconf2 gnomehier gtk20 intlhack USE_X_PREFIX= yes USE_ICONV= yes @@ -25,6 +26,8 @@ CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" +GCONF_SCHEMAS= scim.schemas + .include <bsd.port.pre.mk> .if ${OSVERSION} < 500035 @@ -40,13 +43,18 @@ PLIST_SUB= NOSTABLE="" .endif -post-configure: +post-patch: ${REINPLACE_CMD} '/^pkgconfigdir/s|$$(libdir)|$${exec_prefix}/libdata|' \ - ${WRKSRC}/Makefile - ${REINPLACE_CMD} '/^scim_setup_LDFLAGS/s|=|= ${PTHREAD_LIBS}|g' \ - ${WRKSRC}/extras/setup/Makefile + ${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| ; \ + s|$$(datadir)/control|$$(prefix)/share/gnome/control| ; \ + /^scim_setup_LDFLAGS/s|=|= ${PTHREAD_LIBS}|' \ + ${WRKSRC}/extras/setup/Makefile.in post-install: + @gtk-query-immodules-2.0 > ${PREFIX}/etc/gtk-2.0/gtk.immodules @${CAT} ${PKGMESSAGE} @${ECHO} To display this message again, type pkg_info -D ${PKGNAME} Index: textproc/scim/pkg-plist =================================================================== RCS file: /home/grads/gaoj/repository/ports/textproc/scim/pkg-plist,v retrieving revision 1.5 diff -u -r1.5 pkg-plist --- textproc/scim/pkg-plist 27 Oct 2004 17:10:47 -0000 1.5 +++ textproc/scim/pkg-plist 24 Jan 2005 22:06:25 -0000 @@ -2,8 +2,6 @@ bin/scim-config-agent %%NOSTABLE%%bin/scim-make-table bin/scim-setup -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/scim.schemas >/dev/null 2>&1 || /usr/bin/true -etc/gconf/schemas/scim.schemas etc/scim/config etc/scim/global include/scim-1.0/gtk/scimkeyselection.h @@ -61,14 +59,14 @@ lib/scim-1.0/scim-panel-gtk libdata/pkgconfig/scim-gtkutils.pc libdata/pkgconfig/scim.pc -share/applications/scim-setup.desktop -share/control-center-2.0/capplets/scim-setup.desktop +share/gnome/applications/scim-setup.desktop +share/gnome/control-center-2.0/capplets/scim-setup.desktop +share/gnome/pixmaps/scim-setup.png share/locale/de/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 share/locale/zh_TW/LC_MESSAGES/scim.mo -share/pixmaps/scim-setup.png %%DATADIR%%/icons/down.png %%DATADIR%%/icons/full-letter.png %%DATADIR%%/icons/full-punct.png @@ -88,16 +86,14 @@ @dirrm etc/scim @dirrm include/scim-1.0/gtk @dirrm include/scim-1.0 -@dirrm lib/gtk-2.0/immodules +@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 -@dirrm share/control-center-2.0/capplets -@dirrm share/control-center-2.0 -@unexec rmdir %D/share/pixmaps 2>/dev/null || true @dirrm %%DATADIR%%/icons @dirrm %%DATADIR%% -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/scim.schemas >/dev/null 2>&1 || /usr/bin/true +@exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules +@unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules 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.1 diff -u -r1.1 extra-patch-4-stable --- textproc/scim/files/extra-patch-4-stable 6 Aug 2004 00:35:10 -0000 1.1 +++ textproc/scim/files/extra-patch-4-stable 24 Jan 2005 22:06:25 -0000 @@ -1,43 +1,5 @@ ---- src/scim_event.cpp.orig Wed Aug 4 19:20:29 2004 -+++ src/scim_event.cpp Wed Aug 4 19:20:49 2004 -@@ -25,6 +25,7 @@ - #define Uses_SCIM_EVENT - #include "scim_private.h" - #include "scim.h" -+#include <cstdio> - - namespace scim { - ---- src/scim_global_config.cpp.orig Wed Aug 4 19:22:06 2004 -+++ src/scim_global_config.cpp Wed Aug 4 19:22:10 2004 -@@ -32,6 +32,7 @@ - #include <sys/stat.h> - #include <sys/types.h> - #include <unistd.h> -+#include <cstdio> - - #include "scim_private.h" - #include "scim.h" ---- modules/IMEngine/scim_socket_imengine.cpp.orig Wed Aug 4 19:25:53 2004 -+++ modules/IMEngine/scim_socket_imengine.cpp Wed Aug 4 19:26:50 2004 -@@ -39,6 +39,7 @@ - #include "scim.h" - #include "scim_socket_imengine.h" - #include <unistd.h> -+#include <cstdio> - - #define scim_module_init socket_LTX_scim_module_init - #define scim_module_exit socket_LTX_scim_module_exit --- 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 -@@ -34,6 +34,7 @@ - #include "scim_private.h" - #include "scim.h" - #include "scim_gconf_config.h" -+#include <cstdio> - - #define scim_module_init gconf_LTX_scim_module_init - #define scim_module_exit gconf_LTX_scim_module_exit @@ -496,11 +498,11 @@ std::vector <String> strs; if (scim_split_string_list (strs, str, ':') == 2) { @@ -81,15 +43,15 @@ // The config file is newer, so load it. if (m_update_timestamp.tv_sec < sec || ---- modules/IMEngine/Makefile.in.orig Thu Aug 5 16:55:50 2004 -+++ modules/IMEngine/Makefile.in Thu Aug 5 16:57:34 2004 -@@ -74,8 +74,7 @@ - libgenerictable.la - am_table_la_OBJECTS = scim_table_imengine.lo +--- 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 = ++@SCIM_BUILD_IMENGINE_TABLE_TRUE@am__EXEEXT_1 = binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_scim_make_table_OBJECTS = scim_make_table.$(OBJEXT) --- patch-textproc-scim-1.0.2_1 ends here ---
State Changed From-To: feedback->closed Maintainer's modification committed, thanks!