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

Package-Manager: portage-2.2.0_alpha180/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

6 files changed, 76 insertions, 7 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/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index 9ab68b07390c..3f8058fa8b03 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,17 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX zathura-pdf-mupdf-9999-mupdf-fz_new_text_page.patch 400 SHA256 579e69e50096170059f731ac70a4aaac492db76fde9193bfd66037a794da24d1 SHA512 812c63d9bce07ed18f9e3f2c26626a4c01b14df8474b6880e696e439e4df0867b284369b79f10b7996914b140851906cba8142be8b0f22ae612cc06a174f5844 WHIRLPOOL a88c6b849768362666eaa4e0cfa0dea48cf0d74863d3bf92c14de42c998f4af262f0e8b79edd74e6200f8f792f88c37da75c6587216945f4976df9dfd961c935
+AUX zathura-pdf-mupdf-9999-mupdf-pkgconfig.patch 540 SHA256 a97e0ee2a4aa87f858568f1b3751cc8040e7fc3d3d0cbe78cf68fe518bbd654d SHA512 ca7f936570a5323ab549baff7c9f8b035e48c7fbb2100540b4340f2f5b8a02772c5d43d3ffa9d370dc1d48eeb15114c4f7bb8ac72ce2eff805ff188881db724a WHIRLPOOL f01a3a45218b7ecc345ad9bbd9d9e908f86ba7d04613c5213973543871be7e331714d47695c42327480dde8827bda029698dff726d67872d35ec354e8985b4ee
+AUX zathura-pdf-mupdf-9999-mupdf-split-headers.patch 507 SHA256 b2a1afd166247cda0f169559a3bdf1c7909aa5bd1345dc71cc1e50b0dcde2994 SHA512 39766f573576429f2bbb7f2f1fb22faa9893e7b9460690fcad132646b0bd8ab4b9a417d6af96c629753d6e3572c6fab37cca7054c96fb32b2fcd3fba3e1c1c98 WHIRLPOOL 2964995840e05e0de0d9d9b8b5ba9319c005aed884f2e0c65a49e38851fe18b6b36e7270503fa479ea7037a5d002f69a6adbfd375c795cdfc479404667d1e8b3
 DIST zathura-pdf-mupdf-0.2.3.tar.gz 8319 SHA256 4cb4698f35ccabf87f4cb0ca02d8f4445c3123b91c8790a8e641bb1f10788bd7 SHA512 efc4c85de09affffa3bb4a858eef9d8a61560a8946dcf7e57bae6837853d6532c38eb863202c1ae5b0859ccb6534b36dcaae650aacc126bfe45a9540a3837611 WHIRLPOOL c31920029a40569898fb8068653942c7efbefc1f0c365f59bb62c8b9fe8bd1b52f0ba59803bfb329a6e3c24b292af74e2f540b69f047e4247a796a5a9d9d8833
 DIST zathura-pdf-mupdf-0.2.4.tar.gz 9170 SHA256 0df530701b2a6620d543412a20195c5305c81c907961e25830b349c59f67370c SHA512 4ed7f2170f7eb5bf22cd3fd171d2f1563ab5a309082bfe1bbe8aaf3ebcab743f46c44820c15a3af64c8f6a28d04b734045d2bc17652570ed7e57a5567afa7e52 WHIRLPOOL 558252f5e7c8dea8959ddbfc0c9ba0cf64bc40ef9ed9172293bb89f8e26315e73be5ec960e6b0eecdac52bd3a08f8ac963dbdf42c5d0cd105468416a669bdc9c
 EBUILD zathura-pdf-mupdf-0.2.3.ebuild 925 SHA256 b8cc980ffefe884d69f5e9390e6c8dad1b01ccc7f9bb3c23da3d040bb22308c3 SHA512 8ffddd21036b4abcf579213dd8b50ddff457436cc6cf25d2a5eef1d86e40e57a4d909a76995d00eba5908ca0ee74f5fe6861bba3e406ee0740a1dc447e61fe38 WHIRLPOOL faf09306f50eb4487d5c0b6bf3efbe9d39c5a3432522de850526d93db5f6999c694d62efc219b52fd8904d1b37925c0ab781a44d02652eee5f65e9af1e0e588d
 EBUILD zathura-pdf-mupdf-0.2.4.ebuild 925 SHA256 ad7a123003f0cbe7d8b1999f27e8dc9e5f29647657c4bdad1acba30c465504cf SHA512 cb4631a732d550feec238c7c4ea7cc7980c9ea1b08fa244cda191734309397ad4437908bf9a9931e4423fb0681d04d05cc07350ae1f6766cb64b6deed71fa500 WHIRLPOOL b7b2a28c64135a6188933202422d33824630b16b62845297c3e310e311b63ae7cc8d99d2741e09b1116f430200df0a88e9645a8e2c83d31133d138da638669c1
