Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Nov 2009 21:41:48 +0100 (CET)
From:      Nikola Lecic <nikola.lecic@anthesphoria.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/140911: [Maintainer] textproc/scim-kmfl-european-latin: Fix KMFL on amd64, part 4/4 - prevent breaking of scim-helper-launcher
Message-ID:  <200911262041.nAQKfm0H017724@anthesphoria.net>
Resent-Message-ID: <200911262110.nAQLACjO088180@freefall.freebsd.org>

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

>Number:         140911
>Category:       ports
>Synopsis:       [Maintainer] textproc/scim-kmfl-european-latin: Fix KMFL on amd64, part 4/4 - prevent breaking of scim-helper-launcher
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 26 21:10:12 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Nikola Lecic
>Release:        FreeBSD 8.0-RC3 amd64
>Organization:
>Environment:

System: FreeBSD xxx 8.0-RC3 FreeBSD 8.0-RC3 #0: Tue Nov 10 06:35:19 UTC 2009 root@mason.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64

>Description:

Compiling of european-latin keyboard produces two warnings:

  Warning: unrecognized special store '&&KMW_HelpFile'  (line 14)
  Warning: unrecognized special store '&&KMW_EmbedJS'  (line 15)

that seem to be fatal for scim-helper-launher on amd64; consequently,
panel (e.g. Xfce panel) gets blocked and no application can be launched.

Commenting out these lines brings everything back to normal.

Besides, this patch sets DIST_SUBDIR to be in corcondance with other
textproc/scim-kmfl-* ports.

>How-To-Repeat:
	
>Fix:

--- scim-kmfl-european-latin-1.2_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/scim-kmfl-european-latin/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile	16 Jul 2009 17:32:11 -0000	1.1
+++ Makefile	20 Nov 2009 01:06:43 -0000
@@ -6,10 +6,12 @@
 
 PORTNAME=	scim-kmfl-european-latin
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://eurolatin.keymankeyboards.com/ \
 		http://anthesphoria.net/FreeBSD/ports/distfiles/
 DISTNAME=	eurolatin-${PORTVERSION}
+DIST_SUBDIR=	kmfl
 
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	Paneuropean Latin KMFL SCIM IMEngine keyboard covering 42 languages
@@ -18,6 +20,7 @@
  		${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/kmfl.so:${PORTSDIR}/textproc/scim-kmfl-imengine
 
 NO_WRKSUBDIR=	yes
+USE_DOS2UNIX=	european.kmn
 NO_BUILD=	yes
 USE_ZIP=	yes
 
@@ -34,9 +37,6 @@
 		${SCIM_KMFL_ICONS_DIR}/latin.bmp \
 		${SCIM_KMFL_ICONS_DIR}/latin.ico
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|latin.ico|latin.bmp|' ${WRKSRC}/european.kmn
-
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/*.kmn ${LOCALBASE}/${SCIM_KMFL_DIR}
 	${INSTALL_DATA} ${WRKSRC}/*.bmp ${WRKSRC}/*.ico \
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/textproc/scim-kmfl-european-latin/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- distinfo	16 Jul 2009 17:32:11 -0000	1.1
+++ distinfo	20 Nov 2009 01:06:58 -0000
@@ -1,3 +1,3 @@
-MD5 (eurolatin-1.2.zip) = 7785b7102296521294eb8c5db7f13a07
-SHA256 (eurolatin-1.2.zip) = 9a31983c240d1b3e46474a264e904b69dc3cc058eea25c7185e99af211454a77
-SIZE (eurolatin-1.2.zip) = 362966
+MD5 (kmfl/eurolatin-1.2.zip) = 7785b7102296521294eb8c5db7f13a07
+SHA256 (kmfl/eurolatin-1.2.zip) = 9a31983c240d1b3e46474a264e904b69dc3cc058eea25c7185e99af211454a77
+SIZE (kmfl/eurolatin-1.2.zip) = 362966
Index: files/patch-european.kmn
===================================================================
RCS file: files/patch-european.kmn
diff -N files/patch-european.kmn
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-european.kmn	20 Nov 2009 01:07:58 -0000
@@ -0,0 +1,21 @@
+--- european.kmn	2009-11-20 01:07:20.000000000 +0000
++++ work/european.kmn	2009-11-20 01:07:56.000000000 +0000
+@@ -5,15 +5,15 @@
+ 
+ VERSION 7.0
+ NAME "European Latin"
+-store(&BITMAP) 'latin.ico'
++store(&BITMAP) 'latin.bmp'
+ store(&COPYRIGHT) 'Copyright (C) 1994-2008 Tavultesoft Pty Ltd'
+ 
+ store(&mnemoniclayout) '1'
+ 
+ c KeymanWeb-specific header statements
+ 
+-store(&KMW_HelpFile) 'european.html'
+-store(&KMW_EmbedJS) 'european_js.txt'
++c store(&KMW_HelpFile) 'european.html'
++c store(&KMW_EmbedJS) 'european_js.txt'
+ 
+ begin Unicode > use(Main)
+ 
--- scim-kmfl-european-latin-1.2_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



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