diff --git a/develop/erlang-otp/erlang-otp.desc b/develop/erlang-otp/erlang-otp.desc index fb4414324..4c7cdfede 100644 --- a/develop/erlang-otp/erlang-otp.desc +++ b/develop/erlang-otp/erlang-otp.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../erlang-otp/erlang-otp.desc -[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2011 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] [COPY] More information can be found in the files COPYING and README. @@ -30,8 +30,8 @@ [L] OpenSource [S] Stable -[V] R13B04 +[V] R14B02 [P] X -----5---9 800.000 -[D] 3442302929 otp_src_R13B04.tar.gz http://www.erlang.org/download/ -[D] 3349555149 otp_doc_man_R13B04.tar.gz http://erlang.org/download/ +[D] 3073096544 otp_src_R14B02.tar.gz http://www.erlang.org/download/ +[D] 900574544 otp_doc_man_R14B02.tar.gz http://erlang.org/download/ diff --git a/develop/erlang-otp/wx-CXX.patch b/develop/erlang-otp/wx-CXX.patch index d24481039..b4828ca13 100644 --- a/develop/erlang-otp/wx-CXX.patch +++ b/develop/erlang-otp/wx-CXX.patch @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../erlang-otp/wx-CXX.patch -# Copyright (C) 2010 The OpenSDE Project +# Copyright (C) 2010 - 2011 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -20,10 +20,9 @@ Description: This patch is renaming the CPP variable to CXX, which should be more standard behavior. -diff -ruN otp_src_R13B04-orig/lib/wx/c_src/Makefile.in otp_src_R13B04/lib/wx/c_src/Makefile.in ---- otp_src_R13B04-orig/lib/wx/c_src/Makefile.in 2010-02-19 19:05:57.000000000 +0100 -+++ otp_src_R13B04/lib/wx/c_src/Makefile.in 2010-08-23 13:54:00.028057277 +0200 -@@ -82,8 +82,8 @@ +--- otp_src_R14B02/lib/wx/c_src/Makefile.in.orig 2011-04-13 00:45:33.688077834 +0200 ++++ otp_src_R14B02/lib/wx/c_src/Makefile.in 2011-04-13 00:46:51.568078177 +0200 +@@ -86,8 +86,8 @@ COMMON_CFLAGS = @DEFS@ $(ERL_INCS) CC = @CC@ @@ -34,12 +33,12 @@ diff -ruN otp_src_R13B04-orig/lib/wx/c_src/Makefile.in otp_src_R13B04/lib/wx/c_s LDFLAGS = @LDFLAGS@ RESCOMP = @WX_RESCOMP@ -@@ -107,7 +107,7 @@ - endif +@@ -116,7 +116,7 @@ + GL_LIBS = @GL_LIBS@ - CC_O = $(CC) -c $(CFLAGS) $(COMMON_CFLAGS) --CPP_O = $(CPP) -c $(CPP_FLAGS) $(COMMON_CFLAGS) -+CPP_O = $(CXX) -c $(CPP_FLAGS) $(COMMON_CFLAGS) + CC_O = $(CC) -c $(CFLAGS) $(WX_CFLAGS) $(COMMON_CFLAGS) +-CPP_O = $(CPP) -c $(CXX_FLAGS) $(WX_CXX_FLAGS) $(COMMON_CFLAGS) ++CPP_O = $(CXX) -c $(CXX_FLAGS) $(WX_CXX_FLAGS) $(COMMON_CFLAGS) # Targets