modular-xorg-server-devel: fix uint32_t problem same way as pid_t problem.

[Thomas Klausner <tk%giga.or.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Sat Apr 21 11:42:40 2018 +0200
Changeset:	afc6836c67aeaf1ddac6b8717dde6589a5d481c8

Modified Files:
	modular-xorg-server-devel/distinfo
	modular-xorg-server-devel/patches/patch-hw_xfree86_sdksyms.sh

Log Message:
modular-xorg-server-devel: fix uint32_t problem same way as pid_t problem.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=afc6836c67aeaf1ddac6b8717dde6589a5d481c8

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

diffstat:
 modular-xorg-server-devel/distinfo                      |  2 +-
 .../patches/patch-hw_xfree86_sdksyms.sh                 | 17 ++---------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diffs:
diff --git a/modular-xorg-server-devel/distinfo b/modular-xorg-server-devel/distinfo
index a6ed937c1c..51eb772d62 100644
--- a/modular-xorg-server-devel/distinfo
+++ b/modular-xorg-server-devel/distinfo
@@ -15,5 +15,5 @@ SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 0035b970bdae1bab51b8ca6bfeed060e
 SHA1 (patch-hw_xfree86_os-support_solaris_solaris-amd64.S) = 088a3118deb7567194e08dd46e34cb6edba38400
 SHA1 (patch-hw_xfree86_os-support_xf86_OSproc.h) = e1c049857893d2f050d5fb297a3e8ef86f0b1d7e
 SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544
-SHA1 (patch-hw_xfree86_sdksyms.sh) = e7cd03a3bb55f757ff4b24d4377452f5f100ba40
+SHA1 (patch-hw_xfree86_sdksyms.sh) = deb79139bb1974f8c8cb160c45398480c64be98e
 SHA1 (patch-os_xstrans.c) = 489a4f4b226ecd361b922895204fb9041b065d4e
diff --git a/modular-xorg-server-devel/patches/patch-hw_xfree86_sdksyms.sh b/modular-xorg-server-devel/patches/patch-hw_xfree86_sdksyms.sh
index 5be460b148..ddf5adcc94 100644
--- a/modular-xorg-server-devel/patches/patch-hw_xfree86_sdksyms.sh
+++ b/modular-xorg-server-devel/patches/patch-hw_xfree86_sdksyms.sh
@@ -5,18 +5,15 @@ It returns pid_t which on NetBSD is #define pid_t __pid_t
 This slightly alters the GCC preprocessor output which this fragile
 code could not deal with when using GCC 5+
 
-
-Ignore empty symbols, from Adam Jackson <ajax%redhat.com@localhost>
-
 --- hw/xfree86/sdksyms.sh.orig	2018-04-10 19:46:09.000000000 +0000
 +++ hw/xfree86/sdksyms.sh
 @@ -373,6 +373,17 @@ BEGIN {
                 n = 1;
              }
          }
-+	# hack: pid_t becomes __pid_t on NetBSD.
++	# hack: pid_t becomes __pid_t on NetBSD, same for uint32_t -> __uint32_t.
 +	# GCC 5 inserts additional lines around this.
-+        if ($1 == "__pid_t" && NF == 1) {
++        if (($1 == "__pid_t" || $1 == "__uint32_t") && NF == 1) {
 +            getline;
 +            n++;
 +            # skip line numbers GCC 5 adds (after typedef return type?)
@@ -28,13 +25,3 @@ Ignore empty symbols, from Adam Jackson <ajax%redhat.com@localhost>
  
  	# type specifier may not be set, as in
  	#   extern _X_EXPORT unsigned name(...)
-@@ -415,7 +426,8 @@ BEGIN {
- 	sub(/[^a-zA-Z0-9_].*/, "", symbol);
- 
- 	#print;
--	printf("    (void *) &%-50s /* %s:%s */\n", symbol ",", header, line);
-+	if (symbol != "")
-+	    printf("    (void *) &%-50s /* %s:%s */\n", symbol ",", header, line);
-     }
- }
-