<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f6f959c5838a4863c60e749046b347f8c8f1399b">https://github.com/macports/macports-ports/commit/f6f959c5838a4863c60e749046b347f8c8f1399b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f6f959c mupdf: update to 1.14.0
</span>f6f959c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f6f959c5838a4863c60e749046b347f8c8f1399b
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Tue Oct 9 08:24:07 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> mupdf: update to 1.14.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Add dependency on openjpeg.
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove unnecessary patch for freetype header file search.
</span>---
graphics/mupdf/Portfile | 20 +++---
graphics/mupdf/files/freetype.diff | 77 ----------------------
graphics/mupdf/files/patch-Makerules.diff | 53 ++++++++-------
.../mupdf/files/patch-platform-gl-gl-main.c.diff | 16 -----
4 files changed, 40 insertions(+), 126 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/mupdf/Portfile b/graphics/mupdf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5c0b661..39e68d2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/mupdf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/mupdf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name mupdf
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.13.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.14.0
</span> categories graphics
platforms darwin
maintainers {gmail.com:starkhalo @harciga} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,9 +30,9 @@ homepage https://www.mupdf.com/
</span> master_sites ${homepage}downloads/archive/
distname ${name}-${version}-source
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 078e972c2f41a34308a52af24ac5ddbf41471342 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 071c6962cbee1136188da62136596a9d704b81e35fe617cd34874bbb0ae7ca09 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 51425034
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4bff6300792025f5bd76b46d010dcfc8d2edeeb1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c443483a678c3fc258fa4adc124146225d0bb443c522619faadebf6b363d7724 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 55654104
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,11 +40,10 @@ depends_lib port:freetype \
</span> port:harfbuzz \
port:jbig2dec \
port:jpeg \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openjpeg \
</span> port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles freetype.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-platform-gl-gl-main.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Makerules.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-Makerules.diff
</span>
use_configure no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,13 +55,15 @@ build.args-append CC=${configure.cc} \
</span> XLIBS="${configure.ldflags} [get_canonical_archflags ld]" \
HAVE_GLUT=yes \
HAVE_X11=no \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ USE_SYSTEM_LIBS=yes \
</span> build=release \
verbose=yes
destroot.destdir prefix=${destroot}${prefix}
destroot.args-append \
HAVE_GLUT=yes \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_X11=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HAVE_X11=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USE_SYSTEM_LIBS=yes
</span>
variant x11 {
depends_lib-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,7 +82,7 @@ variant x11 {
</span> variant universal {}
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# delete thirdparty software other than mujs and openjpeg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# delete thirdparty software other than mujs
</span> delete ${worksrcpath}/thirdparty/curl
delete ${worksrcpath}/thirdparty/freeglut
delete ${worksrcpath}/thirdparty/freetype
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,6 +90,7 @@ post-extract {
</span> delete ${worksrcpath}/thirdparty/jbig2dec
delete ${worksrcpath}/thirdparty/jpeg
delete ${worksrcpath}/thirdparty/libjpeg
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${worksrcpath}/thirdparty/openjpeg
</span> delete ${worksrcpath}/thirdparty/zlib
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/mupdf/files/freetype.diff b/graphics/mupdf/files/freetype.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9c9db0a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/mupdf/files/freetype.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,77 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- source/fitz/font.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ source/fitz/font.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,7 +4,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "font-imp.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "draw-imp.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <ft2build.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <freetype2/ft2build.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "hb.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "hb-ft.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- source/fitz/stext-output.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ source/fitz/stext-output.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,7 +3,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define SUBSCRIPT_OFFSET 0.2f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define SUPERSCRIPT_OFFSET -0.2f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <ft2build.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <freetype2/ft2build.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include FT_FREETYPE_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* HTML output (visual formatting with preserved layout) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- source/html/html-layout.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ source/html/html-layout.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,7 +4,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "hb.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "hb-ft.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <ft2build.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <freetype2/ft2build.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <math.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- source/pdf/pdf-appearance.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ source/pdf/pdf-appearance.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,7 +5,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <limits.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <math.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <ft2build.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <freetype2/ft2build.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include FT_FREETYPE_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include FT_ADVANCES_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- source/pdf/pdf-device.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ source/pdf/pdf-device.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "mupdf/fitz.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "mupdf/pdf.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <ft2build.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <freetype2/ft2build.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include FT_FREETYPE_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include FT_ADVANCES_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- source/pdf/pdf-font.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ source/pdf/pdf-font.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,7 +6,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <assert.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <ft2build.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <freetype2/ft2build.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include FT_FREETYPE_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include FT_ADVANCES_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef FT_FONT_FORMATS_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- source/xps/xps-glyphs.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ source/xps/xps-glyphs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,7 +2,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "xps-imp.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "../fitz/fitz-imp.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <ft2build.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <freetype2/ft2build.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include FT_FREETYPE_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include FT_ADVANCES_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/mupdf/files/patch-Makerules.diff b/graphics/mupdf/files/patch-Makerules.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1c1ef4a..8742127 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/mupdf/files/patch-Makerules.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/mupdf/files/patch-Makerules.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,30 +1,35 @@
</span> --- Makerules.orig
+++ Makerules
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -81,22 +81,18 @@ HAVE_GLUT ?= yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SYS_GLUT_CFLAGS := -Wno-deprecated-declarations
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SYS_GLUT_LIBS := -framework GLUT -framework OpenGL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -80,13 +80,13 @@ else ifeq ($(OS),MACOS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HAVE_GLUT := yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYS_GLUT_CFLAGS := -Wno-deprecated-declarations
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYS_GLUT_LIBS := -framework GLUT -framework OpenGL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CC = xcrun cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AR = xcrun ar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LD = xcrun ld
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- RANLIB = xcrun ranlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CC = cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AR = ar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LD = ld
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ RANLIB_CMD = ranlib $@
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--CC = xcrun cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AR = xcrun ar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LD = xcrun ld
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--RANLIB_CMD = xcrun ranlib $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CC = cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AR = ar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LD = ld
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+RANLIB_CMD = ranlib $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else ifeq ($(OS),Linux)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- HAVE_OBJCOPY := yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else ifeq ($(OS),Linux)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ HAVE_OBJCOPY := no
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Linux uses pkg-config for system libraries.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else ifeq "$(OS)" "Linux"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# else ifeq "$(OS)" "Linux"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -119,12 +119,6 @@ else ifeq ($(OS),Linux)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_PTHREAD := yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SYS_PTHREAD_CFLAGS :=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SYS_PTHREAD_LIBS := -lpthread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--HAVE_GLUT := yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SYS_GLUT_CFLAGS :=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SYS_GLUT_LIBS := -lglut -lGL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- HAVE_GLUT := yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ifeq ($(HAVE_GLUT),yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SYS_GLUT_CFLAGS :=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SYS_GLUT_LIBS := -lglut -lGL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif
</span> -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_LIBCRYPTO := yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(HAVE_X11),yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/mupdf/files/patch-platform-gl-gl-main.c.diff b/graphics/mupdf/files/patch-platform-gl-gl-main.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8341dd5..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/mupdf/files/patch-platform-gl-gl-main.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bugs.ghostscript.com/show_bug.cgi?id=699726
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- platform/gl/gl-main.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ platform/gl/gl-main.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1673,9 +1673,9 @@ int main(int argc, char **argv)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- search_input.end = search_input.p;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Init GLUT */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(GLUT_ACTION_ON_WINDOW_CLOSE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glutSetOption(GLUT_ACTION_ON_WINDOW_CLOSE, GLUT_ACTION_GLUTMAINLOOP_RETURNS);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glutInitErrorFunc(on_error);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glutInitWarningFunc(on_warning);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE);
</span></pre><pre style='margin:0'>
</pre>