From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 12 17:59:10 2015 Return-Path: Delivered-To: freebsd-ports-bugs@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5223353F for ; Tue, 12 May 2015 17:59:10 +0000 (UTC) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2001:1900:2254:206a::16:76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 211781FDC for ; Tue, 12 May 2015 17:59:10 +0000 (UTC) Received: from bugs.freebsd.org ([127.0.1.118]) by kenobi.freebsd.org (8.14.9/8.14.9) with ESMTP id t4CHx9wV012941 for ; Tue, 12 May 2015 17:59:09 GMT (envelope-from bugzilla-noreply@freebsd.org) 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 Date: Tue, 12 May 2015 17:59:10 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports & Packages X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Some People X-Bugzilla-Who: jbeich@FreeBSD.org X-Bugzilla-Status: New X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: freebsd-ports-bugs@FreeBSD.org X-Bugzilla-Target-Milestone: --- X-Bugzilla-Flags: maintainer-feedback+ X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 May 2015 17:59:10 -0000 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D200154 --- Comment #1 from Jan Beich --- 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.=