pkgsrc-WIP-changes archive

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

mono-git: Drop merged patches



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Aug 9 22:15:20 2016 +0200
Changeset:	01fe1353eca3b1b4e39d9e06cab2eebf50d3c088

Modified Files:
	mono-git/distinfo
Removed Files:
	mono-git/patches/patch-eglib_src_giconv.c
	mono-git/patches/patch-mono_io-layer_io.c
	mono-git/patches/patch-mono_utils_mono-logger.c
	mono-git/patches/patch-support_sys-mman.c

Log Message:
mono-git: Drop merged patches

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

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

diffstat:
 mono-git/distinfo                               |  4 ---
 mono-git/patches/patch-eglib_src_giconv.c       | 17 ---------
 mono-git/patches/patch-mono_io-layer_io.c       | 46 -------------------------
 mono-git/patches/patch-mono_utils_mono-logger.c | 13 -------
 mono-git/patches/patch-support_sys-mman.c       | 16 ---------
 5 files changed, 96 deletions(-)

diffs:
diff --git a/mono-git/distinfo b/mono-git/distinfo
index 75e039c..a5e515a 100644
--- a/mono-git/distinfo
+++ b/mono-git/distinfo
@@ -4,9 +4,5 @@ SHA1 (mono-4.4.0.122.tar.bz2) = 132a8e9aa422e82ccdb776c7cc1db89ce140b0b3
 RMD160 (mono-4.4.0.122.tar.bz2) = 41d58720d7cb4f510cad64c1dbecdd9a6c9d19a1
 SHA512 (mono-4.4.0.122.tar.bz2) = 264b3779fc94e40c44f8cc637169d7f3a6367ead75b932069bc0498d53c13ea62ef5711784d1bc0767b85e0cb04424b9eee0ce7ed10772076902b55210097a10
 Size (mono-4.4.0.122.tar.bz2) = 84904723 bytes
-SHA1 (patch-eglib_src_giconv.c) = b56e6d328f614d7f70e156a2458b11b36b439f28
-SHA1 (patch-mono_io-layer_io.c) = 5acc0d4fdecc36e7aab5db9d0ca38d415923a996
 SHA1 (patch-mono_metadata_mono-perfcounters.c) = 8b5b6fb08333e3f2993e24e6799227daf8d5c903
-SHA1 (patch-mono_utils_mono-logger.c) = 280e1bf49b79adf57823723287dbc88639d13551
 SHA1 (patch-mono_utils_mono-proclib.c) = da14c51074c2d5096699834cc29b1a222177070e
-SHA1 (patch-support_sys-mman.c) = 85d96f7c540918c0190cd3595d587e159624136d
diff --git a/mono-git/patches/patch-eglib_src_giconv.c b/mono-git/patches/patch-eglib_src_giconv.c
deleted file mode 100644
index 00eefe0..0000000
--- a/mono-git/patches/patch-eglib_src_giconv.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
---- eglib/src/giconv.c.orig	2016-05-07 13:14:32.000000000 +0000
-+++ eglib/src/giconv.c
-@@ -199,8 +199,11 @@ g_iconv (GIConv cd, gchar **inbytes, gsi
- 		} else {
- 			outleftptr = NULL;
- 		}
--		
-+#if defined(__NetBSD__)
-+		return iconv (cd->cd, (const gchar **)inbytes, inleftptr, outbytes, outleftptr);
-+#else
- 		return iconv (cd->cd, inbytes, inleftptr, outbytes, outleftptr);
-+#endif
- 	}
- #endif
- 	
diff --git a/mono-git/patches/patch-mono_io-layer_io.c b/mono-git/patches/patch-mono_io-layer_io.c
deleted file mode 100644
index 71bd963..0000000
--- a/mono-git/patches/patch-mono_io-layer_io.c
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD$
-
---- mono/io-layer/io.c.orig	2016-08-08 22:53:57.136538032 +0000
-+++ mono/io-layer/io.c
-@@ -3563,23 +3563,40 @@ gboolean CreatePipe (gpointer *readpipe,
- 	return(TRUE);
- }
- 
--#ifdef HAVE_GETFSSTAT
-+#if defined(HAVE_GETFSSTAT) || defined(__NetBSD__)
- /* Darwin has getfsstat */
- gint32 GetLogicalDriveStrings (guint32 len, gunichar2 *buf)
- {
-+#if defined(__NetBSD__)
-+	struct statvfs *stats;
-+#else
- 	struct statfs *stats;
-+#endif
- 	int size, n, i;
- 	gunichar2 *dir;
- 	glong length, total = 0;
- 	
-+#if defined(__NetBSD__)
-+	n = getvfsstat (NULL, 0, MNT_NOWAIT);
-+#else
- 	n = getfsstat (NULL, 0, MNT_NOWAIT);
-+#endif
- 	if (n == -1)
- 		return 0;
-+#if defined(__NetBSD__)
-+	size = n * sizeof (struct statvfs);
-+	stats = (struct statvfs *) g_malloc (size);
-+#else
- 	size = n * sizeof (struct statfs);
- 	stats = (struct statfs *) g_malloc (size);
-+#endif
- 	if (stats == NULL)
- 		return 0;
-+#if defined(__NetBSD__)
-+	if (getvfsstat (stats, size, MNT_NOWAIT) == -1){
-+#else
- 	if (getfsstat (stats, size, MNT_NOWAIT) == -1){
-+#endif
- 		g_free (stats);
- 		return 0;
- 	}
diff --git a/mono-git/patches/patch-mono_utils_mono-logger.c b/mono-git/patches/patch-mono_utils_mono-logger.c
deleted file mode 100644
index 16f4fd0..0000000
--- a/mono-git/patches/patch-mono_utils_mono-logger.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- mono/utils/mono-logger.c.orig	2016-08-08 17:23:32.000000000 +0000
-+++ mono/utils/mono-logger.c
-@@ -366,7 +366,7 @@ legacy_opener(const char *path, void *us
-  * Cleanup routine for older style loggers
-  */
- static void
--legacy_closer()
-+legacy_closer(void)
- {
- 	if (logCallback.user_data != NULL) {
- 		g_free (logCallback.user_data); /* This is a LegacyLoggerUserData struct */
diff --git a/mono-git/patches/patch-support_sys-mman.c b/mono-git/patches/patch-support_sys-mman.c
deleted file mode 100644
index 44d47eb..0000000
--- a/mono-git/patches/patch-support_sys-mman.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
---- support/sys-mman.c.orig	2016-08-08 17:23:32.000000000 +0000
-+++ support/sys-mman.c
-@@ -22,6 +22,11 @@
- #define __BSD_VISIBLE 1
- #endif
- 
-+#ifdef __NetBSD__
-+/* For mincore () */
-+#define _NETBSD_SOURCE
-+#endif
-+
- #include <sys/types.h>
- #include <sys/mman.h>
- #include <errno.h>


Home | Main Index | Thread Index | Old Index