diff options
| -rw-r--r-- | office/zathura-pdf-mupdf/mupdf19.diff | 131 | ||||
| -rw-r--r-- | office/zathura-pdf-mupdf/zathura-pdf-mupdf.SlackBuild | 6 | ||||
| -rw-r--r-- | office/zathura-pdf-mupdf/zathura-pdf-mupdf.info | 6 |
3 files changed, 139 insertions, 4 deletions
diff --git a/office/zathura-pdf-mupdf/mupdf19.diff b/office/zathura-pdf-mupdf/mupdf19.diff new file mode 100644 index 0000000000..83437093f9 --- /dev/null +++ b/office/zathura-pdf-mupdf/mupdf19.diff @@ -0,0 +1,131 @@ +diff --git a/AUTHORS b/AUTHORS +index f5f8430..371ebf1 100644 +--- a/AUTHORS ++++ b/AUTHORS +@@ -5,5 +5,6 @@ Sebastian Ramacher <s.ramacher@gmx.at> + + Other contributors are (in alphabetical order): + ++Christian Hesse <mail@eworm.de> + Pavel Borzenkov <pavel.borzenkov@gmail.com> + William Skeith <wes@cs.ccny.cuny.edu> +diff --git a/config.mk b/config.mk +index cba8d40..6407ae6 100644 +--- a/config.mk ++++ b/config.mk +@@ -32,7 +32,7 @@ endif + OPENSSL_INC ?= $(shell pkg-config --cflags libcrypto) + OPENSSL_LIB ?= $(shell pkg-config --libs libcrypto) + +-MUPDF_LIB ?= -lmupdf -lmujs ++MUPDF_LIB ?= -lmupdf -lmupdfthird + + INCS = ${GTK_INC} ${GIRARA_INC} ${OPENSSL_INC} ${ZATHURA_INC} + LIBS = ${GTK_LIB} ${GIRARA_LIB} ${MUPDF_LIB} ${OPENSSL_LIB} -ljbig2dec -lopenjp2 -ljpeg +diff --git a/document.c b/document.c +index 873866c..548f4ff 100644 +--- a/document.c ++++ b/document.c +@@ -109,12 +109,12 @@ pdf_document_save_as(zathura_document_t* document, mupdf_document_t* + } + + fz_try (mupdf_document->ctx) { +- /* fz_write_document claims to accepts NULL as third argument but doesn't. ++ /* pdf_save_document claims to accepts NULL as third argument but doesn't. + * pdf_write_document does not check if the third arguments is NULL for some + * options. */ + +- fz_write_options opts = { 0 }; /* just use the default options */ +- fz_write_document(mupdf_document->ctx, mupdf_document->document, (char*) path, &opts); ++ pdf_write_options opts = { 0 }; /* just use the default options */ ++ pdf_save_document(mupdf_document->ctx, (pdf_document*) mupdf_document->document, (char*) path, &opts); + } fz_catch (mupdf_document->ctx) { + return ZATHURA_ERROR_UNKNOWN; + } +diff --git a/image.c b/image.c +index 97d4143..8f6912b 100644 +--- a/image.c ++++ b/image.c +@@ -93,7 +93,7 @@ pdf_page_image_get_cairo(zathura_page_t* page, mupdf_page_t* mupdf_page, + fz_pixmap* pixmap = NULL; + cairo_surface_t* surface = NULL; + +- pixmap = fz_new_pixmap_from_image(mupdf_page->ctx, mupdf_image, 0, 0); ++ pixmap = fz_get_pixmap_from_image(mupdf_page->ctx, mupdf_image, 0, 0); + if (pixmap == NULL) { + goto error_free; + } +diff --git a/page.c b/page.c +index beb0351..219fc2a 100644 +--- a/page.c ++++ b/page.c +@@ -43,12 +43,12 @@ pdf_page_init(zathura_page_t* page) + /* setup text */ + mupdf_page->extracted_text = false; + +- mupdf_page->text = fz_new_text_page(mupdf_page->ctx); ++ mupdf_page->text = fz_new_stext_page(mupdf_page->ctx); + if (mupdf_page->text == NULL) { + goto error_free; + } + +- mupdf_page->sheet = fz_new_text_sheet(mupdf_page->ctx); ++ mupdf_page->sheet = fz_new_stext_sheet(mupdf_page->ctx); + if (mupdf_page->sheet == NULL) { + goto error_free; + } +@@ -74,11 +74,11 @@ pdf_page_clear(zathura_page_t* page, mupdf_page_t* mupdf_page) + + if (mupdf_page != NULL) { + if (mupdf_page->text != NULL) { +- fz_drop_text_page(mupdf_page->ctx, mupdf_page->text); ++ fz_drop_stext_page(mupdf_page->ctx, mupdf_page->text); + } + + if (mupdf_page->sheet != NULL) { +- fz_drop_text_sheet(mupdf_page->ctx, mupdf_page->sheet); ++ fz_drop_stext_sheet(mupdf_page->ctx, mupdf_page->sheet); + } + + if (mupdf_page->page != NULL) { +diff --git a/plugin.h b/plugin.h +index f2fb4a0..84c5e53 100644 +--- a/plugin.h ++++ b/plugin.h +@@ -21,8 +21,8 @@ typedef struct mupdf_page_s + { + fz_page* page; /**< Reference to the mupdf page */ + fz_context* ctx; /**< Context */ +- fz_text_sheet* sheet; /**< Text sheet */ +- fz_text_page* text; /**< Page text */ ++ fz_stext_sheet* sheet; /**< Text sheet */ ++ fz_stext_page* text; /**< Page text */ + fz_rect bbox; /**< Bbox */ + bool extracted_text; /**< If text has already been extracted */ + } mupdf_page_t; +diff --git a/search.c b/search.c +index 3a9fad4..c672b9f 100644 +--- a/search.c ++++ b/search.c +@@ -40,7 +40,7 @@ pdf_page_search_text(zathura_page_t* page, mupdf_page_t* mupdf_page, const char* + } + + fz_rect* hit_bbox = fz_malloc_array(mupdf_page->ctx, N_SEARCH_RESULTS, sizeof(fz_rect)); +- int num_results = fz_search_text_page(mupdf_page->ctx, mupdf_page->text, ++ int num_results = fz_search_stext_page(mupdf_page->ctx, mupdf_page->text, + (char*) text, hit_bbox, N_SEARCH_RESULTS); + + for (int i = 0; i < num_results; i++) { +diff --git a/utils.c b/utils.c +index 4a003b9..a4b9320 100644 +--- a/utils.c ++++ b/utils.c +@@ -14,7 +14,7 @@ mupdf_page_extract_text(mupdf_document_t* mupdf_document, mupdf_page_t* mupdf_pa + fz_device* text_device = NULL; + + fz_try (mupdf_page->ctx) { +- text_device = fz_new_text_device(mupdf_page->ctx, mupdf_page->sheet, mupdf_page->text); ++ text_device = fz_new_stext_device(mupdf_page->ctx, mupdf_page->sheet, mupdf_page->text); + + /* Disable FZ_IGNORE_IMAGE to collect image blocks */ + fz_disable_device_hints(mupdf_page->ctx, text_device, FZ_IGNORE_IMAGE); diff --git a/office/zathura-pdf-mupdf/zathura-pdf-mupdf.SlackBuild b/office/zathura-pdf-mupdf/zathura-pdf-mupdf.SlackBuild index ca9b6c940f..449aa3849c 100644 --- a/office/zathura-pdf-mupdf/zathura-pdf-mupdf.SlackBuild +++ b/office/zathura-pdf-mupdf/zathura-pdf-mupdf.SlackBuild @@ -7,7 +7,7 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. PRGNAM=zathura-pdf-mupdf -VERSION=${VERSION:-0.2.8} +VERSION=${VERSION:-0.3.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -56,6 +56,10 @@ find -L . \ # Upstream left the README out of the release tarball for some reason. cat $CWD/upstream.README > README +# Patch for mupdf-1.9 API changes, from upstream's git: +# https://git.pwmt.org/pwmt/zathura-pdf-mupdf/commit/e3e49d206fbe5761c53a85b9499c940a0d718c8a +patch -p1 < $CWD/mupdf19.diff + # mupdf 1.4 and later no longer have libmupdf-js-none (moved to libmupdf). # Anyway it's better to use pkg-config now that mupdf supports it. sed -i \ diff --git a/office/zathura-pdf-mupdf/zathura-pdf-mupdf.info b/office/zathura-pdf-mupdf/zathura-pdf-mupdf.info index a516e5f7b8..ec46620c47 100644 --- a/office/zathura-pdf-mupdf/zathura-pdf-mupdf.info +++ b/office/zathura-pdf-mupdf/zathura-pdf-mupdf.info @@ -1,8 +1,8 @@ PRGNAM="zathura-pdf-mupdf" -VERSION="0.2.8" +VERSION="0.3.0" HOMEPAGE="https://www.pwmt.org/projects/zathura-pdf-mupdf/" -DOWNLOAD="http://www.pwmt.org/projects/zathura/plugins/download/zathura-pdf-mupdf-0.2.8.tar.gz" -MD5SUM="b0bf109c536bf1da131c38861cebb7e6" +DOWNLOAD="http://www.pwmt.org/projects/zathura/plugins/download/zathura-pdf-mupdf-0.3.0.tar.gz" +MD5SUM="523781d0adb8f4ddd93fc3bb6faf6e43" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="mupdf zathura" |