[pkgsrc/trunk]: pkgsrc/graphics/glw graphics/glw: pull latest upstream changes.

[vins <vins%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1de132266345
branches:  trunk
changeset: 390534:1de132266345
user:      vins <vins%pkgsrc.org@localhost>
date:      Wed Dec 21 17:26:55 2022 +0000

description:
graphics/glw: pull latest upstream changes.

This commit incorporates a couple of bug fixes committed after the
release of libGLW 8.0.0 and before the project got eventually archived.

* Fix typo misplacing height for width.
* Fix bug with NULL variable when `glwDrawingAreaWidgetClass' is not
  found elsewhere and is assumed to be a definition (follwing the
  removal of extern declaration). See:
  https://marc.info/?l=cygwin-xfree&m=141268983004514&w=2

diffstat:

 graphics/glw/Makefile                  |   3 +-
 graphics/glw/distinfo                  |   5 +++-
 graphics/glw/patches/patch-GLwDrawA.c  |  15 ++++++++++++++
 graphics/glw/patches/patch-GLwDrawA.h  |  35 ++++++++++++++++++++++++++++++++++
 graphics/glw/patches/patch-GLwDrawAP.h |  24 +++++++++++++++++++++++
 5 files changed, 80 insertions(+), 2 deletions(-)

diffs (111 lines):

diff -r 07372368568b -r 1de132266345 graphics/glw/Makefile
--- a/graphics/glw/Makefile     Wed Dec 21 17:08:59 2022 +0000
+++ b/graphics/glw/Makefile     Wed Dec 21 17:26:55 2022 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2019/08/22 09:57:08 nia Exp $
+# $NetBSD: Makefile,v 1.4 2022/12/21 17:26:55 vins Exp $
 
 DISTNAME=      glw-8.0.0
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  https://mesa.freedesktop.org/archive/glw/
 EXTRACT_SUFX=  .tar.bz2
diff -r 07372368568b -r 1de132266345 graphics/glw/distinfo
--- a/graphics/glw/distinfo     Wed Dec 21 17:08:59 2022 +0000
+++ b/graphics/glw/distinfo     Wed Dec 21 17:26:55 2022 +0000
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 10:46:13 nia Exp $
+$NetBSD: distinfo,v 1.6 2022/12/21 17:26:55 vins Exp $
 
 BLAKE2s (glw-8.0.0.tar.bz2) = a948b905c10c6ff31e36ee901f9a0adb02bfc02643cc7a5da67a043369ad6350
 SHA512 (glw-8.0.0.tar.bz2) = 09e1352edb16a9a34b9031996c2a1545d69dc690d7eda10a1aad6a7ad9ef0576d0af8a1b7740dba47f9647b7c957c1d7a078b38747d2d2c28ea39314a0e53587
 Size (glw-8.0.0.tar.bz2) = 221136 bytes
+SHA1 (patch-GLwDrawA.c) = f03017b6c22881740170ec5d14c091367d0d4954
+SHA1 (patch-GLwDrawA.h) = bb4b8a7d3c112114913fc404f31ddef6b47b2de4
+SHA1 (patch-GLwDrawAP.h) = cd0e51843c4deebb577f15d9d58cbbeda0561689
diff -r 07372368568b -r 1de132266345 graphics/glw/patches/patch-GLwDrawA.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/glw/patches/patch-GLwDrawA.c     Wed Dec 21 17:26:55 2022 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-GLwDrawA.c,v 1.1 2022/12/21 17:26:55 vins Exp $
+
+Fix typo, s/width/height/.
+
+--- GLwDrawA.c.orig    2012-05-17 13:55:42.000000000 +0000
++++ GLwDrawA.c
+@@ -474,7 +474,7 @@ static void Initialize(GLwDrawingAreaWid
+ 
+   /* fix size */
+   if(req->core.width==0) neww->core.width=100;
+-  if(req->core.height==0) neww->core.width=100;
++  if(req->core.height==0) neww->core.height=100;
+ 
+   /* create the attribute list if needed */
+   neww->glwDrawingArea.myList=FALSE;
diff -r 07372368568b -r 1de132266345 graphics/glw/patches/patch-GLwDrawA.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/glw/patches/patch-GLwDrawA.h     Wed Dec 21 17:26:55 2022 +0000
@@ -0,0 +1,35 @@
+$NetBSD: patch-GLwDrawA.h,v 1.1 2022/12/21 17:26:55 vins Exp $
+
+Fix NULL variable definition.
+
+--- GLwDrawA.h.orig    2012-05-17 13:55:42.000000000 +0000
++++ GLwDrawA.h
+@@ -131,12 +131,18 @@
+ #define GLwNaccumAlphaSize    "accumAlphaSize"
+ #define GLwCAccumAlphaSize    "AccumAlphaSize"
+ 
++#if (defined(__GNUC__) && __GNUC__ >= 4) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
++#  define GLAPIVAR extern __attribute__((visibility("default")))
++#else
++#  define GLAPIVAR extern
++#endif
++
+ #ifdef __GLX_MOTIF
+ 
+ typedef struct _GLwMDrawingAreaClassRec       *GLwMDrawingAreaWidgetClass;
+ typedef struct _GLwMDrawingAreaRec    *GLwMDrawingAreaWidget;
+ 
+-GLAPI WidgetClass glwMDrawingAreaWidgetClass;
++GLAPIVAR WidgetClass glwMDrawingAreaWidgetClass;
+ 
+ 
+ #else 
+@@ -144,7 +150,7 @@ GLAPI WidgetClass glwMDrawingAreaWidgetC
+ typedef struct _GLwDrawingAreaClassRec        *GLwDrawingAreaWidgetClass;
+ typedef struct _GLwDrawingAreaRec     *GLwDrawingAreaWidget;
+ 
+-GLAPI WidgetClass glwDrawingAreaWidgetClass;
++GLAPIVAR WidgetClass glwDrawingAreaWidgetClass;
+ 
+ 
+ #endif
diff -r 07372368568b -r 1de132266345 graphics/glw/patches/patch-GLwDrawAP.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/glw/patches/patch-GLwDrawAP.h    Wed Dec 21 17:26:55 2022 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-GLwDrawAP.h,v 1.1 2022/12/21 17:26:55 vins Exp $
+
+Use newly introduced GLAPIVAR for variables.
+
+--- GLwDrawAP.h.orig   2012-05-17 13:55:42.000000000 +0000
++++ GLwDrawAP.h
+@@ -59,7 +59,7 @@ typedef struct _GLwMDrawingAreaClassRec 
+   } GLwMDrawingAreaClassRec;
+ 
+ 
+-GLAPI GLwMDrawingAreaClassRec glwMDrawingAreaClassRec;
++GLAPIVAR GLwMDrawingAreaClassRec glwMDrawingAreaClassRec;
+ 
+ 
+ /* XT */
+@@ -70,7 +70,7 @@ typedef struct _GLwDrawingAreaClassRec {
+   GLwDrawingAreaClassPart     glwDrawingArea_class;
+   } GLwDrawingAreaClassRec;
+ 
+-GLAPI GLwDrawingAreaClassRec glwDrawingAreaClassRec;
++GLAPIVAR GLwDrawingAreaClassRec glwDrawingAreaClassRec;
+ 
+ 
+ #endif