OpenPKG Specs / file comparison

comparison: erlang/erlang.patch

erlang/erlang.patch

changeset 781
25504c2d46b1
parent 780
0a61f30eebd4
equal deleted inserted replaced
0:fc28e1970ab6 1:b0d2408b90b3
1 Index: erts/emulator/Makefile.in
2 --- erts/emulator/Makefile.in.orig 2010-12-07 16:07:22.000000000 +0100
3 +++ erts/emulator/Makefile.in 2010-12-09 17:06:47.000000000 +0100
4 @@ -617,7 +617,7 @@
5
6
7 $(OBJDIR)/%.o: beam/%.c
8 - $(CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
9 + $(CC) $(INCLUDES) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) -c $< -o $@
10
11 $(OBJDIR)/%.o: $(TARGET)/%.c
12 $(CC) $(CFLAGS) $(INCLUDES) -Idrivers/common -c $< -o $@
13 Index: erts/emulator/hipe/hipe_x86.c 1 Index: erts/emulator/hipe/hipe_x86.c
14 --- erts/emulator/hipe/hipe_x86.c.orig 2010-12-07 16:07:22.000000000 +0100 2 --- erts/emulator/hipe/hipe_x86.c.orig 2010-12-07 16:07:22.000000000 +0100
15 +++ erts/emulator/hipe/hipe_x86.c 2010-12-09 17:23:16.000000000 +0100 3 +++ erts/emulator/hipe/hipe_x86.c 2010-12-09 17:23:16.000000000 +0100
16 @@ -130,7 +130,7 @@ 4 @@ -130,7 +130,7 @@
17 abort(); 5 abort();
37 25
38 void ei_init_resolve(void) 26 void ei_init_resolve(void)
39 Index: lib/gs/src/tool_utils.erl 27 Index: lib/gs/src/tool_utils.erl
40 --- lib/gs/src/tool_utils.erl.orig 2010-12-07 16:07:22.000000000 +0100 28 --- lib/gs/src/tool_utils.erl.orig 2010-12-07 16:07:22.000000000 +0100
41 +++ lib/gs/src/tool_utils.erl 2010-12-09 17:23:16.000000000 +0100 29 +++ lib/gs/src/tool_utils.erl 2010-12-09 17:23:16.000000000 +0100
42 @@ -40,6 +40,9 @@ 30 @@ -45,6 +45,9 @@
43 }). 31 }).
44 32
45 33
46 +%% Browser executable list (openURL command line protocol required) 34 +%% Browser executable list (openURL command line protocol required)
47 +-define(BROWSERS, ["netscape", "mozilla", "MozillaFirebird", "opera", "firefox", "seamonkey"]). 35 +-define(BROWSERS, ["netscape", "mozilla", "MozillaFirebird", "opera", "firefox", "seamonkey"]).
48 + 36 +
49 %%---------------------------------------------------------------------- 37 %%----------------------------------------------------------------------
50 %% open_help(Parent, File) 38 %% open_help(Parent, File)
51 %% Parent = gsobj() (GS root object or parent window) 39 %% Parent = gsobj() (GS root object or parent window)
52 @@ -80,7 +83,7 @@ 40 @@ -85,7 +88,7 @@
53 {unix,Type} -> 41 {unix,Type} ->
54 case Type of 42 case Type of
55 darwin -> "open " ++ File; 43 darwin -> "open " ++ File;
56 - _Else -> "netscape -remote \"openURL(file:" ++ File ++ ")\"" 44 - _Else -> "netscape -remote \"openURL(file:" ++ File ++ ")\""
57 + _Else -> unix_url_command("file:" ++ File) 45 + _Else -> unix_url_command("file:" ++ File)
58 end; 46 end;
59 {win32,_AnyType} -> 47 {win32,_AnyType} ->
60 "start " ++ filename:nativename(File); 48 "start " ++ filename:nativename(File);
61 @@ -95,7 +98,7 @@ 49 @@ -100,7 +103,7 @@
62 {unix,Type} -> 50 {unix,Type} ->
63 case Type of 51 case Type of
64 darwin -> "open " ++ File; 52 darwin -> "open " ++ File;
65 - _Else -> "netscape -remote \"openURL(file:" ++ File ++ ")\"" 53 - _Else -> "netscape -remote \"openURL(file:" ++ File ++ ")\""
66 + _Else -> unix_url_command("file:" ++ File) 54 + _Else -> unix_url_command("file:" ++ File)
67 end; 55 end;
68 {win32,_AnyType} -> 56 {win32,_AnyType} ->
69 "netscape.exe -h " ++ regexp:gsub(File,"\\\\","/"); 57 "netscape.exe -h " ++
70 @@ -429,3 +432,53 @@ 58 @@ -435,3 +438,53 @@
71 [Last]; 59 [Last];
72 insert_newlines(Other) -> 60 insert_newlines(Other) ->
73 Other. 61 Other.
74 + 62 +
75 +%% find_browser(BrowserList) => string() | false 63 +%% find_browser(BrowserList) => string() | false
133 hipe_graph_coloring_regalloc \ 121 hipe_graph_coloring_regalloc \
134 hipe_regalloc_loop \ 122 hipe_regalloc_loop \
135 Index: lib/stdlib/src/calendar.erl 123 Index: lib/stdlib/src/calendar.erl
136 --- lib/stdlib/src/calendar.erl.orig 2010-12-07 16:07:22.000000000 +0100 124 --- lib/stdlib/src/calendar.erl.orig 2010-12-07 16:07:22.000000000 +0100
137 +++ lib/stdlib/src/calendar.erl 2010-12-09 17:23:16.000000000 +0100 125 +++ lib/stdlib/src/calendar.erl 2010-12-09 17:23:16.000000000 +0100
138 @@ -216,11 +216,19 @@ 126 @@ -279,11 +279,19 @@
139 127 DateTime1 :: datetime1970(),
140 -spec local_time_to_universal_time_dst(t_datetime1970()) -> [t_datetime1970()]. 128 DateTime :: datetime1970().
141 local_time_to_universal_time_dst(DateTime) -> 129 local_time_to_universal_time_dst(DateTime) ->
142 - UtDst = erlang:localtime_to_universaltime(DateTime, true), 130 - UtDst = erlang:localtime_to_universaltime(DateTime, true),
143 - Ut = erlang:localtime_to_universaltime(DateTime, false), 131 - Ut = erlang:localtime_to_universaltime(DateTime, false),
144 %% Reverse check the universal times 132 %% Reverse check the universal times
145 - LtDst = erlang:universaltime_to_localtime(UtDst), 133 - LtDst = erlang:universaltime_to_localtime(UtDst),
157 + catch error:badarg -> {error, error} 145 + catch error:badarg -> {error, error}
158 + end, 146 + end,
159 %% Return the valid universal times 147 %% Return the valid universal times
160 case {LtDst,Lt} of 148 case {LtDst,Lt} of
161 {DateTime,DateTime} when UtDst =/= Ut -> 149 {DateTime,DateTime} when UtDst =/= Ut ->
162 Index: lib/tools/emacs/test.erl
163 Index: lib/wx/configure 150 Index: lib/wx/configure
164 --- lib/wx/configure.orig 2010-12-07 16:07:22.000000000 +0100 151 --- lib/wx/configure.orig 2010-12-07 16:07:22.000000000 +0100
165 +++ lib/wx/configure 2010-12-09 17:23:16.000000000 +0100 152 +++ lib/wx/configure 2010-12-09 17:23:16.000000000 +0100
166 @@ -3910,7 +3910,7 @@ 153 @@ -4065,7 +4065,7 @@
167 ;; 154 ;;
168 *) 155 *)
169 DEBUG_CFLAGS="-g -Wall -fPIC -DDEBUG $CFLAGS" 156 DEBUG_CFLAGS="-g -Wall -fPIC -DDEBUG $CFLAGS"
170 - CFLAGS="-g -Wall -O2 -fPIC -fomit-frame-pointer -fno-strict-aliasing $CFLAGS" 157 - CFLAGS="-g -Wall -O2 -fPIC -fomit-frame-pointer -fno-strict-aliasing $CFLAGS"
171 + CFLAGS="-Wall -fPIC -fomit-frame-pointer -fno-strict-aliasing $CFLAGS %%CFLAGS%%" 158 + CFLAGS="-Wall -fPIC -fomit-frame-pointer -fno-strict-aliasing $CFLAGS %%CFLAGS%%"
172 ;; 159 ;;
173 esac 160 esac
174

Mercurial Repository: OpenPKG Specs

Europalab SCM Repository Server

mercurial