Bug 181611 - [patch] graphics/cuneiform: unbreak with clang, add LICENSE
[patch] graphics/cuneiform: unbreak with clang, add LICENSE
Status: Closed FIXED
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s)
Latest
Any Any
: Normal Affects Only Me
Assigned To: Martin Wilke
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2013-08-28 11:50 UTC by Boris Samorodov
Modified: 2013-08-28 13:50 UTC (History)
0 users

See Also:


Attachments
file.diff (1.21 KB, patch)
2013-08-28 11:50 UTC, Boris Samorodov
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Boris Samorodov freebsd_committer 2013-08-28 11:50:00 UTC
The port does not build with clang:
-----
/wrkdirs/usr/ports/graphics/cuneiform/work/cuneiform-linux-1.1.0/cuneiform_src/Kern/leo/src/leo_dll.c:625:30: error: character too large for enclosing character literal type
        !ansi_letters[(uchar)'<U+FFFD>'] &&
                      ^
-----

Fix: . fix build with clang (error: character too large for enclosing character literal type);
. add LICENSE (BSD), bump PORTREVISION;
. remove unneeded WRKSRC creation;
. use new LIB_DEPENDS syntax.

Patch attached with submission follows:
Comment 1 Edwin Groothuis freebsd_committer 2013-08-28 11:50:08 UTC
Responsible Changed
From-To: freebsd-ports-bugs->miwi

miwi@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
Comment 2 Edwin Groothuis freebsd_committer 2013-08-28 11:50:09 UTC
Maintainer of graphics/cuneiform,

Please note that PR ports/181611 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/181611

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 3 Edwin Groothuis freebsd_committer 2013-08-28 11:50:10 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 4 samm 2013-08-28 13:13:36 UTC
Thank you, please commit.
Comment 5 dfilter freebsd_committer 2013-08-28 13:47:24 UTC
Author: bsam
Date: Wed Aug 28 12:47:11 2013
New Revision: 325525
URL: http://svnweb.freebsd.org/changeset/ports/325525

Log:
  . fix build with clang (error: character too large for enclosing character literal type);
  . add LICENSE (BSD), bump PORTREVISION;
  . remove unneeded WRKSRC creation;
  . use new LIB_DEPENDS syntax.
  
  PR:		ports/181611
  Submitted by:	bsam (me)
  Approved by:	Alex Samorukov <samm@os2.kiev.ua> (maintainer)

Modified:
  head/graphics/cuneiform/Makefile

Modified: head/graphics/cuneiform/Makefile
==============================================================================
--- head/graphics/cuneiform/Makefile	Wed Aug 28 12:39:15 2013	(r325524)
+++ head/graphics/cuneiform/Makefile	Wed Aug 28 12:47:11 2013	(r325525)
@@ -3,7 +3,7 @@
 
 PORTNAME=	cuneiform
 PORTVERSION=	1.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://launchpadlibrarian.net/69906918/
 DISTNAME=	${PORTNAME}-linux-${PORTVERSION}
@@ -11,6 +11,9 @@ DISTNAME=	${PORTNAME}-linux-${PORTVERSIO
 MAINTAINER=	samm@os2.kiev.ua
 COMMENT=	OCR system developed and open sourced by Cognitive technologies
 
+LICENSE=	BSD
+LICENSE_FILE=	${WRKSRC}/cuneiform_src/Kern/license.txt
+
 ONLY_FOR_ARCHS=	i386 amd64
 
 USE_BZIP2=	yes
@@ -25,15 +28,14 @@ OPTIONS_DEFINE=	IMAGEMAGICK
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIMAGEMAGICK}
-LIB_DEPENDS+=	MagickWand:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	libMagickWand.so:${PORTSDIR}/graphics/ImageMagick
 .endif
 
-post-extract:
-	${MKDIR} ${WRKSRC}
-
 post-patch:
 	${MV} ${WRKSRC}/cuneiform_src/Kern/hhh/tigerh/h/strings.h \
 		${WRKSRC}/cuneiform_src/Kern/hhh/tigerh/h/cf_strings.h
+	@${REINPLACE_CMD} -e 's:\[(uchar):\[(uchar)L:' \
+		${WRKSRC}/cuneiform_src/Kern/leo/src/leo_dll.c
 .if ! ${PORT_OPTIONS:MIMAGEMAGICK}
 	@${REINPLACE_CMD} -e '/pkg_check_modules.*ImageMagick/ d' \
 		${WRKSRC}/cuneiform_src/Kern/CMakeLists.txt
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 6 Boris Samorodov freebsd_committer 2013-08-28 13:50:37 UTC
State Changed
From-To: feedback->closed

Committed, thanks! ;-)