haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-30 12:08:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #444 from fbrosson/patch-2

Browse Source 
mupdf: rename & refresh 1.7 patch to sync offsets for 1.8
This commit is contained in:
waddlesplash
2016-01-27 18:43:56 -05:00
parent c5893b3659 9bd72535be
commit 226c178cc3
2 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app-text/mupdf/mupdf-1.8.recipe
View File

@@ -15,7 +15,7 @@ SOURCE_URI="http://www.mupdf.com/downloads/archive/mupdf-$portVersion-source.tar
CHECKSUM_SHA256="a2a3c64d8b24920f87cf4ea9339a25abf7388496440f13b37482d1403c33c206" CHECKSUM_SHA256="a2a3c64d8b24920f87cf4ea9339a25abf7388496440f13b37482d1403c33c206"
SOURCE_DIR="mupdf-$portVersion-source" SOURCE_DIR="mupdf-$portVersion-source"
PATCHES=" PATCHES="
mupdf-1.7.patchset mupdf-1.8.patch
mupdf-1.6-openjpeg21-1.patch mupdf-1.6-openjpeg21-1.patch
" "

44
app-text/mupdf/patches/mupdf-1.7.patchset → app-text/mupdf/patches/mupdf-1.8.patch
View File

@@ -1,14 +1,12 @@
From 822c66106b347a8483d72db3ac8adffd1bf1aacc Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com> From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 21 Apr 2015 12:57:05 +0300 Date: Tue, 21 Apr 2015 12:57:05 +0300
Subject: gcc2 fixes Subject: gcc2 fixes
diff --git a/include/mupdf/fitz/system.h b/include/mupdf/fitz/system.h diff -upr mupdf-1.8-source/include/mupdf/fitz/system.h mupdf-1.8-source-haiku/include/mupdf/fitz/system.h
index 5df0c50..9e56bdb 100644 --- mupdf-1.8-source/include/mupdf/fitz/system.h 2015-11-10 16:19:51.000000000 +0000
--- a/include/mupdf/fitz/system.h +++ mupdf-1.8-source-haiku/include/mupdf/fitz/system.h
+++ b/include/mupdf/fitz/system.h @@ -70,6 +70,12 @@
@@ -61,6 +61,12 @@
#define fz_jmp_buf jmp_buf #define fz_jmp_buf jmp_buf
#endif #endif
@@ -21,11 +19,10 @@ index 5df0c50..9e56bdb 100644
#ifdef _MSC_VER /* Microsoft Visual C */ #ifdef _MSC_VER /* Microsoft Visual C */
/* MSVC up to VS2012 */ /* MSVC up to VS2012 */
diff --git a/scripts/cmapdump.c b/scripts/cmapdump.c diff -upr mupdf-1.8-source/scripts/cmapdump.c mupdf-1.8-source-haiku/scripts/cmapdump.c
index 3c4540e..0953d93 100644 --- mupdf-1.8-source/scripts/cmapdump.c 2015-11-10 16:19:51.000000000 +0000
--- a/scripts/cmapdump.c +++ mupdf-1.8-source-haiku/scripts/cmapdump.c
+++ b/scripts/cmapdump.c @@ -22,6 +22,24 @@
@@ -19,6 +19,24 @@
#include "../source/fitz/ftoa.c" #include "../source/fitz/ftoa.c"
#include "../source/fitz/printf.c" #include "../source/fitz/printf.c"
@@ -51,19 +48,16 @@ index 3c4540e..0953d93 100644
#include "../source/pdf/pdf-cmap.c" #include "../source/pdf/pdf-cmap.c"
#include "../source/pdf/pdf-cmap-parse.c" #include "../source/pdf/pdf-cmap-parse.c"
-- --
2.2.2
From 72fa503df92c304b9bfc3d181424cfe1083b4cfe Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com> From: Chris Roberts <cpr420@gmail.com>
Date: Mon, 18 Nov 2013 01:10:58 -0700 Date: Mon, 18 Nov 2013 01:10:58 -0700
Subject: Remove libm and add install-libs target Subject: Remove libm and add install-libs target
diff --git a/Makefile b/Makefile diff -upr mupdf-1.8-source/Makefile mupdf-1.8-source-haiku/Makefile
index 8e45697..f3d352d 100644 --- mupdf-1.8-source/Makefile 2015-11-10 16:19:51.000000000 +0000
--- a/Makefile +++ mupdf-1.8-source-haiku/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ include Makethird @@ -16,7 +16,7 @@ include Makethird
# XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that
# set a variable that was set on the command line. # set a variable that was set on the command line.
@@ -73,7 +67,7 @@ index 8e45697..f3d352d 100644
THIRD_LIBS += $(FREETYPE_LIB) THIRD_LIBS += $(FREETYPE_LIB)
THIRD_LIBS += $(JBIG2DEC_LIB) THIRD_LIBS += $(JBIG2DEC_LIB)
@@ -330,7 +330,17 @@ third: $(THIRD_LIBS) $(CURL_LIB) @@ -342,7 +342,17 @@ extra: $(CURL_LIB) $(GLFW_LIB)
libs: $(INSTALL_LIBS) libs: $(INSTALL_LIBS)
apps: $(INSTALL_APPS) apps: $(INSTALL_APPS)
@@ -92,7 +86,7 @@ index 8e45697..f3d352d 100644
install -d $(DESTDIR)$(incdir)/mupdf install -d $(DESTDIR)$(incdir)/mupdf
install -d $(DESTDIR)$(incdir)/mupdf/fitz install -d $(DESTDIR)$(incdir)/mupdf/fitz
install -d $(DESTDIR)$(incdir)/mupdf/pdf install -d $(DESTDIR)$(incdir)/mupdf/pdf
@@ -341,14 +351,6 @@ install: libs apps @@ -353,14 +363,6 @@ install: libs apps
install -d $(DESTDIR)$(libdir) install -d $(DESTDIR)$(libdir)
install $(INSTALL_LIBS) $(DESTDIR)$(libdir) install $(INSTALL_LIBS) $(DESTDIR)$(libdir)
@@ -107,11 +101,10 @@ index 8e45697..f3d352d 100644
tarball: tarball:
bash scripts/archive.sh bash scripts/archive.sh
diff --git a/Makerules b/Makerules diff -upr mupdf-1.8-source/Makerules mupdf-1.8-source-haiku/Makerules
index 47b6d1c..bcd27ae 100644 --- mupdf-1.8-source/Makerules 2015-11-10 16:19:51.000000000 +0000
--- a/Makerules +++ mupdf-1.8-source-haiku/Makerules
+++ b/Makerules @@ -66,6 +66,27 @@ AR = xcrun ar
@@ -53,6 +53,27 @@ AR = xcrun ar
LD = xcrun ld LD = xcrun ld
RANLIB_CMD = xcrun ranlib $@ RANLIB_CMD = xcrun ranlib $@
@@ -139,6 +132,3 @@ index 47b6d1c..bcd27ae 100644
# Linux uses pkg-config for system libraries. # Linux uses pkg-config for system libraries.
else ifeq "$(OS)" "Linux" else ifeq "$(OS)" "Linux"
--
2.2.2