Adapt for mupdf split header files, use mupdf pkg-config file.

(Portage version: 2.2.0_alpha180/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

5 files changed, 68 insertions, 2 deletions

diff --git a/app-text/zathura-pdf-mupdf/ChangeLog b/app-text/zathura-pdf-mupdf/ChangeLog
index cd1fae8060d3..6301a9caf4c0 100644
--- a/app-text/zathura-pdf-mupdf/ChangeLog
+++ b/app-text/zathura-pdf-mupdf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/zathura-pdf-mupdf
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-pdf-mupdf/ChangeLog,v 1.7 2013/06/20 10:54:48 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-pdf-mupdf/ChangeLog,v 1.8 2013/06/20 11:25:55 xmw Exp $
+
+  20 Jun 2013; Michael Weber <xmw@gentoo.org>
+  +files/zathura-pdf-mupdf-9999-mupdf-fz_new_text_page.patch,
+  +files/zathura-pdf-mupdf-9999-mupdf-pkgconfig.patch,
+  +files/zathura-pdf-mupdf-9999-mupdf-split-headers.patch,
+  zathura-pdf-mupdf-9999.ebuild:
+  Adapt for mupdf split header files, use mupdf pkg-config file.
 
 *zathura-pdf-mupdf-0.2.4 (20 Jun 2013)
 
diff --git a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-fz_new_text_page.patch b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-fz_new_text_page.patch
new file mode 100644
index 000000000000..5929f2a2cc2c
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-fz_new_text_page.patch
@@ -0,0 +1,11 @@
+--- zathura-pdf-mupdf-9999/pdf.c
++++ zathura-pdf-mupdf-9999/pdf.c
+@@ -225,7 +225,7 @@
+   zathura_page_set_height(page, mupdf_page->bbox.y1 - mupdf_page->bbox.y0);
+ 
+   /* setup text */
+-  mupdf_page->text           = fz_new_text_page(mupdf_page->ctx, &mupdf_page->bbox);
++  mupdf_page->text           = fz_new_text_page(mupdf_page->ctx);
+   if (mupdf_page->text == NULL) {
+     goto error_free;
+   }
diff --git a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-pkgconfig.patch b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-pkgconfig.patch
new file mode 100644
index 000000000000..9159d643b7fe
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-pkgconfig.patch
@@ -0,0 +1,16 @@
+--- zathura-pdf-mupdf-9999/config.mk
++++ zathura-pdf-mupdf-9999/config.mk
+@@ -29,8 +29,11 @@
+ PLUGINDIR = ${LIBDIR}/zathura
+ endif
+ 
+-INCS = ${GTK_INC} ${ZATHURA_INC} ${GIRARA_INC}
+-LIBS = ${GIRARA_LIB} ${GTK_LIB} -lfitz -ljbig2dec -lopenjpeg -ljpeg
++MUPDF_INC ?= $(shell pkg-config --cflags mupdf)
++MUPDF_LIB ?= $(shell pkg-config --libs mupdf)
++
++INCS = ${GTK_INC} ${ZATHURA_INC} ${GIRARA_INC} ${MUPDF_INC}
++LIBS = ${GIRARA_LIB} ${GTK_LIB} ${MUPDF_LIB}
+ 
+ # flags
+ CFLAGS += -std=c99 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS)
diff --git a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-split-headers.patch b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-split-headers.patch
new file mode 100644
index 000000000000..7b7547b4afb2
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-split-headers.patch
@@ -0,0 +1,25 @@
+--- zathura-pdf-mupdf-9999/pdf.c
++++ zathura-pdf-mupdf-9999/pdf.c
+@@ -6,9 +6,9 @@
+ #include <ctype.h>
+ #include <girara/datastructures.h>
+ #include <glib.h>
+-#include <muxps.h>
+-#include <mupdf.h>
+-#include <fitz.h>
++#include <mupdf/fitz.h>
++#include <mupdf/pdf.h>
++#include <mupdf/xps.h>
+ 
+ #include "pdf.h"
+ 
+--- zathura-pdf-mupdf-9999/pdf.h
++++ zathura-pdf-mupdf-9999/pdf.h
+@@ -5,7 +5,6 @@
+ 
+ #include <stdbool.h>
+ #include <zathura/plugin-api.h>
+-#include <fitz.h>
+ 
+ #if HAVE_CAIRO
+ #include <cairo.h>
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
index afe2bd891660..ab7f4058ea86 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild,v 1.3 2013/06/19 14:22:58 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild,v 1.4 2013/06/20 11:25:55 xmw Exp $
 
 EAPI=5
 
@@ -37,6 +37,13 @@ pkg_setup() {
 	)
 }
 
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-mupdf-fz_new_text_page.patch \
+		"${FILESDIR}"/${P}-mupdf-pkgconfig.patch \
+		"${FILESDIR}"/${P}-mupdf-split-headers.patch
+}
+
 src_compile() {
 	emake "${myzathuraconf[@]}"
 }