Wed Dec 21 17:26:55 2022 UTC ()
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


(vins)
diff -r1.3 -r1.4 pkgsrc/graphics/glw/Makefile
diff -r1.5 -r1.6 pkgsrc/graphics/glw/distinfo
diff -r0 -r1.1 pkgsrc/graphics/glw/patches/patch-GLwDrawA.c
diff -r0 -r1.1 pkgsrc/graphics/glw/patches/patch-GLwDrawA.h
diff -r0 -r1.1 pkgsrc/graphics/glw/patches/patch-GLwDrawAP.h
cvs diff -r1.3 -r1.4 pkgsrc/graphics/glw/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/glw/Makefile 2019/08/22 09:57:08 1.3
+++ pkgsrc/graphics/glw/Makefile 2022/12/21 17:26:55 1.4
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.3 2019/08/22 09:57:08 nia Exp $ 1# $NetBSD: Makefile,v 1.4 2022/12/21 17:26:55 vins Exp $
2 2
3DISTNAME= glw-8.0.0 3DISTNAME= glw-8.0.0
 4PKGREVISION= 1
4CATEGORIES= graphics 5CATEGORIES= graphics
5MASTER_SITES= https://mesa.freedesktop.org/archive/glw/ 6MASTER_SITES= https://mesa.freedesktop.org/archive/glw/
6EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://cgit.freedesktop.org/mesa/glw/ 10HOMEPAGE= https://cgit.freedesktop.org/mesa/glw/
10COMMENT= GL widget for Athena and Motif 11COMMENT= GL widget for Athena and Motif
11#LICENSE= https://cgit.freedesktop.org/mesa/glw/tree/README 12#LICENSE= https://cgit.freedesktop.org/mesa/glw/tree/README
12 13
13GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
14USE_LIBTOOL= yes 15USE_LIBTOOL= yes
15USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
16 17
cvs diff -r1.5 -r1.6 pkgsrc/graphics/glw/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/glw/distinfo 2021/10/26 10:46:13 1.5
+++ pkgsrc/graphics/glw/distinfo 2022/12/21 17:26:55 1.6
@@ -1,5 +1,8 @@ @@ -1,5 +1,8 @@
1$NetBSD: distinfo,v 1.5 2021/10/26 10:46:13 nia Exp $ 1$NetBSD: distinfo,v 1.6 2022/12/21 17:26:55 vins Exp $
2 2
3BLAKE2s (glw-8.0.0.tar.bz2) = a948b905c10c6ff31e36ee901f9a0adb02bfc02643cc7a5da67a043369ad6350 3BLAKE2s (glw-8.0.0.tar.bz2) = a948b905c10c6ff31e36ee901f9a0adb02bfc02643cc7a5da67a043369ad6350
4SHA512 (glw-8.0.0.tar.bz2) = 09e1352edb16a9a34b9031996c2a1545d69dc690d7eda10a1aad6a7ad9ef0576d0af8a1b7740dba47f9647b7c957c1d7a078b38747d2d2c28ea39314a0e53587 4SHA512 (glw-8.0.0.tar.bz2) = 09e1352edb16a9a34b9031996c2a1545d69dc690d7eda10a1aad6a7ad9ef0576d0af8a1b7740dba47f9647b7c957c1d7a078b38747d2d2c28ea39314a0e53587
5Size (glw-8.0.0.tar.bz2) = 221136 bytes 5Size (glw-8.0.0.tar.bz2) = 221136 bytes
 6SHA1 (patch-GLwDrawA.c) = f03017b6c22881740170ec5d14c091367d0d4954
 7SHA1 (patch-GLwDrawA.h) = bb4b8a7d3c112114913fc404f31ddef6b47b2de4
 8SHA1 (patch-GLwDrawAP.h) = cd0e51843c4deebb577f15d9d58cbbeda0561689
File Added: pkgsrc/graphics/glw/patches/patch-GLwDrawA.c
$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;
File Added: pkgsrc/graphics/glw/patches/patch-GLwDrawA.h
$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
File Added: pkgsrc/graphics/glw/patches/patch-GLwDrawAP.h
$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