CVS commit: pkgsrc/www

["Nathanial Sloss" <nat%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nat
Date:           Wed Apr 17 14:08:26 UTC 2024

Modified Files:
        pkgsrc/www/links: distinfo
        pkgsrc/www/links-gui: Makefile
        pkgsrc/www/links/patches: patch-x.c

Log Message:
Fix for all bit depths lower than 8bpp.

Bump PKG_REVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 pkgsrc/www/links/distinfo
cvs rdiff -u -r1.113 -r1.114 pkgsrc/www/links-gui/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/links/patches/patch-x.c

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

Modified files:

Index: pkgsrc/www/links/distinfo
diff -u pkgsrc/www/links/distinfo:1.85 pkgsrc/www/links/distinfo:1.86
--- pkgsrc/www/links/distinfo:1.85      Thu Mar 21 14:52:50 2024
+++ pkgsrc/www/links/distinfo   Wed Apr 17 14:08:26 2024
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.85 2024/03/21 14:52:50 schmonz Exp $
+$NetBSD: distinfo,v 1.86 2024/04/17 14:08:26 nat Exp $
 
 BLAKE2s (links-2.29.tar.bz2) = 95f2d6888bb4aa64764249a9dcda88475051e3200af9b25c402ef70bdac86fe5
 SHA512 (links-2.29.tar.bz2) = 5ea8b2fd0eb74d9dc2b45614aef6ee878fe686dff9bcee75ac6ea01f6a7331670f7709233d31986fc64ad86ce549616a4471057837b6caf15af6d1c5c503ac75
 Size (links-2.29.tar.bz2) = 6521024 bytes
 SHA1 (patch-configure) = 38044f43a6985c50dd0275e9927dcc98a91dcc47
-SHA1 (patch-x.c) = 18521103f0d585416cc27804e825d764c7df61ee
+SHA1 (patch-x.c) = 20302ed35c0e422ce6cd6867d7a5ee126d9a2d7e

Index: pkgsrc/www/links-gui/Makefile
diff -u pkgsrc/www/links-gui/Makefile:1.113 pkgsrc/www/links-gui/Makefile:1.114
--- pkgsrc/www/links-gui/Makefile:1.113 Sun Apr  7 07:35:12 2024
+++ pkgsrc/www/links-gui/Makefile       Wed Apr 17 14:08:26 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.113 2024/04/07 07:35:12 wiz Exp $
+# $NetBSD: Makefile,v 1.114 2024/04/17 14:08:26 nat Exp $
 
 PKGNAME=       ${DISTNAME:S/links/&-gui/}
-PKGREVISION=   1
+PKGREVISION=   2
 COMMENT=       Lynx-like text and graphics WWW browser
 
 USE_TOOLS+=            pkg-config

Index: pkgsrc/www/links/patches/patch-x.c
diff -u pkgsrc/www/links/patches/patch-x.c:1.3 pkgsrc/www/links/patches/patch-x.c:1.4
--- pkgsrc/www/links/patches/patch-x.c:1.3      Sun May 29 17:58:53 2022
+++ pkgsrc/www/links/patches/patch-x.c  Wed Apr 17 14:08:26 2024
@@ -1,8 +1,8 @@
-$NetBSD: patch-x.c,v 1.3 2022/05/29 17:58:53 fcambus Exp $
+$NetBSD: patch-x.c,v 1.4 2024/04/17 14:08:26 nat Exp $
 
-Fix display for color depths lower than 4bpp.
+Fix display for all color depths lower than 8bpp.
 
---- x.c.orig   2022-04-07 16:18:34.000000000 +0000
+--- x.c.orig   2024-04-12 21:04:10.197723954 +0000
 +++ x.c
 @@ -1667,12 +1667,12 @@ static unsigned char *x_init_driver(unsi
  
@@ -44,7 +44,7 @@ Fix display for color depths lower than 
                if (x_depth > 8)
                        return stracpy(cast_uchar "Static color supported for up to 8-bit depth.\n");
                if ((err = x_query_palette()))
-@@ -2223,13 +2225,32 @@ static void x_translate_colors(unsigned 
+@@ -2223,13 +2225,58 @@ static void x_translate_colors(unsigned 
                return;
        }
  
@@ -57,7 +57,33 @@ Fix display for color depths lower than 
                }
 -              return;
 +      }
-+      if (x_depth == 1) {
++
++      int n, whole;
++      if (x_depth == 4) {
++              whole = x % 2;
++              for (j = 0; j < y; j++) {
++                      n = 0;
++                      for (i = 0; i < x - whole;i += 2)
++                              mypic[n++] = mypic[i] << 4 | mypic[i + 1];
++                      if (whole)
++                              mypic[n++] = mypic[i] << 4;
++                      mypic += skip;
++              }
++      } else if (x_depth == 2) {
++              whole = x % 4;
++              for (j = 0; j < y; j++) {
++                      n = 0;
++                      for (i = 0; i < x - whole;i += 4) {
++                              mypic[n++] = mypic[i] << 6 | mypic[i + 1] << 4
++                                  | mypic[i + 2] << 2 | mypic[i + 3];
++                      }
++                      for (; i < x; i++) {
++                              mypic[n] |= mypic[i];
++                              mypic[n] << 2;
++                      }
++                      mypic += skip;
++              }
++      } else if (x_depth == 1) {
 +              unsigned char s;
 +              for (j = 0; j < y; j++) {
 +                      s = 0;