CVS commit: pkgsrc/fonts/t1lib

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Thu Dec  5 08:21:53 UTC 2024

Modified Files:
        pkgsrc/fonts/t1lib: distinfo
        pkgsrc/fonts/t1lib/patches: patch-lib_type1_objects.h
            patch-lib_type1_regions.c

Log Message:
t1lib: fix build with gcc14


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/fonts/t1lib/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/fonts/t1lib/patches/patch-lib_type1_objects.h \
    pkgsrc/fonts/t1lib/patches/patch-lib_type1_regions.c

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

Modified files:

Index: pkgsrc/fonts/t1lib/distinfo
diff -u pkgsrc/fonts/t1lib/distinfo:1.27 pkgsrc/fonts/t1lib/distinfo:1.28
--- pkgsrc/fonts/t1lib/distinfo:1.27    Wed Jun  8 19:00:13 2022
+++ pkgsrc/fonts/t1lib/distinfo Thu Dec  5 08:21:53 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2022/06/08 19:00:13 chuck Exp $
+$NetBSD: distinfo,v 1.28 2024/12/05 08:21:53 markd Exp $
 
 BLAKE2s (t1lib-5.1.2.tar.gz) = cab979b401fbc8c24ff30dc580c2b9bb03338681861ec263b5d897df8a686ff2
 SHA512 (t1lib-5.1.2.tar.gz) = 9f424b19c6f35cc4f194ff7351a4c2352216462c7d1b1d9650ad3a05cf48c6e90c89ccbcda5ecc47a4169a39a850cf84a1fcbf88b3b15614860c27364b631ae3
@@ -12,5 +12,5 @@ SHA1 (patch-ai) = 372740d7166ebb999a3c28
 SHA1 (patch-aj) = bb915405fc5d64a74de09d7e4daba8822a08fbe1
 SHA1 (patch-ak) = abfbdb17c60b2068e95c5fe8e61ecfadbd85eea1
 SHA1 (patch-al) = b0f0ab9398ce7e3f3bc3e8e54097fd4dbb566bc8
-SHA1 (patch-lib_type1_objects.h) = bcb1d938d8cd6db5b32e8db2c1a050d39244679a
-SHA1 (patch-lib_type1_regions.c) = 75b12d30f73a649cbd0495a5cd735049a9bc4418
+SHA1 (patch-lib_type1_objects.h) = 6105d7810661a498fd928c2a91d69a2d72a54be5
+SHA1 (patch-lib_type1_regions.c) = 3b5aefcdc9aaf835c01b943ec2766c23cfe2d9b7

Index: pkgsrc/fonts/t1lib/patches/patch-lib_type1_objects.h
diff -u pkgsrc/fonts/t1lib/patches/patch-lib_type1_objects.h:1.1 pkgsrc/fonts/t1lib/patches/patch-lib_type1_objects.h:1.2
--- pkgsrc/fonts/t1lib/patches/patch-lib_type1_objects.h:1.1    Wed Jun  8 19:00:13 2022
+++ pkgsrc/fonts/t1lib/patches/patch-lib_type1_objects.h        Thu Dec  5 08:21:53 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_type1_objects.h,v 1.1 2022/06/08 19:00:13 chuck Exp $
+$NetBSD: patch-lib_type1_objects.h,v 1.2 2024/12/05 08:21:53 markd Exp $
 
 Point LONGLONG macro at memcpy() rather than using t1lib custom code.
 The t1lib version causes some versions of clang to produce incorrect
@@ -8,7 +8,7 @@ have fixed the issue.  see note in:
 
 --- lib/type1/objects.h.orig   2022-06-08 13:28:14.000000000 -0400
 +++ lib/type1/objects.h        2022-06-08 13:28:29.000000000 -0400
-@@ -152,10 +152,14 @@
+@@ -152,10 +152,15 @@
  /*END SHARED*/
  /*SHARED*/
   
@@ -18,6 +18,7 @@ have fixed the issue.  see note in:
      register int count = (bytes) / sizeof(LONG); \
      while (--count >= 0) *p1++ = *p2++; }
 +#else
++#include <string.h>
 +#define  LONGCOPY(dest,source,bytes) memcpy(dest,source,bytes)
 +#endif
   
Index: pkgsrc/fonts/t1lib/patches/patch-lib_type1_regions.c
diff -u pkgsrc/fonts/t1lib/patches/patch-lib_type1_regions.c:1.1 pkgsrc/fonts/t1lib/patches/patch-lib_type1_regions.c:1.2
--- pkgsrc/fonts/t1lib/patches/patch-lib_type1_regions.c:1.1    Wed Jun  8 19:00:13 2022
+++ pkgsrc/fonts/t1lib/patches/patch-lib_type1_regions.c        Thu Dec  5 08:21:53 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_type1_regions.c,v 1.1 2022/06/08 19:00:13 chuck Exp $
+$NetBSD: patch-lib_type1_regions.c,v 1.2 2024/12/05 08:21:53 markd Exp $
 
 Fixed incorrect calculation of ceiling that results in t1lib LONGCOPY
 writing past the end of a malloc buffer.   Corrects crash on OSX
@@ -16,3 +16,11 @@ and resolves complaints from the address
   
         IfTrace1((RegionDebug),"result=%p\n", r);
         return(r);
+@@ -604,6 +605,7 @@ void ChangeDirection(type, R, x, y, dy,
+        register struct region *R;  /* region in which we are changing direction */
+        fractpel x,y;         /* current beginning x,y                        */
+        fractpel dy;          /* direction and magnitude of change in y       */
++       fractpel x2,y2;
+ {
+        register fractpel ymin,ymax;  /* minimum and maximum Y since last call */
+        register fractpel x_at_ymin,x_at_ymax;  /* their respective X's       */