pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

mono-git: Improve patch for upstream



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Aug 9 00:16:54 2016 +0200
Changeset:	db912cc84def36a3ea3c6bd3b32340206ba480f0

Modified Files:
	mono-git/distinfo
	mono-git/patches/patch-mono_utils_mono-proclib.c

Log Message:
mono-git: Improve patch for upstream

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

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

diffstat:
 mono-git/distinfo                                | 2 +-
 mono-git/patches/patch-mono_utils_mono-proclib.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diffs:
diff --git a/mono-git/distinfo b/mono-git/distinfo
index 8124d78..4c73132 100644
--- a/mono-git/distinfo
+++ b/mono-git/distinfo
@@ -6,4 +6,4 @@ SHA512 (mono-4.4.0.122.tar.bz2) = 264b3779fc94e40c44f8cc637169d7f3a6367ead75b932
 Size (mono-4.4.0.122.tar.bz2) = 84904723 bytes
 SHA1 (patch-eglib_src_giconv.c) = b56e6d328f614d7f70e156a2458b11b36b439f28
 SHA1 (patch-mono_utils_mono-logger.c) = 280e1bf49b79adf57823723287dbc88639d13551
-SHA1 (patch-mono_utils_mono-proclib.c) = 513cfbaef2221397ec7efa3b6a0babcf02a1fe43
+SHA1 (patch-mono_utils_mono-proclib.c) = da14c51074c2d5096699834cc29b1a222177070e
diff --git a/mono-git/patches/patch-mono_utils_mono-proclib.c b/mono-git/patches/patch-mono_utils_mono-proclib.c
index 174cc4c..759bef3 100644
--- a/mono-git/patches/patch-mono_utils_mono-proclib.c
+++ b/mono-git/patches/patch-mono_utils_mono-proclib.c
@@ -13,14 +13,17 @@ $NetBSD$
  #elif defined(__OpenBSD__)
  // Can not figure out how to get the proc's start time on OpenBSD
  #    undef kinfo_starttime_member 
-@@ -317,8 +321,13 @@ mono_process_get_times (gpointer pid, gi
+@@ -317,8 +321,16 @@ mono_process_get_times (gpointer pid, gi
  		{
  			KINFO_PROC processi;
  
 -			if (sysctl_kinfo_proc (pid, &processi))
 +			if (sysctl_kinfo_proc (pid, &processi)) {
 +#if defined(__NetBSD__)
-+				*start_time = (gint64)processi.kinfo_starttime_member;
++				struct timeval tv;
++				tv.tv_sec = processi.kinfo_starttime_member;
++				tv.tv_usec = processi.p_ustart_usec;
++				*start_time = mono_100ns_datetime_from_timeval(tv);
 +#else
  				*start_time = mono_100ns_datetime_from_timeval (processi.kinfo_starttime_member);
 +#endif


Home | Main Index | Thread Index | Old Index