From owner-svn-ports-all@freebsd.org Fri Oct 9 18:33:10 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7480A9D136B; Fri, 9 Oct 2015 18:33:10 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 28B2B202; Fri, 9 Oct 2015 18:33:10 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t99IX9jZ061382; Fri, 9 Oct 2015 18:33:09 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t99IX9kl061381; Fri, 9 Oct 2015 18:33:09 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201510091833.t99IX9kl061381@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Fri, 9 Oct 2015 18:33:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398949 - head/graphics/mupdf/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Oct 2015 18:33:10 -0000 Author: sunpoet Date: Fri Oct 9 18:33:09 2015 New Revision: 398949 URL: https://svnweb.freebsd.org/changeset/ports/398949 Log: - Fix patch PR: 203327 Submitted by: Wolfgang Jenkner Approved by: Zsolt Udvari (maintainer, implicit) Modified: head/graphics/mupdf/files/patch-source__fitz__load-jpx.c Modified: head/graphics/mupdf/files/patch-source__fitz__load-jpx.c ============================================================================== --- head/graphics/mupdf/files/patch-source__fitz__load-jpx.c Fri Oct 9 18:33:04 2015 (r398948) +++ head/graphics/mupdf/files/patch-source__fitz__load-jpx.c Fri Oct 9 18:33:09 2015 (r398949) @@ -1,25 +1,22 @@ --- source/fitz/load-jpx.c.orig 2015-04-16 08:57:45 UTC +++ source/fitz/load-jpx.c -@@ -3,12 +3,17 @@ - /* Without the definition of OPJ_STATIC, compilation fails on windows - * due to the use of __stdcall. We believe it is required on some - * linux toolchains too. */ -+ -+#ifdef __cplusplus -+extern "C" -+{ - #define OPJ_STATIC - #ifndef _MSC_VER - #define OPJ_HAVE_STDINT_H - #endif -+#endif +@@ -1,14 +1,6 @@ + #include "mupdf/fitz.h" +-/* Without the definition of OPJ_STATIC, compilation fails on windows +- * due to the use of __stdcall. We believe it is required on some +- * linux toolchains too. */ +-#define OPJ_STATIC +-#ifndef _MSC_VER +-#define OPJ_HAVE_STDINT_H +-#endif +- -#include +#include static void fz_opj_error_callback(const char *msg, void *client_data) { -@@ -117,7 +122,7 @@ fz_load_jpx(fz_context *ctx, unsigned ch +@@ -117,7 +109,7 @@ fz_load_jpx(fz_context *ctx, unsigned ch opj_stream_set_read_function(stream, fz_opj_stream_read); opj_stream_set_skip_function(stream, fz_opj_stream_skip); opj_stream_set_seek_function(stream, fz_opj_stream_seek); @@ -28,10 +25,3 @@ /* Set the length to avoid an assert */ opj_stream_set_user_data_length(stream, size); -@@ -247,3 +252,6 @@ fz_load_jpx(fz_context *ctx, unsigned ch - - return img; - } -+#ifdef __cplusplus -+} -+#endif