Attachment 162198 Details for Bug 201424 – cuneiform.diff

[patch] cuneiform.diff

cuneiform.diff (text/plain), 3.18 KB, created by Walter Schwarzenfeld on 2015-10-19 08:08:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2015-10-19 08:08:10 UTC

Size: 3.18 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 399603)
>+++ Makefile	(working copy)
>@@ -1,9 +1,10 @@
> # Created by: samm
> # $FreeBSD$
>+# head/graphics/cuneiform/Makefile 377347  kwm
> 
> PORTNAME=	cuneiform
> PORTVERSION=	1.1.0
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	graphics
> MASTER_SITES=	http://launchpadlibrarian.net/69906918/
> DISTNAME=	${PORTNAME}-linux-${PORTVERSION}
>@@ -16,28 +17,19 @@
> 
> ONLY_FOR_ARCHS=	i386 amd64
> 
>+USE_GCC=	4.8+
> USES=		cmake:outsource tar:bzip2
> USE_LDCONFIG=	yes
> 
>+LIB_DEPENDS+=	libMagickWand-6.so:graphics/ImageMagick
>+
> CPPFLAGS+=	-I${LOCALBASE}/include
> CFLAGS+=	-I${LOCALBASE}/include
> 
>-OPTIONS_DEFINE=	IMAGEMAGICK
>-
>-.include <bsd.port.options.mk>
>-
>-.if ${PORT_OPTIONS:MIMAGEMAGICK}
>-LIB_DEPENDS+=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
>-.endif
>-
> 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
>-.endif
> 
> .include <bsd.port.mk>
>Index: files/patch-cuneiform-cli-cpp
>===================================================================
>--- files/patch-cuneiform-cli-cpp	(nonexistent)
>+++ files/patch-cuneiform-cli-cpp	(working copy)
>@@ -0,0 +1,24 @@
>+--- cuneiform_src/cli/cuneiform-cli.cpp.orig	2015-07-08 09:26:05 UTC
>++++ cuneiform_src/cli/cuneiform-cli.cpp
>+@@ -152,7 +152,8 @@ static string supported_formats() {
>+  */
>+ static char* read_file(const char *fname);
>+ 
>+-#ifdef USE_MAGICK
>++#ifndef USE_MAGICK
>++#define USE_MAGICK
>+ #include <Magick++.h>
>+ using namespace Magick;
>+ 
>+@@ -337,7 +338,10 @@ int main(int argc, char **argv) {
>+         return 0;
>+     }
>+ 
>+-#ifdef USE_MAGICK
>++#ifndef USE_MAGICK 
>++#define USE_MAGICK
>++#include <Magick++.h>
>++using namespace Magick;
>+     Magick::InitializeMagick("");
>+ #endif
>+ 
>
>Property changes on: files/patch-cuneiform-cli-cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-stdprt_h
>===================================================================
>--- files/patch-stdprt_h	(nonexistent)
>+++ files/patch-stdprt_h	(working copy)
>@@ -0,0 +1,11 @@
>+--- cuneiform_src/Kern/hrkint/stdprt.h.orig	2015-07-08 11:24:29 UTC
>++++ cuneiform_src/Kern/hrkint/stdprt.h
>+@@ -58,6 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>+ #define __STDPRT_H
>+ 
>+ #include "std.h"
>++#include <cstdarg>
>+ 
>+ typedef int32_t HEvent32;
>+ typedef struct tagStdPrtEvent
>+
>
>Property changes on: files/patch-stdprt_h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 201424: 161087 | 161088 | 161574 | 162064 | 162185 | 162187 | 162197 | 162198 | 165398 | 165399 | 165406 | 171156 | 171263