Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 29 Jul 2004 21:38:11 -0600
From:      "Jie Gao" <gaoj@cpsc.ucalgary.ca>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        pav@freebsd.org
Subject:   Re: ports/69777: [Maintainer Update] textproc/scim 0.99.4 --> 0.99.5 and WWW site
Message-ID:  <200407300338.i6U3cBpi010341@imgw1.cpsc.ucalgary.ca>

next in thread | raw e-mail | index | archive | help

>Submitter-Id:	current-users
>Originator:	Jie Gao
>Organization:	
>Confidential:	no 
>Synopsis:	Re: ports/69777: [Maintainer Update] textproc/scim 0.99.4 --> 0.99.5 and WWW site
>Severity:	non-critical
>Priority:	low
>Category:	ports
>Class:		maintainer-update
>Release:	FreeBSD 5.2-CURRENT i386
>Environment:
System: FreeBSD aibsd-current 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Thu Jul 15 10:00:38 MDT 2004 gaoj@aibsd-current:/usr/obj/usr/src/sys/AIBSD i386


>Description:

I looked into the code and found a solution to work around the GCC-3.4 problem.
The following patches should replace the old ones. This only affects 
  textproc/scim
  textproc/skim
  chinese/scim-chinese
and the */scim-tables ports patches remain the same.

I tested the compilation and basic functionality on 5-CURRENT with both 
gcc-3.3.3 (in base system) and gcc-3.4.2 (from ports), as I do not have a
gcc-3.4 in base system yet. I also tested this on 5.2.1 with gcc-3.3.3 in base
system and it also worked.

So the only test left maybe the latest 5-CURRENT with gcc-3.4.

>Fix:

--- patch-textproc-scim begins here ---
diff -ruN textproc/scim.old/Makefile textproc/scim/Makefile
--- textproc/scim.old/Makefile	Sun Jul 25 07:16:56 2004
+++ textproc/scim/Makefile	Thu Jul 29 20:02:05 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	scim
-PORTVERSION=	0.99.4
+PORTVERSION=	0.99.5
 CATEGORIES=	textproc
 MASTER_SITES=	http://freedesktop.org/~suzhe/sources/
 
@@ -21,7 +21,7 @@
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL_VER=	15
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
 		LDFLAGS="-L${LOCALBASE}/lib -lintl" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
diff -ruN textproc/scim.old/distinfo textproc/scim/distinfo
--- textproc/scim.old/distinfo	Sun Jul 25 07:16:56 2004
+++ textproc/scim/distinfo	Thu Jul 29 17:05:47 2004
@@ -1,2 +1,2 @@
-MD5 (scim-0.99.4.tar.gz) = 8ac0a8bb8b25e198a4f9b67fa4ca950b
-SIZE (scim-0.99.4.tar.gz) = 2104313
+MD5 (scim-0.99.5.tar.gz) = 3993cae41f119e6098323cdd42175437
+SIZE (scim-0.99.5.tar.gz) = 2165258
diff -ruN textproc/scim.old/pkg-descr textproc/scim/pkg-descr
--- textproc/scim.old/pkg-descr	Fri Jul  2 16:35:29 2004
+++ textproc/scim/pkg-descr	Thu Jul 29 17:05:47 2004
@@ -2,4 +2,4 @@
 to make Input Method developers live easier. It has very clear architecture
 and very simple programming interface. 
 
-WWW: http://freedesktop.org/~suzhe/
+WWW: http://scim.freedesktop.org
diff -ruN textproc/scim.old/pkg-plist textproc/scim/pkg-plist
--- textproc/scim.old/pkg-plist	Sun Jul 25 07:16:56 2004
+++ textproc/scim/pkg-plist	Thu Jul 29 17:05:47 2004
@@ -13,6 +13,7 @@
 include/scim-1.0/scim_attribute.h
 include/scim-1.0/scim_backend.h
 include/scim-1.0/scim_bind.h
+include/scim-1.0/scim_compose_key.h
 include/scim-1.0/scim_config_base.h
 include/scim-1.0/scim_config_module.h
 include/scim-1.0/scim_config_path.h
@@ -40,10 +41,10 @@
 include/scim-1.0/scim_utility.h
 lib/libscim-1.0.a
 lib/libscim-1.0.so
-lib/libscim-1.0.so.3
+lib/libscim-1.0.so.4
 lib/libscim-gtkutils-1.0.a
 lib/libscim-gtkutils-1.0.so
-lib/libscim-gtkutils-1.0.so.3
+lib/libscim-gtkutils-1.0.so.4
 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
--- patch-textproc-scim ends here ---

--- patch-textproc-skim begins here ---
diff -ruN textproc/skim.old/Makefile textproc/skim/Makefile
--- textproc/skim.old/Makefile	Wed Jul 28 15:34:55 2004
+++ textproc/skim/Makefile	Thu Jul 29 20:37:29 2004
@@ -7,20 +7,21 @@
 
 PORTNAME=	skim
 PORTVERSION=	0.9.3
+PORTREVISION=	1
 CATEGORIES=	textproc kde
 MASTER_SITES=	http://freedesktop.org/~cougar/skim/downloads/
 
 MAINTAINER=	gaoj@cpsc.ucalgary.ca
 COMMENT=	An input method platform based on SCIM library and KDE/QT
 
-LIB_DEPENDS=	scim-1.0.3:${PORTSDIR}/textproc/scim
+LIB_DEPENDS=	scim-1.0.4:${PORTSDIR}/textproc/scim
 
 USE_KDELIBS_VER=3
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS} -D__STDC_ISO_10646__" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 pre-configure:
diff -ruN textproc/skim.old/pkg-descr textproc/skim/pkg-descr
--- textproc/skim.old/pkg-descr	Wed Jul 28 15:34:55 2004
+++ textproc/skim/pkg-descr	Thu Jul 29 17:03:58 2004
@@ -3,4 +3,4 @@
 SetupUIs for itself and scim-lib. It also has its own plugin system which
 supports on-demand loadable actions.
 
-WWW: http://scim.freedesktop.org/
+WWW: http://scim.freedesktop.org/Software/ScimKDE
--- patch-textproc-skim ends here ---

--- patch-chinese-scim-chinese begins here ---
diff -ruN chinese/scim-chinese.old/Makefile chinese/scim-chinese/Makefile
--- chinese/scim-chinese.old/Makefile	Fri Jul  2 16:36:26 2004
+++ chinese/scim-chinese/Makefile	Thu Jul 29 20:02:28 2004
@@ -7,6 +7,7 @@
 
 PORTNAME=	scim-chinese
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	chinese
 MASTER_SITES=	http://freedesktop.org/~suzhe/scim-chinese/
 
@@ -21,7 +22,7 @@
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=	15
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
 		LDFLAGS="-L${LOCALBASE}/lib -lintl" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
diff -ruN chinese/scim-chinese.old/pkg-descr chinese/scim-chinese/pkg-descr
--- chinese/scim-chinese.old/pkg-descr	Fri Jul  2 16:36:26 2004
+++ chinese/scim-chinese/pkg-descr	Thu Jul 29 17:02:34 2004
@@ -4,4 +4,4 @@
 make Input Method developers live easier. It has very clear architecture and
 very simple programming interface.
 
-WWW: http://freedesktop.org/~suzhe/
+WWW: http://scim.freedesktop.org
--- patch-chinese-scim-chinese ends here ---




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200407300338.i6U3cBpi010341>