[gentoo-commits] gentoo-x86 commit in app-text/zathura-pdf-mupdf/files: zathura-pdf-mupdf-9999-mupdf-split-headers.patch zathura-pdf-mupdf-9999-mupdf-pkgconfig.patch zathura-pdf-mupdf-9999-mupdf-fz_new_text_page.patch

[gentoo-commits] gentoo-x86 commit in app-text/zathura-pdf-mupdf/files: zathura-pdf-mupdf-9999-mupdf-split-headers.patch zathura-pdf-mupdf-9999-mupdf-pkgconfig.patch zathura-pdf-mupdf-9999-mupdf-fz_new_text_page.patch

[Michael Weber (xmw)]

xmw         13/06/20 11:25:55

  Added:                zathura-pdf-mupdf-9999-mupdf-split-headers.patch
                        zathura-pdf-mupdf-9999-mupdf-pkgconfig.patch
                        zathura-pdf-mupdf-9999-mupdf-fz_new_text_page.patch
  Log:
  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)

Revision  Changes    Path
1.1                  app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-split-headers.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-split-headers.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-split-headers.patch?rev=1.1&content-type=text/plain

Index: zathura-pdf-mupdf-9999-mupdf-split-headers.patch
===================================================================
--- 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>



1.1                  app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-pkgconfig.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-pkgconfig.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-pkgconfig.patch?rev=1.1&content-type=text/plain

Index: zathura-pdf-mupdf-9999-mupdf-pkgconfig.patch
===================================================================
--- 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)



1.1                  app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-fz_new_text_page.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-fz_new_text_page.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-fz_new_text_page.patch?rev=1.1&content-type=text/plain

Index: zathura-pdf-mupdf-9999-mupdf-fz_new_text_page.patch
===================================================================
--- 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;
   }