Attachment 155203 Details for Bug 199177 – patch: Disables TR1 support, converts to c++11

[patch] patch: Disables TR1 support, converts to c++11

wx30.patch (text/plain), 3.52 KB, created by John Marino on 2015-04-05 18:07:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Marino

Created: 2015-04-05 18:07:57 UTC

Size: 3.52 KB

patch

obsolete

>Index: x11-toolkits/wxgtk30/Makefile
>===================================================================
>--- x11-toolkits/wxgtk30/Makefile	(revision 382989)
>+++ x11-toolkits/wxgtk30/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	wx
> PORTVERSION=	3.0.2
>-PORTREVISION?=	2
>+PORTREVISION?=	3
> CATEGORIES=	x11-toolkits
> MASTER_SITES=	SF/wxwindows/${PORTVERSION}
> PKGNAMESUFFIX=	30-gtk2
>@@ -39,6 +39,7 @@
> CONFIGURE_ENV=	X11BASE="${LOCALBASE}" \
> 		ac_cv_header_sys_inotify_h=no
> CPPFLAGS+=	-I${LOCALBASE}/include
>+CXXFLAGS+=	-std=c++11
> LIBS+=		-L${LOCALBASE}/lib
> 
> OPTIONS_DEFINE=	GSTREAMER MSPACK NLS
>Index: x11-toolkits/wxgtk30/files/patch-configure
>===================================================================
>--- x11-toolkits/wxgtk30/files/patch-configure	(revision 382989)
>+++ x11-toolkits/wxgtk30/files/patch-configure	(working copy)
>@@ -1,23 +1,33 @@
>---- configure.orig	2011-12-15 01:42:11.000000000 +0700
>-+++ configure	2012-05-15 22:49:14.000000000 +0700
>-@@ -27119,6 +27119,7 @@
>+--- configure.orig	2014-10-06 21:33:44 UTC
>++++ configure
>+@@ -3947,7 +3947,7 @@ case "${host}" in
>  
>+     DEFAULT_DEFAULT_wxUSE_MOTIF=1
>+   ;;
>+-  *-*-freebsd*)
>++  *-*-dragonfly*|*-*-freebsd*)
>+     USE_BSD=1
>+     USE_FREEBSD=1
>+     $as_echo "#define __FREEBSD__ 1" >>confdefs.h
>+@@ -21894,6 +21894,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
>  
>+ 
>  SEARCH_INCLUDE="\
> +    $X11BASE/include          \
>      /usr/local/include        \
>      /usr/local/X11/include    \
>      /usr/local/include/X11    \
>-@@ -42877,7 +42878,7 @@
>+@@ -31852,9 +31853,6 @@ $as_echo "$as_me: WARNING: BeOS threads 
>+                                         THREAD_OPTS="-pthreads $THREAD_OPTS"
>                  fi
>                  ;;
>-           *-*-freebsd*)
>+-          *-*-freebsd*)
> -                                                THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
>-+                                                THREAD_OPTS="$PTHREAD_LIBS"
>-                 ;;
>+-                ;;
>            *-*-darwin* | *-*-cygwin* )
>                                                  THREAD_OPTS=""
>-@@ -45535,7 +45536,7 @@
>+                 ;;
>+@@ -33127,7 +33125,7 @@ else
>          fi
>      fi
>  fi
>@@ -25,4 +35,20 @@
> +OPTIMISE_CFLAGS=
>  
>  if test "x$WXWIN_COMPATIBILITY_2_6" = "xyes"; then
>-     cat >>confdefs.h <<\_ACEOF
>+     $as_echo "#define WXWIN_COMPATIBILITY_2_6 1" >>confdefs.h
>+@@ -39390,6 +39388,7 @@ EOF
>+       ;;
>+ 
>+       powerpc-apple-macos* | \
>++      *-*-dragonfly* | \
>+       *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \
>+       *-*-mirbsd* | \
>+       *-*-sunos4* | \
>+@@ -39432,6 +39431,7 @@ EOF
>+ 
>+     case "${BAKEFILE_HOST}" in
>+       *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
>++      *-*-dragonfly* | \
>+       *-*-k*bsd*-gnu | *-*-mirbsd* | *-*-gnu* )
>+         if test "x$SUNCXX" = "xyes"; then
>+             SONAME_FLAG="-h "
>Index: x11-toolkits/wxgtk30/files/patch-setup.h.in
>===================================================================
>--- x11-toolkits/wxgtk30/files/patch-setup.h.in	(revision 0)
>+++ x11-toolkits/wxgtk30/files/patch-setup.h.in	(working copy)
>@@ -0,0 +1,20 @@
>+--- setup.h.in.orig	2014-10-06 21:33:44 UTC
>++++ setup.h.in
>+@@ -757,17 +757,14 @@
>+ /*
>+  * Define if your compiler has std::tr1::unordered_map
>+  */
>+-#undef HAVE_TR1_UNORDERED_MAP
>+ 
>+ /*
>+  * Define if your compiler has std::tr1::unordered_set
>+  */
>+-#undef HAVE_TR1_UNORDERED_SET
>+ 
>+ /*
>+  * Define if your compiler has <tr1/type_traits>
>+  */
>+-#undef HAVE_TR1_TYPE_TRAITS
>+ 
>+ /*
>+  * Define if your compiler has <type_traits>

Actions: View | Diff

Attachments on bug 199177: 155203 | 155204