CVS commit: pkgsrc/chat/hexchat

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Jul 17 10:53:22 UTC 2019

Modified Files:
        pkgsrc/chat/hexchat: Makefile distinfo
Added Files:
        pkgsrc/chat/hexchat/patches: patch-src_common_meson.build

Log Message:
hexchat: Avoid races by explicitly depending on generated headers.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/chat/hexchat/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/chat/hexchat/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/chat/hexchat/patches/patch-src_common_meson.build

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

Modified files:

Index: pkgsrc/chat/hexchat/Makefile
diff -u pkgsrc/chat/hexchat/Makefile:1.34 pkgsrc/chat/hexchat/Makefile:1.35
--- pkgsrc/chat/hexchat/Makefile:1.34   Wed Jul 17 09:22:11 2019
+++ pkgsrc/chat/hexchat/Makefile        Wed Jul 17 10:53:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2019/07/17 09:22:11 nia Exp $
+# $NetBSD: Makefile,v 1.35 2019/07/17 10:53:22 nia Exp $
 
 DISTNAME=      hexchat-2.14.2
 CATEGORIES=    chat
@@ -41,9 +41,6 @@ PLIST_SUBST+=         SOEXT=${SOEXT}
 
 LDFLAGS.SunOS+=                -lsocket -lnsl
 
-# It seems generated files are sometimes not generated in time.
-MAKE_JOBS_SAFE=                no
-
 .include "../../devel/py-meson/build.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"

Index: pkgsrc/chat/hexchat/distinfo
diff -u pkgsrc/chat/hexchat/distinfo:1.8 pkgsrc/chat/hexchat/distinfo:1.9
--- pkgsrc/chat/hexchat/distinfo:1.8    Wed May  8 17:19:41 2019
+++ pkgsrc/chat/hexchat/distinfo        Wed Jul 17 10:53:22 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2019/05/08 17:19:41 nia Exp $
+$NetBSD: distinfo,v 1.9 2019/07/17 10:53:22 nia Exp $
 
 SHA1 (hexchat-2.14.2.tar.xz) = 650f6247cc68c022ba4fee09ebde578dc2ec1c33
 RMD160 (hexchat-2.14.2.tar.xz) = a41067f7dd9b0eceaf2252aa7a8b8eca7dd228fd
@@ -9,3 +9,4 @@ SHA1 (patch-plugins_sysinfo_meson.build)
 SHA1 (patch-plugins_sysinfo_unix_parse.c) = 92b882b7573cfcfc280351353a7bdcb0a7940c06
 SHA1 (patch-plugins_sysinfo_unix_pci.c) = db2d20261419bed6d6c4b716b4416d73b3386053
 SHA1 (patch-plugins_sysinfo_unix_pci.h) = 018b74796143b26d6a1f9ad821f3889b74b09cc8
+SHA1 (patch-src_common_meson.build) = 56f1376208c6ab198162d62ae990c8a6ed6c2b58

Added files:

Index: pkgsrc/chat/hexchat/patches/patch-src_common_meson.build
diff -u /dev/null pkgsrc/chat/hexchat/patches/patch-src_common_meson.build:1.1
--- /dev/null   Wed Jul 17 10:53:22 2019
+++ pkgsrc/chat/hexchat/patches/patch-src_common_meson.build    Wed Jul 17 10:53:22 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_common_meson.build,v 1.1 2019/07/17 10:53:22 nia Exp $
+
+Make generated headers an explicit dependency of targets using
+hexchat_common to force the headers to be generated in time.
+
+--- src/common/meson.build.orig        2018-08-29 21:13:25.000000000 +0000
++++ src/common/meson.build
+@@ -109,6 +109,7 @@ hexchat_common = static_library('hexchat
+ )
+ 
+ hexchat_common_dep = declare_dependency(
++  sources: [textevents] + marshal,
+   link_with: hexchat_common,
+   include_directories: common_includes,
+   compile_args: common_cflags,