From a90098f3c09fe4c8800ee27f7c396b3ba516f500 Mon Sep 17 00:00:00 2001 From: lemmi Date: Thu, 12 Jan 2017 15:52:36 +0100 Subject: [PATCH 1/7] girara: update to 0.2.7. --- srcpkgs/girara/patches/font-gtk3.21.patch | 157 ---------------------- srcpkgs/girara/template | 6 +- 2 files changed, 3 insertions(+), 160 deletions(-) delete mode 100644 srcpkgs/girara/patches/font-gtk3.21.patch diff --git a/srcpkgs/girara/patches/font-gtk3.21.patch b/srcpkgs/girara/patches/font-gtk3.21.patch deleted file mode 100644 index 37dced585b8..00000000000 --- a/srcpkgs/girara/patches/font-gtk3.21.patch +++ /dev/null @@ -1,157 +0,0 @@ -Decription: Fix font handling for Gtk+ >= 3.21 -Origin: upstream - ---- data/girara-post-3.20.css_t -+++ data/girara-post-3.20.css_t -@@ -9,7 +9,9 @@ - color: @default-fg@; - background-color: @default-bg@; - background-image: none; -- font: @font@; -+ font-family: @font-family@; -+ font-size: @font-size@; -+ font-weight: @font-weight@; - } - - /* Inputbar */ ---- girara/config.c -+++ girara/config.c -@@ -50,8 +50,7 @@ - { - g_return_if_fail(session != NULL && value != NULL); - -- girara_template_set_variable_value(session->private_data->csstemplate, "font", -- value); -+ css_template_fill_font(session->private_data->csstemplate, value); - } - - static void ---- girara/internal.h -+++ girara/internal.h -@@ -148,6 +148,8 @@ - HIDDEN bool girara_sc_feedkeys(girara_session_t* session, girara_argument_t* argument, - girara_event_t* event, unsigned int t); - -+HIDDEN void css_template_fill_font(GiraraTemplate* csstemplate, const char* font); -+ - /** - * Structure of a command - */ ---- girara/session.c -+++ girara/session.c -@@ -44,7 +44,6 @@ - { - static const char* variable_names[] = { - "session", -- "font", - "default-fg", - "default-bg", - "inputbar-fg", -@@ -78,6 +77,88 @@ - for (size_t idx = 0; idx < LENGTH(variable_names); ++idx) { - girara_template_add_variable(csstemplate, variable_names[idx]); - } -+ -+ if (gtk_check_version(3, 20, 0) == NULL) { -+ girara_template_add_variable(csstemplate, "font-family"); -+ girara_template_add_variable(csstemplate, "font-size"); -+ girara_template_add_variable(csstemplate, "font-weight"); -+ } else { -+ girara_template_add_variable(csstemplate, "font"); -+ } -+} -+ -+void -+css_template_fill_font(GiraraTemplate* csstemplate, const char* font) -+{ -+ if (gtk_check_version(3, 20, 0) != NULL) { -+ girara_template_set_variable_value(csstemplate, "font", font); -+ return; -+ } -+ -+ PangoFontDescription* descr = pango_font_description_from_string(font); -+ if (descr == NULL) { -+ return; -+ } -+ -+ girara_template_set_variable_value(csstemplate, "font-family", -+ pango_font_description_get_family(descr)); -+ -+ char* size = g_strdup_printf("%d%s", pango_font_description_get_size(descr) / PANGO_SCALE, -+ pango_font_description_get_size_is_absolute(descr) == FALSE ? "pt" : ""); -+ girara_template_set_variable_value(csstemplate, "font-size", size); -+ g_free(size); -+ -+ switch (pango_font_description_get_weight(descr)) { -+ case PANGO_WEIGHT_THIN: -+ girara_template_set_variable_value(csstemplate, "font-weight", "thin"); -+ break; -+ -+ case PANGO_WEIGHT_ULTRALIGHT: -+ girara_template_set_variable_value(csstemplate, "font-weight", "ultralight"); -+ break; -+ -+ case PANGO_WEIGHT_SEMILIGHT: -+ girara_template_set_variable_value(csstemplate, "font-weight", "light"); -+ break; -+ -+ case PANGO_WEIGHT_LIGHT: -+ girara_template_set_variable_value(csstemplate, "font-weight", "light"); -+ break; -+ -+ case PANGO_WEIGHT_BOOK: -+ girara_template_set_variable_value(csstemplate, "font-weight", "book"); -+ break; -+ -+ case PANGO_WEIGHT_MEDIUM: -+ girara_template_set_variable_value(csstemplate, "font-weight", "medium"); -+ break; -+ -+ case PANGO_WEIGHT_SEMIBOLD: -+ girara_template_set_variable_value(csstemplate, "font-weight", "semibold"); -+ break; -+ -+ case PANGO_WEIGHT_BOLD: -+ girara_template_set_variable_value(csstemplate, "font-weight", "bold"); -+ break; -+ -+ case PANGO_WEIGHT_ULTRABOLD: -+ girara_template_set_variable_value(csstemplate, "font-weight", "ultrabold"); -+ break; -+ -+ case PANGO_WEIGHT_HEAVY: -+ girara_template_set_variable_value(csstemplate, "font-weight", "heavy"); -+ break; -+ -+ case PANGO_WEIGHT_ULTRAHEAVY: -+ girara_template_set_variable_value(csstemplate, "font-weight", "ultraheavy"); -+ break; -+ -+ default: -+ girara_template_set_variable_value(csstemplate, "font-weight", "normal"); -+ break; -+ } -+ -+ pango_font_description_free(descr); - } - - static void -@@ -91,10 +172,16 @@ - char* font = NULL; - girara_setting_get(session, "font", &font); - if (font != NULL) { -- girara_template_set_variable_value(csstemplate, "font", font); -+ css_template_fill_font(csstemplate, font); - g_free(font); - } else { -- girara_template_set_variable_value(csstemplate, "font", "monospace normal 9"); -+ if (gtk_check_version(3, 20, 0) == NULL) { -+ girara_template_set_variable_value(csstemplate, "font-family", "monospace"); -+ girara_template_set_variable_value(csstemplate, "font-size", "9pt"); -+ girara_template_set_variable_value(csstemplate, "font-weight", "normal"); -+ } else { -+ girara_template_set_variable_value(csstemplate, "font", "monospace normal 9"); -+ } - }; - - /* parse color values */ diff --git a/srcpkgs/girara/template b/srcpkgs/girara/template index 642f6966112..0ffc6470552 100644 --- a/srcpkgs/girara/template +++ b/srcpkgs/girara/template @@ -1,7 +1,7 @@ # Template file for 'girara' pkgname=girara -version=0.2.6 -revision=2 +version=0.2.7 +revision=1 build_style=gnu-makefile # COLOR=0 to avoid "tput not found" spam in the build output make_build_args="COLOR=0" @@ -13,7 +13,7 @@ license="zlib" homepage="http://pwmt.org/projects/girara/" short_desc="A library implementing a user interface that focuses on minimalism" distfiles="http://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.gz" -checksum=eba69b3522b4d149e06d133de52877913275873c505993fad08b6d7884ec9a0f +checksum=98e6a343298ae46869c990bc6e0732555e19af2e386cdc1a911f109b1c5c32e5 pre_build() { sed -i 's/^\(CFLAGS *+=\)/override \1/' config.mk From 9f509bfa75dac4ef89afe76024e13304c7e8db50 Mon Sep 17 00:00:00 2001 From: lemmi Date: Thu, 12 Jan 2017 15:53:27 +0100 Subject: [PATCH 2/7] zathura: update to 0.3.7. --- srcpkgs/zathura/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zathura/template b/srcpkgs/zathura/template index 5fb23052686..28cf831916a 100644 --- a/srcpkgs/zathura/template +++ b/srcpkgs/zathura/template @@ -1,6 +1,6 @@ # Template file for 'zathura' pkgname=zathura -version=0.3.6 +version=0.3.7 revision=1 build_style=gnu-makefile # COLOR=0 to avoid "tput not found" spam in the build output @@ -13,7 +13,7 @@ license="zlib" homepage="http://pwmt.org/projects/zathura/installation/" short_desc="A highly customizable and functional document viewer" distfiles="http://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.gz" -checksum=086a8be25d538fc6539fbee8f01ecf16d25819dfaad50cd2dbd84e30152ccb3b +checksum=22afff89f4093f22fb82188417ff9bfa9695b19a4fe894dca05b7c821b390ff0 pre_build() { sed -i 's/^\(CFLAGS *+=\)/override \1/' config.mk From 270bd3380ee41fe8a162d6d84e82069e5a82420d Mon Sep 17 00:00:00 2001 From: lemmi Date: Thu, 12 Jan 2017 15:55:28 +0100 Subject: [PATCH 3/7] zathura-ps: update to 0.2.4. --- srcpkgs/zathura-ps/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template index 267ce5f9ae9..97c26709fb5 100644 --- a/srcpkgs/zathura-ps/template +++ b/srcpkgs/zathura-ps/template @@ -1,6 +1,6 @@ # Template file for 'zathura-ps' pkgname=zathura-ps -version=0.2.3 +version=0.2.4 revision=1 build_style=gnu-makefile maintainer="lemmi " @@ -10,7 +10,7 @@ license="zlib" homepage="http://pwmt.org/projects/zathura-ps/" short_desc="PostScript support for zathura" distfiles="http://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.gz" -checksum=a9eef74b12aec87ac2c4309f12d0f9c83b228fe64a788ee46b2c3a7c91779aa3 +checksum=fb9fc7e9e7765fb0aa2935b93ff3663332d0d884df35e8d0b1ea7e4b1fa0abdb pre_build() { sed -i 's/^\(CFLAGS *+=\)/override \1/' config.mk From f39c3bfe143966285429937291d07ef2f309c415 Mon Sep 17 00:00:00 2001 From: lemmi Date: Thu, 12 Jan 2017 15:56:04 +0100 Subject: [PATCH 4/7] zathura-cb: update to 0.1.6. --- srcpkgs/zathura-cb/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zathura-cb/template b/srcpkgs/zathura-cb/template index 2b421af05fc..34fb8f0e1c3 100644 --- a/srcpkgs/zathura-cb/template +++ b/srcpkgs/zathura-cb/template @@ -1,6 +1,6 @@ # Template file for 'zathura-cb' pkgname=zathura-cb -version=0.1.5 +version=0.1.6 revision=1 build_style=gnu-makefile maintainer="lemmi " @@ -10,7 +10,7 @@ license="zlib" homepage="http://pwmt.org/projects/zathura-cb/" short_desc="Comic book support for zathura" distfiles="http://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.gz" -checksum=375f6912bd79648603bad51c3635ce28eaca7bf4df521c00ff9673d9b4ff6afd +checksum=888e95421e13b944d19604fab129e5992636f404e7ed20751d4f50546f2535ba pre_build() { sed -i 's/^\(CFLAGS *+=\)/override \1/' config.mk From a47e5195f3ac6485261ac4580474dee2da46f786 Mon Sep 17 00:00:00 2001 From: lemmi Date: Thu, 12 Jan 2017 15:56:39 +0100 Subject: [PATCH 5/7] zathura-djvu: update to 0.2.6. --- srcpkgs/zathura-djvu/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zathura-djvu/template b/srcpkgs/zathura-djvu/template index 01d275a03c1..f2fd88d1060 100644 --- a/srcpkgs/zathura-djvu/template +++ b/srcpkgs/zathura-djvu/template @@ -1,6 +1,6 @@ # Template file for 'zathura-djvu' pkgname=zathura-djvu -version=0.2.5 +version=0.2.6 revision=1 build_style=gnu-makefile maintainer="lemmi " @@ -10,7 +10,7 @@ license="zlib" homepage="http://pwmt.org/projects/zathura-djvu/" short_desc="DjVu support for zathura" distfiles="http://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.gz" -checksum=08b7110af13e17a9d221bd7a0f7d3b479b3e31631d78bc6c5efb46271a299c0d +checksum=aefef6a3b702fa06145f16f2559490f4d96d3206bafd4e0c78ac184788cac05f pre_build() { sed -i 's/^\(CFLAGS *+=\)/override \1/' config.mk From 038472f2f808a9468179814408f4a3224dc204ee Mon Sep 17 00:00:00 2001 From: lemmi Date: Thu, 12 Jan 2017 15:57:48 +0100 Subject: [PATCH 6/7] zathura-pdf-poppler: update to 0.2.7. --- srcpkgs/zathura-pdf-poppler/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/zathura-pdf-poppler/template b/srcpkgs/zathura-pdf-poppler/template index e7561a9ecd7..69d82ac6f98 100644 --- a/srcpkgs/zathura-pdf-poppler/template +++ b/srcpkgs/zathura-pdf-poppler/template @@ -1,7 +1,7 @@ # Template file for 'zathura-pdf-poppler' pkgname=zathura-pdf-poppler -version=0.2.6 -revision=2 +version=0.2.7 +revision=1 build_style=gnu-makefile maintainer="lemmi " hostmakedepends="pkg-config" @@ -11,7 +11,7 @@ license="zlib" homepage="http://pwmt.org/projects/zathura-pdf-poppler/" short_desc="PDF support for zathura (using poppler)" distfiles="http://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.gz" -checksum=d1eb0c7a4f647c141192a2d7bf66413b9c5f1842463947ab87a8a1edcf8e58d5 +checksum=985e4e4dce6143fdfd246e78b0ccbef0d32b8809c6a4f08bb53a2f7dfbd383c0 pre_build() { sed -i 's/^\(CFLAGS *+=\)/override \1/' config.mk From b3fe7e7255bb6d2da181148f423a831a32663ad6 Mon Sep 17 00:00:00 2001 From: lemmi Date: Thu, 12 Jan 2017 16:00:25 +0100 Subject: [PATCH 7/7] zathura-pdf-mupdf: update to 0.3.1. --- .../patches/mupdf-1.10.patch | 313 ------------------ srcpkgs/zathura-pdf-mupdf/template | 6 +- 2 files changed, 3 insertions(+), 316 deletions(-) delete mode 100644 srcpkgs/zathura-pdf-mupdf/patches/mupdf-1.10.patch diff --git a/srcpkgs/zathura-pdf-mupdf/patches/mupdf-1.10.patch b/srcpkgs/zathura-pdf-mupdf/patches/mupdf-1.10.patch deleted file mode 100644 index 5dd47b2efa9..00000000000 --- a/srcpkgs/zathura-pdf-mupdf/patches/mupdf-1.10.patch +++ /dev/null @@ -1,313 +0,0 @@ -From NetBSD. -http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/print/zathura-pdf-mupdf/patches/ - ---- document.c.orig 2016-02-14 22:49:46.000000000 +0000 -+++ document.c -@@ -3,10 +3,9 @@ - #define _POSIX_C_SOURCE 1 - - #include --#include - #include - --#include -+#include - - #include "plugin.h" - -@@ -109,12 +108,7 @@ pdf_document_save_as(zathura_document_t* - } - - fz_try (mupdf_document->ctx) { -- /* fz_write_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_save_document(mupdf_document->ctx, pdf_specifics(mupdf_document->ctx, mupdf_document->document), (char*) path, NULL); - } fz_catch (mupdf_document->ctx) { - return ZATHURA_ERROR_UNKNOWN; - } ---- image.c.orig 2016-02-14 22:49:46.000000000 +0000 -+++ image.c -@@ -93,7 +93,7 @@ pdf_page_image_get_cairo(zathura_page_t* - 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, NULL, NULL, NULL, NULL); - if (pixmap == NULL) { - goto error_free; - } ---- index.c.orig 2016-02-14 22:49:46.000000000 +0000 -+++ index.c -@@ -6,7 +6,7 @@ - - #include "plugin.h" - --static void build_index(fz_outline* outline, girara_tree_node_t* root); -+static void build_index(mupdf_document_t* mupdf_document, fz_outline* outline, girara_tree_node_t* root); - - girara_tree_node_t* - pdf_document_index_generate(zathura_document_t* document, mupdf_document_t* mupdf_document, zathura_error_t* error) -@@ -29,7 +29,7 @@ pdf_document_index_generate(zathura_docu - - /* generate index */ - girara_tree_node_t* root = girara_node_new(zathura_index_element_new("ROOT")); -- build_index(outline, root); -+ build_index(mupdf_document, outline, root); - - /* free outline */ - fz_drop_outline(mupdf_document->ctx, outline); -@@ -38,7 +38,7 @@ pdf_document_index_generate(zathura_docu - } - - static void --build_index(fz_outline* outline, girara_tree_node_t* root) -+build_index(mupdf_document_t* mupdf_document, fz_outline* outline, girara_tree_node_t* root) - { - if (outline == NULL || root == NULL) { - return; -@@ -50,49 +50,24 @@ build_index(fz_outline* outline, girara_ - zathura_link_type_t type = ZATHURA_LINK_INVALID; - zathura_rectangle_t rect = { .x1 = 0, .y1 = 0, .x2 = 0, .y2 = 0 }; - -- switch (outline->dest.kind) { -- case FZ_LINK_NONE: -- type = ZATHURA_LINK_NONE; -- break; -- case FZ_LINK_URI: -+ if (fz_is_external_link(mupdf_document->ctx, outline->uri)) { - type = ZATHURA_LINK_URI; -- target.value = outline->dest.ld.uri.uri; -- break; -- case FZ_LINK_GOTO: -+ target.value = outline->uri; -+ } else if (outline->uri) { -+ float tx, ty; -+ tx = 0.0; -+ ty = 0.0; - type = ZATHURA_LINK_GOTO_DEST; -- target.page_number = outline->dest.ld.gotor.page; -+ target.page_number = 0; - target.destination_type = ZATHURA_LINK_DESTINATION_XYZ; -- target.left = 0; -- target.top = 0; -+ target.left = 0.0; -+ target.top = 0.0; - target.scale = 0.0; -- { -- int gflags = outline->dest.ld.gotor.flags; -- if (gflags & fz_link_flag_l_valid) { -- target.left = outline->dest.ld.gotor.lt.x; -- } -- if (gflags & fz_link_flag_t_valid) { -- target.top = outline->dest.ld.gotor.lt.y; -- } -- /* if (gflags & fz_link_flag_r_is_zoom) { */ -- /* target.scale = outline->dest.ld.gotor.rb.x; */ -- /* } */ -- } -- break; -- case FZ_LINK_LAUNCH: -- type = ZATHURA_LINK_LAUNCH; -- target.value = outline->dest.ld.launch.file_spec; -- break; -- case FZ_LINK_NAMED: -- type = ZATHURA_LINK_NAMED; -- target.value = outline->dest.ld.named.named; -- break; -- case FZ_LINK_GOTOR: -- type = ZATHURA_LINK_GOTO_REMOTE; -- target.value = outline->dest.ld.gotor.file_spec; -- break; -- default: -- outline = outline->next; // TODO: Don't skip unknown type -- continue; -+ target.page_number = fz_resolve_link(mupdf_document->ctx, mupdf_document->document, outline->uri, &tx, &ty); -+ target.left = tx; -+ target.top = ty; -+ } else { -+ type = ZATHURA_LINK_NONE; - } - - index_element->link = zathura_link_new(type, rect, target); -@@ -104,7 +79,7 @@ build_index(fz_outline* outline, girara_ - girara_tree_node_t* node = girara_node_append_data(root, index_element); - - if (outline->down != NULL) { -- build_index(outline->down, node); -+ build_index(mupdf_document, outline->down, node); - } - - outline = outline->next; ---- links.c.orig 2016-02-14 22:49:46.000000000 +0000 -+++ links.c -@@ -44,48 +44,22 @@ pdf_page_links_get(zathura_page_t* page, - zathura_link_target_t target = { 0 }; - - char* buffer = NULL; -- switch (link->dest.kind) { -- case FZ_LINK_NONE: -- type = ZATHURA_LINK_NONE; -- break; -- case FZ_LINK_URI: -+ if (fz_is_external_link(mupdf_document->ctx, link->uri)) { - type = ZATHURA_LINK_URI; -- target.value = link->dest.ld.uri.uri; -- break; -- case FZ_LINK_GOTO: -+ target.value = link->uri; -+ } else { -+ float tx, ty; -+ tx = 0.0; -+ ty = 0.0; - type = ZATHURA_LINK_GOTO_DEST; -- target.page_number = link->dest.ld.gotor.page; -+ target.page_number = 0; - target.destination_type = ZATHURA_LINK_DESTINATION_XYZ; -- target.left = 0; -- target.top = 0; -+ target.left = 0.0; -+ target.top = 0.0; - target.scale = 0.0; -- { -- int gflags = link->dest.ld.gotor.flags; -- if (gflags & fz_link_flag_l_valid) { -- target.left = link->dest.ld.gotor.lt.x; -- } -- if (gflags & fz_link_flag_t_valid) { -- target.top = link->dest.ld.gotor.lt.y; -- } -- /* if (gflags & fz_link_flag_r_is_zoom) { */ -- /* target.scale = link->dest.ld.gotor.rb.x; */ -- /* } */ -- } -- break; -- case FZ_LINK_LAUNCH: -- type = ZATHURA_LINK_LAUNCH; -- target.value = link->dest.ld.launch.file_spec; -- break; -- case FZ_LINK_NAMED: -- type = ZATHURA_LINK_NAMED; -- target.value = link->dest.ld.named.named; -- break; -- case FZ_LINK_GOTOR: -- type = ZATHURA_LINK_GOTO_REMOTE; -- target.value = link->dest.ld.gotor.file_spec; -- break; -- default: -- continue; -+ target.page_number = fz_resolve_link(mupdf_document->ctx, mupdf_document->document, link->uri, &tx, &ty); -+ target.left = tx; -+ target.top = ty; - } - - zathura_link_t* zathura_link = zathura_link_new(type, position, target); ---- page.c.orig 2016-02-14 22:49:46.000000000 +0000 -+++ page.c -@@ -43,12 +43,13 @@ pdf_page_init(zathura_page_t* page) - /* setup text */ - mupdf_page->extracted_text = false; - -- mupdf_page->text = fz_new_text_page(mupdf_page->ctx); -+ fz_rect rect; -+ mupdf_page->text = fz_new_stext_page(mupdf_page->ctx, &rect); - 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 +75,11 @@ pdf_page_clear(zathura_page_t* page, mup - - 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) { ---- plugin.h.orig 2016-02-14 22:49:46.000000000 +0000 -+++ 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; ---- render.c.orig 2016-02-14 22:49:46.000000000 +0000 -+++ render.c -@@ -20,7 +20,10 @@ pdf_page_render_to_buffer(mupdf_document - return ZATHURA_ERROR_UNKNOWN; - } - -- fz_display_list* display_list = fz_new_display_list(mupdf_page->ctx); -+ fz_irect irect = { .x1 = page_width, .y1 = page_height }; -+ fz_rect rect = { .x1 = page_width, .y1 = page_height }; -+ -+ fz_display_list* display_list = fz_new_display_list(mupdf_page->ctx, &rect); - fz_device* device = fz_new_list_device(mupdf_page->ctx, display_list); - - fz_try (mupdf_document->ctx) { -@@ -33,14 +36,11 @@ pdf_page_render_to_buffer(mupdf_document - - fz_drop_device(mupdf_page->ctx, device); - -- fz_irect irect = { .x1 = page_width, .y1 = page_height }; -- fz_rect rect = { .x1 = page_width, .y1 = page_height }; -- - fz_colorspace* colorspace = fz_device_bgr(mupdf_document->ctx); -- fz_pixmap* pixmap = fz_new_pixmap_with_bbox_and_data(mupdf_page->ctx, colorspace, &irect, image); -+ fz_pixmap* pixmap = fz_new_pixmap_with_bbox_and_data(mupdf_page->ctx, colorspace, &irect, 1, image); - fz_clear_pixmap_with_value(mupdf_page->ctx, pixmap, 0xFF); - -- device = fz_new_draw_device(mupdf_page->ctx, pixmap); -+ device = fz_new_draw_device(mupdf_page->ctx, NULL, pixmap); - fz_run_display_list(mupdf_page->ctx, display_list, device, &fz_identity, &rect, NULL); - fz_drop_device(mupdf_page->ctx, device); - ---- search.c.orig 2016-02-14 22:49:46.000000000 +0000 -+++ search.c -@@ -40,7 +40,7 @@ pdf_page_search_text(zathura_page_t* pag - } - - 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++) { ---- utils.c.orig 2016-02-14 22:49:46.000000000 +0000 -+++ utils.c -@@ -14,7 +14,7 @@ mupdf_page_extract_text(mupdf_document_t - 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, NULL); - - /* Disable FZ_IGNORE_IMAGE to collect image blocks */ - fz_disable_device_hints(mupdf_page->ctx, text_device, FZ_IGNORE_IMAGE); -@@ -23,6 +23,7 @@ mupdf_page_extract_text(mupdf_document_t - fz_scale(&ctm, 1.0, 1.0); - fz_run_page(mupdf_page->ctx, mupdf_page->page, text_device, &ctm, NULL); - } fz_always (mupdf_document->ctx) { -+ fz_close_device(mupdf_page->ctx, text_device); - fz_drop_device(mupdf_page->ctx, text_device); - } fz_catch(mupdf_document->ctx) { - } diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template index a8de8f524ab..3a82e40d385 100644 --- a/srcpkgs/zathura-pdf-mupdf/template +++ b/srcpkgs/zathura-pdf-mupdf/template @@ -1,7 +1,7 @@ # Template file for 'zathura-pdf-mupdf' pkgname=zathura-pdf-mupdf -version=0.3.0 -revision=5 +version=0.3.1 +revision=1 build_style=gnu-makefile make_build_args="MUPDF_LIB=-lmupdf MUPDF_LIB+=-lmujs" maintainer="lemmi " @@ -12,7 +12,7 @@ license="zlib" homepage="http://pwmt.org/projects/zathura-pdf-mupdf/" short_desc="PDF support for zathura (using mupdf)" distfiles="http://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.gz" -checksum=478cb9d1562d08e096ebec4a6db9116d616a3536260197c2a28a2772171f72c8 +checksum=d9b9edc0297b9eddb53020976f287b4e8db33edef8cfa047d70e02653eb2f81b pre_build() { sed -i 's/^\(CFLAGS *+=\)/override \1/' config.mk