Attachment 182032 Details for Bug 193481 – svn-diff-open-vm-tools

[patch] svn-diff-open-vm-tools

svn-diff_open-vm-tools (text/plain), 3.57 KB, created by Walter Schwarzenfeld on 2017-04-24 05:26:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2017-04-24 05:26:51 UTC

Size: 3.57 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 439265)
>+++ Makefile	(working copy)
>@@ -18,7 +18,7 @@
> RELEASE_VER=		10.1.0
> BUILD_VER=		4449150
> 
>-OPTIONS_DEFINE=		X11 LIBNOTIFY UNITY FUSE DNET ICU
>+OPTIONS_DEFINE=		X11 LIBNOTIFY UNITY FUSE DNET ICU UNWIND
> OPTIONS_DEFAULT=	X11 LIBNOTIFY FUSE DNET ICU
> OPTIONS_SUB=
> 
>@@ -25,6 +25,7 @@
> DNET_DESC=		libdnet support
> LIBNOTIFY_DESC=		Desktop notification support
> UNITY_DESC=		liburiparser support
>+UNWIND_DESC=		Prevent use of unwind.h if libunwind is installed
> 
> # TODO add USE_GITHUB=yes after switching to USES=autoreconf
> 
>@@ -72,8 +73,10 @@
> CONFLICTS=		open-vm-tools-nox11-[0-9]*
> .else
> CONFLICTS=		open-vm-tools-[0-9]*
>+EXTRA_PATCHES=          ${PATCHDIR}/extrapatch-libvmtools_i18n_c
> .endif
> 
>+
> ONLY_FOR_ARCHS=		i386 amd64
> 
> CONFIGURE_ENV+=		SYSDIR=${SRC_BASE}/sys
>@@ -80,6 +83,10 @@
> 
> .include <bsd.port.pre.mk>
> 
>+.if !${PORT_OPTIONS:MUNWIND}
>+EXTRA_PATCHES=	${PATCHDIR}/extrapatch-lib_user_utilBacktrace_c
>+.endif
>+
> post-build:
> 	cd ${WRKSRC}/modules && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS}
> 
>Index: files/extrapatch-lib_user_utilBacktrace_c
>===================================================================
>--- files/extrapatch-lib_user_utilBacktrace_c	(nonexistent)
>+++ files/extrapatch-lib_user_utilBacktrace_c	(working copy)
>@@ -0,0 +1,11 @@
>+--- lib/user/utilBacktrace.c.orig	2017-04-24 04:26:22 UTC
>++++ lib/user/utilBacktrace.c
>+@@ -53,7 +53,7 @@
>+ #include "str.h"
>+ 
>+ #ifdef VM_X86_64
>+-#   if defined(__GNUC__) && (!defined(USING_AUTOCONF) || defined(HAVE_UNWIND_H))
>++#   if defined(__GNUC__) && (!defined(USING_AUTOCONF) || defined(HAVE_UNWIND_H)) &&  !defined(__FreeBSD__)
>+ #      define UTIL_BACKTRACE_USE_UNWIND
>+ #   endif
>+ #endif
>
>Property changes on: files/extrapatch-lib_user_utilBacktrace_c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/extrapatch-libvmtools_i18n_c
>===================================================================
>--- files/extrapatch-libvmtools_i18n_c	(nonexistent)
>+++ files/extrapatch-libvmtools_i18n_c	(working copy)
>@@ -0,0 +1,32 @@
>+--- libvmtools/i18n.c.orig	2016-02-19 06:42:04 UTC
>++++ libvmtools/i18n.c
>+@@ -35,9 +35,11 @@
>+ #include "hashTable.h"
>+ #include "str.h"
>+ #include "unicode.h"
>++#include "unicodeBase.h"
>+ #include "vmtoolsInt.h"
>+ #include "vmware/tools/i18n.h"
>+ #include "vmware/tools/utils.h"
>++#include "xdrutil.h"
>+ 
>+ /* These come from msgid.h. See MsgHasMsgID for explanation. */
>+ #define MSG_MAX_ID      128
>+@@ -61,6 +63,8 @@ typedef struct MsgState {
>+ static MsgState *gMsgState = NULL;
>+ 
>+ 
>++#define DIRSEPS "/"
>++
>+ /*
>+  ******************************************************************************
>+  * MsgCatalogFree --                                                    */ /**
>+@@ -114,6 +118,7 @@ MsgHasMsgID(const gchar *s)
>+ }
>+ 
>+ 
>++
>+ /*
>+  ******************************************************************************
>+  * MsgInitState --                                                      */ /**
>+
>
>Property changes on: files/extrapatch-libvmtools_i18n_c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 193481: 167168 | 167169 | 167170 | 180368 | 182032