pkgsrc-WIP-changes archive

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

mono-git: Eliminate merged patches



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Mon Aug 8 23:28:46 2016 +0200
Changeset:	896eca64cc815d96807d4e68f9ae5c6dda783003

Modified Files:
	mono-git/distinfo
Removed Files:
	mono-git/patches/patch-eglib_configure.ac
	mono-git/patches/patch-mono_utils_Makefile.am
	mono-git/patches/patch-mono_utils_mono-threads-netbsd.c

Log Message:
mono-git: Eliminate merged patches

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

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

diffstat:
 mono-git/distinfo                                  |  3 ---
 mono-git/patches/patch-eglib_configure.ac          | 22 ------------------
 mono-git/patches/patch-mono_utils_Makefile.am      | 12 ----------
 .../patches/patch-mono_utils_mono-threads-netbsd.c | 27 ----------------------
 4 files changed, 64 deletions(-)

diffs:
diff --git a/mono-git/distinfo b/mono-git/distinfo
index c9136ee..de6a3af 100644
--- a/mono-git/distinfo
+++ b/mono-git/distinfo
@@ -4,8 +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_configure.ac) = e9cac305765024018f01271786ed80ee7c44b814
 SHA1 (patch-eglib_src_giconv.c) = b56e6d328f614d7f70e156a2458b11b36b439f28
-SHA1 (patch-mono_utils_Makefile.am) = b3bf378d1576c98262dce0a1b08bf45d013fa323
 SHA1 (patch-mono_utils_mono-logger.c) = 280e1bf49b79adf57823723287dbc88639d13551
-SHA1 (patch-mono_utils_mono-threads-netbsd.c) = 244d88cd407bc28f498bb2e35b44304a7c911325
diff --git a/mono-git/patches/patch-eglib_configure.ac b/mono-git/patches/patch-eglib_configure.ac
deleted file mode 100644
index 447bf0a..0000000
--- a/mono-git/patches/patch-eglib_configure.ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
---- eglib/configure.ac.orig	2016-08-08 17:23:32.000000000 +0000
-+++ eglib/configure.ac
-@@ -140,7 +140,7 @@ AC_CHECK_FUNCS(fork execv execve)
- 
- AC_ARG_WITH([overridable-allocators], [  --with-overridable-allocators	allow g_*alloc/g_free to call custom allocators set via g_mem_set_vtable])
- 
--if test x$with_overridable_allocators == xyes; then
-+if test x$with_overridable_allocators = xyes; then
- 	AC_DEFINE(ENABLE_OVERRIDABLE_ALLOCATORS,1,[Overridable allocator support enabled])
-   AC_MSG_NOTICE([Overridable allocator support enabled])
- else
-@@ -160,7 +160,7 @@ elif test x$target_ios = xno; then
- AC_CHECK_FUNCS(strndup getpwuid_r)
- fi
- 
--AM_CONDITIONAL(NEED_VASPRINTF, test x$ac_cv_func_vasprintf = xno || test x$with_overridable_allocators == xyes)
-+AM_CONDITIONAL(NEED_VASPRINTF, test x$ac_cv_func_vasprintf = xno || test x$with_overridable_allocators = xyes)
- AM_ICONV()
- AC_SEARCH_LIBS(sqrtf, m)
- 
diff --git a/mono-git/patches/patch-mono_utils_Makefile.am b/mono-git/patches/patch-mono_utils_Makefile.am
deleted file mode 100644
index a0d4248..0000000
--- a/mono-git/patches/patch-mono_utils_Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- mono/utils/Makefile.am.orig	2016-04-16 14:26:45.000000000 +0000
-+++ mono/utils/Makefile.am
-@@ -109,6 +109,7 @@ monoutils_sources = \
- 	mono-threads-windows.c	\
- 	mono-threads-linux.c	\
- 	mono-threads-freebsd.c	\
-+	mono-threads-netbsd.c	\
- 	mono-threads-openbsd.c	\
- 	mono-threads-android.c	\
- 	mono-threads.h	\
diff --git a/mono-git/patches/patch-mono_utils_mono-threads-netbsd.c b/mono-git/patches/patch-mono_utils_mono-threads-netbsd.c
deleted file mode 100644
index 6b9b5cc..0000000
--- a/mono-git/patches/patch-mono_utils_mono-threads-netbsd.c
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
---- mono/utils/mono-threads-netbsd.c.orig	2016-04-17 23:57:00.441950443 +0000
-+++ mono/utils/mono-threads-netbsd.c
-@@ -0,0 +1,22 @@
-+#include <config.h>
-+
-+#if defined(__NetBSD__)
-+
-+#include <mono/utils/mono-threads.h>
-+#include <pthread.h>
-+
-+void
-+mono_threads_core_get_stack_bounds (guint8 **staddr, size_t *stsize)
-+{
-+       pthread_attr_t attr;
-+
-+       *staddr = NULL;
-+       *stsize = (size_t)-1;
-+
-+       pthread_attr_init (&attr);
-+       pthread_attr_get_np (pthread_self (), &attr);
-+
-+       pthread_attr_getstack (&attr, (void**)staddr, stsize);
-+       pthread_attr_destroy (&attr);
-+}
-+#endif


Home | Main Index | Thread Index | Old Index