Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_157616135560620"
MIME-Version: 1.0
Date: Thu, 12 Dec 2019 14:35:55 +0000
From: "Leonardo Taccari" <leot@netbsd.org>
Subject: CVS commit: pkgsrc/print/mupdf
To: pkgsrc-changes@NetBSD.org
Reply-To: leot@netbsd.org
Message-Id: <20191212143555.D986BFA97@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_157616135560620
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	leot
Date:		Thu Dec 12 14:35:55 UTC 2019

Modified Files:
	pkgsrc/print/mupdf: Makefile distinfo
Added Files:
	pkgsrc/print/mupdf/patches: patch-platform_x11_pdfapp.c

Log Message:
mupdf: Fix pressing ` ' (space) on second to last page

When ` ' (space) was pressed on second to last page it did not advanced to the
next page as it should.

PKGREVISION++


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 pkgsrc/print/mupdf/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/print/mupdf/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/print/mupdf/patches/patch-platform_x11_pdfapp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_157616135560620
Content-Disposition: inline
Content-Length: 2538
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/print/mupdf/Makefile
diff -u pkgsrc/print/mupdf/Makefile:1.73 pkgsrc/print/mupdf/Makefile:1.74
--- pkgsrc/print/mupdf/Makefile:1.73	Mon Sep 23 12:17:04 2019
+++ pkgsrc/print/mupdf/Makefile	Thu Dec 12 14:35:55 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.73 2019/09/23 12:17:04 nia Exp $
+# $NetBSD: Makefile,v 1.74 2019/12/12 14:35:55 leot Exp $
 
 DISTNAME=	mupdf-1.16.1-source
 PKGNAME=	${DISTNAME:S/-source//}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	https://mupdf.com/downloads/archive/
 

Index: pkgsrc/print/mupdf/distinfo
diff -u pkgsrc/print/mupdf/distinfo:1.49 pkgsrc/print/mupdf/distinfo:1.50
--- pkgsrc/print/mupdf/distinfo:1.49	Mon Sep 23 12:17:04 2019
+++ pkgsrc/print/mupdf/distinfo	Thu Dec 12 14:35:55 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.49 2019/09/23 12:17:04 nia Exp $
+$NetBSD: distinfo,v 1.50 2019/12/12 14:35:55 leot Exp $
 
 SHA1 (mupdf-1.16.1-source.tar.gz) = ccbef63c3d43d6a866b7978db5674dc4b1719f0f
 RMD160 (mupdf-1.16.1-source.tar.gz) = 4787d4699504cab9e3fee9884f1faaa410f805c9
@@ -10,5 +10,6 @@ SHA1 (patch-ac) = 97442b78e52e57b783d937
 SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
 SHA1 (patch-platform_gl_gl-app.h) = 09064acf631f5e850cd65cb51ab5315485fb4200
 SHA1 (patch-platform_gl_gl-main.c) = edff1aa77c4d6af59b2eca442340606a0bae9970
+SHA1 (patch-platform_x11_pdfapp.c) = e731d1d99d21ecdfd6172d7b5ed5ba1be2ef6a75
 SHA1 (patch-source_fitz_load-jpx.c) = 161d21bca13bb57db37807aec844c85dc5b34157
 SHA1 (patch-thirdparty_mujs_Makefile) = 833e44f4e23d2a6ff61e6276feede4892feeb9bb

Added files:

Index: pkgsrc/print/mupdf/patches/patch-platform_x11_pdfapp.c
diff -u /dev/null pkgsrc/print/mupdf/patches/patch-platform_x11_pdfapp.c:1.1
--- /dev/null	Thu Dec 12 14:35:55 2019
+++ pkgsrc/print/mupdf/patches/patch-platform_x11_pdfapp.c	Thu Dec 12 14:35:55 2019
@@ -0,0 +1,20 @@
+$NetBSD: patch-platform_x11_pdfapp.c,v 1.1 2019/12/12 14:35:55 leot Exp $
+
+Fix ` ' on the last page.
+
+When ` ' (space) is pressed on the second to last page it doesn't
+go to the last page.  Adjust the check to DTRT.
+
+Also fixed upstream via commit 606fcf8383943d7f986d6706f1cb67fbdab0e224.
+
+--- platform/x11/pdfapp.c.orig	2019-08-02 14:49:26.000000000 +0000
++++ platform/x11/pdfapp.c
+@@ -1503,7 +1503,7 @@ void pdfapp_onkey(pdfapp_t *app, int c, 
+ 		{
+ 			if (app->imgw + app->panx <= app->winw)
+ 			{
+-				if (app->pageno + 1 < app->pagecount)
++				if (app->pageno + 1 <= app->pagecount)
+ 				{
+ 					app->panx = 0;
+ 					app->pany = 0;


--_----------=_157616135560620--