Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 12 May 2015 17:59:10 +0000
From:      bugzilla-noreply@freebsd.org
To:        freebsd-ports-bugs@FreeBSD.org
Subject:   [Bug 200154] [maintainer patch] graphics/zathura-pdf-mupdf compatible to mupdf 1.7
Message-ID:  <bug-200154-13-NZ1IogE1EI@https.bugs.freebsd.org/bugzilla/>
In-Reply-To: <bug-200154-13@https.bugs.freebsd.org/bugzilla/>
References:  <bug-200154-13@https.bugs.freebsd.org/bugzilla/>

next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D200154

--- Comment #1 from Jan Beich <jbeich@FreeBSD.org> ---
Comment on attachment 156713
  --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D156713
patch

Having the change as a single files/patch-mupdf17 maybe better here from
maintenance POV e.g., if you later want to import more commits. Doing so is
allowed by Porter's Handbook:

  A patch may modify multiple files if the changes are related and the patc=
h is
named appropriately. For example, patch-add-missing-stdlib.h.

https://www.freebsd.org/doc/en/books/porters-handbook/slow-patch.html#slow-=
patch-rules

Ignore if you prefer flattenned changes by "make makepatch".

>+--- utils.c.orig	2015-05-12 17:02:07 UTC
>++++ utils.c
>+@@ -17,9 +17,9 @@ mupdf_page_extract_text(mupdf_document_t
>+     text_device =3D fz_new_text_device(mupdf_page->ctx, mupdf_page->shee=
t, mupdf_page->text);
>+     fz_matrix ctm;
>+     fz_scale(&ctm, 1.0, 1.0);
>+-    fz_run_page(mupdf_document->document, mupdf_page->page, text_device,=
 &ctm, NULL);
>++    fz_run_page(mupdf_document->ctx, mupdf_page->page, text_device, &ctm=
, NULL);

Why does the line differ from upstream commit? mupdf_document->ctx vs.
mupdf_page->ctx

>+   } fz_always (mupdf_document->ctx) {
>+-    fz_free_device(text_device);
>++    fz_drop_device(mupdf_page->ctx, text_device);
>+   } fz_catch(mupdf_document->ctx) {
>+   }
>+

--=20
You are receiving this mail because:
You are the assignee for the bug.=



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-200154-13-NZ1IogE1EI>