emacs-git: switch to upstream version of fix

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

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Fri Jan 31 18:09:28 2020 +0100
Changeset:	78b18e9e73d10b0e4659bba033adfbb59a3796d1

Modified Files:
	emacs-git/distinfo
	emacs-git/patches/patch-configure.ac
	emacs-git/patches/patch-src_systhread.c

Log Message:
emacs-git: switch to upstream version of fix

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

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

diffstat:
 emacs-git/distinfo                      |  4 ++--
 emacs-git/patches/patch-configure.ac    | 31 +++++++++++++++++++++++++++++--
 emacs-git/patches/patch-src_systhread.c | 21 +++++++++++++--------
 3 files changed, 44 insertions(+), 12 deletions(-)

diffs:
diff --git a/emacs-git/distinfo b/emacs-git/distinfo
index a9bc652953..2c8336963b 100644
--- a/emacs-git/distinfo
+++ b/emacs-git/distinfo
@@ -1,4 +1,4 @@
 $NetBSD$
 
-SHA1 (patch-configure.ac) = c9731094e059ac80d25e5a32894404a14be64433
-SHA1 (patch-src_systhread.c) = 09508d1ab582bf02ec6e9432c34a245304af5da0
+SHA1 (patch-configure.ac) = ac5f320cdb3c195b742321ab7c3ef48b5e50f811
+SHA1 (patch-src_systhread.c) = 1fed745b40101d96fb22114f7629595afdd15fe6
diff --git a/emacs-git/patches/patch-configure.ac b/emacs-git/patches/patch-configure.ac
index 9a9f8a951b..f7a31f001a 100644
--- a/emacs-git/patches/patch-configure.ac
+++ b/emacs-git/patches/patch-configure.ac
@@ -1,11 +1,16 @@
 $NetBSD$
 
+1. chunk:
 Do not inject X11 LDFLAGS, pkgsrc handles that.
 Fixes PR pkg/53688.
 
---- configure.ac.orig	2019-05-13 12:01:24.181647930 +0000
+2. chunk:
+Adapt pthread_setname_np calling convention for NetBSD.
+http://debbugs.gnu.org/cgi/bugreport.cgi?bug=39363
+
+--- configure.ac.orig	2020-01-31 17:00:50.659618322 +0000
 +++ configure.ac
-@@ -1551,7 +1551,8 @@ ac_link="$ac_link $LD_SWITCH_SYSTEM"
+@@ -1549,7 +1549,8 @@ ac_link="$ac_link $LD_SWITCH_SYSTEM"
  ## LD_SWITCH_SYSTEM_TEMACS.
  case "$opsys" in
    netbsd|openbsd)
@@ -15,3 +20,25 @@ Fixes PR pkg/53688.
  esac
  
  C_SWITCH_MACHINE=
+@@ -4192,6 +4193,21 @@ if test "$ac_cv_func_pthread_setname_np"
+     AC_DEFINE(
+       HAVE_PTHREAD_SETNAME_NP_1ARG, 1,
+       [Define to 1 if pthread_setname_np takes a single argument.])
++  else
++    AC_CACHE_CHECK(
++     [whether pthread_setname_np takes three arguments],
++     [emacs_cv_pthread_setname_np_3arg],
++     [AC_COMPILE_IFELSE(
++       [AC_LANG_PROGRAM(
++         [[#include <pthread.h>]],
++         [[pthread_setname_np (0, "%s", "a");]])],
++       [emacs_cv_pthread_setname_np_3arg=yes],
++       [emacs_cv_pthread_setname_np_3arg=no])])
++     if test "$emacs_cv_pthread_setname_np_3arg" = "yes"; then
++       AC_DEFINE(
++         HAVE_PTHREAD_SETNAME_NP_3ARG, 1,
++         [Define to 1 if pthread_setname_np takes three arguments.])
++     fi
+   fi
+ fi
+ 
diff --git a/emacs-git/patches/patch-src_systhread.c b/emacs-git/patches/patch-src_systhread.c
index 515baf8d66..f838f6f6d5 100644
--- a/emacs-git/patches/patch-src_systhread.c
+++ b/emacs-git/patches/patch-src_systhread.c
@@ -3,17 +3,22 @@ $NetBSD$
 Adapt pthread_setname_np calling convention for NetBSD.
 http://debbugs.gnu.org/cgi/bugreport.cgi?bug=39363
 
---- src/systhread.c.orig	2020-01-30 22:42:52.049505198 +0000
+--- src/systhread.c.orig	2020-01-31 17:00:50.894938840 +0000
 +++ src/systhread.c
-@@ -217,7 +217,11 @@ sys_thread_set_name (const char *name)
-  #ifdef HAVE_PTHREAD_SETNAME_NP_1ARG
+@@ -214,11 +214,13 @@ sys_thread_set_name (const char *name)
+   char p_name[TASK_COMM_LEN];
+   strncpy (p_name, name, TASK_COMM_LEN - 1);
+   p_name[TASK_COMM_LEN - 1] = '\0';
+- #ifdef HAVE_PTHREAD_SETNAME_NP_1ARG
++# ifdef HAVE_PTHREAD_SETNAME_NP_1ARG
    pthread_setname_np (p_name);
-  #else
-+  #ifdef __NetBSD__
+- #else
++# elif defined HAVE_PTHREAD_SETNAME_NP_3ARG
 +  pthread_setname_np (pthread_self (), "%s", p_name);
-+  #else
++# else
    pthread_setname_np (pthread_self (), p_name);
-+  #endif
-  #endif
+- #endif
++# endif
  #endif
  }
+