-EBUILD zathura-pdf-mupdf-9999.ebuild 953 SHA256 e14fab28237427ebeff93ac205d983dc705fd966b0b9f4de6b8e94eccd54cc83 SHA512 6d62904ae1f045231a01f31c46e3bbd6fb303e29f6ca24c21b54fc85774c234706deb497dc8529c3cdb940459b668ec5bbede68fa75afa788538deeffb0652f6 WHIRLPOOL e4488d2f29779114572201cb1b33e34d183255d83e0c2f401ab9d4a838e56fe89fb048e838cc68dedb150786b7879b34367a83905bc9680b884674984eda9266
-MISC ChangeLog 1254 SHA256 387bff69015df0cb2ab334405a8f0a6bfeb0332fea264d046ca1ea5fd5df69ce SHA512 26b03c8b788a1de2fbddd41d6b4a625b4a3fa8d1020609e2b88d683781f90fefcc4d4fa2022500e65bbac3954cf04485d7bfa3b838b0823415b1df958eb0d95d WHIRLPOOL 89afd99bd023fbb43c2cdfe494224af05aa1184b982a93829eafa546bd5d0b9de47e3cb490d99d3f91ef32a39a4d3b373b02bde34e53a88578fa65aa476570f9
+EBUILD zathura-pdf-mupdf-9999.ebuild 1126 SHA256 77b247149e8ccf8dfbe91c59583ae151f272e36c02b476a20b6f945156e90879 SHA512 37f42b7a73c40191c6aff40165356ae2387de5848fc5f1d6ce757c56d6f90a38b465275b37fe1edf7bdc945f974141d84786a2051e53bcdd4580683f377b190a WHIRLPOOL 46577785178ae1443b6d31a08e13025ab222fa5d1334de585d1088eaa7805afa952f0f8b4bd5c2ce58d29608ad7a78a7b6fef397d6ee650e424ed54ae009d50f
+MISC ChangeLog 1575 SHA256 ee91b8cd1a2884a0453b7549a180fb8679276bd79fb74fa375891f8126925d96 SHA512 017c45ecb48ad3ce35a3b01f72ad2fdb920b5c8c8082bf5fb64925a213509cea27dc40a4a2b83300b0c806d49854af07b89bb964c467172d60b52cee65ff438b WHIRLPOOL 2063c495b845ce2ebd915bf126e68bc350990036c629b2ff068fa139e7aff6fcae787ac81e84f97c31385bb06695da7bd11560b117e8f63d305fec4ee12f1f2d
 MISC metadata.xml 792 SHA256 34611a880defaaaa12f93fb91186e6b302733dac7b65d1e107e55536b916cd45 SHA512 cb3b1a3727d5d43dd5cadf975ead8a37931ee4809879af28ada6d8d2a0d6a71243ec1fe17c1c4f3f20580ce24e13b750007a2144c8bb184eb726ad0877e85198 WHIRLPOOL c4b9034f5d60c8a1f67fe5a53f8fa36c3ffd8c2776eff655e0a62065bc3e33394f765e25fa4a081aba06b61f56abbf4e652796955711b119d0fc5c902965ab4a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlHC33UACgkQknrdDGLu8JDmvAD/TZpE5oLGwDzM6P6i+hQOIidw
-bRSSta/KXTu8V63GqwoA/iLX08FnMm2X3TWm2bmhaBDhSacRWCbOqxGC0qmGoLQn
-=8QHr
+iF4EAREIAAYFAlHC5sAACgkQknrdDGLu8JB2bwD+OeGj+UvtEaX/9kQv+tw7zsab
+wEUNrtogV9fBfTk/dnQA/3fjur2gVUtXKKqZBOX7kSX7flwobkdJKHSoRE0eoKea
+=38sF
 -----END PGP SIGNATURE-----
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[@]}"
 }