CVS commit: pkgsrc/print/mupdf

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Fri Aug 29 10:05:56 UTC 2025

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

Log Message:
mupdf: Delete FreeBSD scrolling patches

These patches actually breaks the scrolling as reported to netbsd-users@ ML
(<https://mail-index.NetBSD.org/netbsd-users/2025/07/16/msg032863.html>).

j/k should pan down/up the page in continuous movements.

PKGREVISION++


To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 pkgsrc/print/mupdf/Makefile
cvs rdiff -u -r1.78 -r1.79 pkgsrc/print/mupdf/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    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.

Modified files:

Index: pkgsrc/print/mupdf/Makefile
diff -u pkgsrc/print/mupdf/Makefile:1.130 pkgsrc/print/mupdf/Makefile:1.131
--- pkgsrc/print/mupdf/Makefile:1.130   Fri Aug 29 09:17:06 2025
+++ pkgsrc/print/mupdf/Makefile Fri Aug 29 10:05:56 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.130 2025/08/29 09:17:06 leot Exp $
+# $NetBSD: Makefile,v 1.131 2025/08/29 10:05:56 leot Exp $
 
 DISTNAME=      mupdf-1.26.7-source
 PKGNAME=       ${DISTNAME:S/-source//}
+PKGREVISION=   1
 CATEGORIES=    print
 MASTER_SITES=  https://mupdf.com/downloads/archive/
 

Index: pkgsrc/print/mupdf/distinfo
diff -u pkgsrc/print/mupdf/distinfo:1.78 pkgsrc/print/mupdf/distinfo:1.79
--- pkgsrc/print/mupdf/distinfo:1.78    Fri Aug 29 09:17:06 2025
+++ pkgsrc/print/mupdf/distinfo Fri Aug 29 10:05:56 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.78 2025/08/29 09:17:06 leot Exp $
+$NetBSD: distinfo,v 1.79 2025/08/29 10:05:56 leot Exp $
 
 BLAKE2s (mupdf-1.26.7-source.tar.gz) = 181155ce4293b960e2803e5e595eede245ab9ba94e7b436baf857469953fce83
 SHA512 (mupdf-1.26.7-source.tar.gz) = e447447e10f752ea612e091de9af4bdc8144393a3349b73578d172e40e45a1c25b3a30c2a6d92b2d8c6589790171420d10174197debe2fe5ee1ebe052d82c43b
@@ -9,7 +9,7 @@ SHA1 (patch-Makerules) = 5caa3319b121201
 SHA1 (patch-docs_man_mupdf.1) = c2a2c1ad283428168a714adb634aa50cdd6a4aba
 SHA1 (patch-platform_gl_gl-app.h) = 1e915249010acd3ff1343f0607e785d06577fe78
 SHA1 (patch-platform_x11_curl__stream.c) = ccabcd665359ae00b76230a4ced22f360a0989e5
-SHA1 (patch-platform_x11_pdfapp.c) = 33b53c845c6778614e4384a783a34d00b6814e74
+SHA1 (patch-platform_x11_pdfapp.c) = e806f10b9c7dad2f6db2386c0b5509d5cf311f06
 SHA1 (patch-source_fitz_crypt-sha2.c) = c6b113818b32cb4470e8549c00a16e0b2f364ede
 SHA1 (patch-source_fitz_load-jpx.c) = 8d7f58168c8429a82127b821387298341a1fcbfb
 SHA1 (patch-source_helpers_pkcs7_pkcs7-openssl.c) = f3e949de8bdfc55e2da402a5bc59b4baf04b0d55

Index: pkgsrc/print/mupdf/patches/patch-platform_x11_pdfapp.c
diff -u pkgsrc/print/mupdf/patches/patch-platform_x11_pdfapp.c:1.3 pkgsrc/print/mupdf/patches/patch-platform_x11_pdfapp.c:1.4
--- pkgsrc/print/mupdf/patches/patch-platform_x11_pdfapp.c:1.3  Thu Sep  7 14:36:54 2023
+++ pkgsrc/print/mupdf/patches/patch-platform_x11_pdfapp.c      Fri Aug 29 10:05:56 2025
@@ -1,7 +1,6 @@
-$NetBSD: patch-platform_x11_pdfapp.c,v 1.3 2023/09/07 14:36:54 vins Exp $
+$NetBSD: patch-platform_x11_pdfapp.c,v 1.4 2025/08/29 10:05:56 leot Exp $
 
 * Implement fine-grained zoom control (from OpenBSD ports).
-* Fix up/down scrolling with vi-like keys (from FreeBSD ports).
 
 --- platform/x11/pdfapp.c.orig 2023-09-05 11:51:19.000000000 +0000
 +++ platform/x11/pdfapp.c
@@ -30,40 +29,6 @@ $NetBSD: patch-platform_x11_pdfapp.c,v 1
  static int zoom_in(int oldres)
  {
        int i;
-@@ -1538,6 +1548,8 @@ key_rewritten:
- 
-       case 'j':
-               {
-+                      if (app->pany + app->imgh <= app->winh)
-+                        goto pagedown;
-                       if (app->imgh <= app->winh || app->pany <= app->winh - app->imgh)
-                       {
-                               panto = PAN_TO_TOP;
-@@ -1553,6 +1565,8 @@ key_rewritten:
- 
-       case 'k':
-               {
-+                      if (app->pany >= 0)
-+                        goto pageup;
-                       if (app->imgh <= app->winh || app->pany == 0)
-                       {
-                               panto = PAN_TO_BOTTOM;
-@@ -1627,6 +1641,7 @@ key_rewritten:
-        */
- 
-       case ',':
-+              pageup:
-               panto = DONT_PAN;
-               if (app->numberlen > 0)
-                       app->pageno -= atoi(app->number);
-@@ -1635,6 +1650,7 @@ key_rewritten:
-               break;
- 
-       case '.':
-+              pagedown:
-               panto = DONT_PAN;
-               if (app->numberlen > 0)
-                       app->pageno += atoi(app->number);
 @@ -1642,6 +1658,7 @@ key_rewritten:
                        app->pageno++;
                break;