File otp_src_19.0-lib-wx.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File otp_src_19.0-lib-wx.patch of Package erlang (Revision 66a224e208ffe9ee89602bad56a74dfa)

Currently displaying revision 66a224e208ffe9ee89602bad56a74dfa , Show latest

diff -Ndurp otp_src_19.0/lib/wx/c_src/Makefile.in otp_src_19.0-lib-wx/lib/wx/c_src/Makefile.in
--- otp_src_19.0/lib/wx/c_src/Makefile.in	2016-06-21 16:12:42.000000000 +0300
+++ otp_src_19.0-lib-wx/lib/wx/c_src/Makefile.in	2016-06-23 12:54:05.473830575 +0300
@@ -178,10 +178,10 @@ $(TARGET_DIR)/erl_gl$(SO_EXT): $(GL_OBJE
 # ----------------------------------------------------
 include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
 	$(INSTALL_DATA) ../priv/erlang-logo32.png "$(RELSYSDIR)/priv/"
 	$(INSTALL_DATA) ../priv/erlang-logo64.png "$(RELSYSDIR)/priv/"
-	$(INSTALL_PROGRAM) $(TARGET_DIR)/wxe_driver$(SO_EXT) "$(RELSYSDIR)/priv/"
-	$(INSTALL_PROGRAM) $(TARGET_DIR)/erl_gl$(SO_EXT) "$(RELSYSDIR)/priv/"
+	$(INSTALL_PROGRAM) $(TARGET_DIR)/wxe_driver$(SO_EXT) "$(RELSYSDIR)/priv/lib/"
+	$(INSTALL_PROGRAM) $(TARGET_DIR)/erl_gl$(SO_EXT) "$(RELSYSDIR)/priv/lib/"
 
 release_docs_spec:
diff -Ndurp otp_src_19.0/lib/wx/src/wx.erl otp_src_19.0-lib-wx/lib/wx/src/wx.erl
--- otp_src_19.0/lib/wx/src/wx.erl	2016-06-21 16:12:42.000000000 +0300
+++ otp_src_19.0-lib-wx/lib/wx/src/wx.erl	2016-06-23 12:54:30.888643975 +0300
@@ -71,8 +71,6 @@
 -export([create_memory/1, get_memory_bin/1,
 	 retain_memory/1, release_memory/1]).
 
--export([demo/0]).
-
 -export_type([wx_object/0, wx_env/0, wx_memory/0]).
 -export_type([wx_colour/0, wx_colour4/0, wx_datetime/0,
 	      wx_enum/0, wx_wxMouseState/0, wx_wxHtmlLinkInfo/0]).
@@ -330,18 +328,3 @@ set_debug(Level) when is_integer(Level)
 	    wxe_server:set_debug(Server,Level),
 	    ok
     end.
-
-%% @doc Starts a wxErlang demo if examples directory exists and is compiled
--spec demo() -> 'ok' | {'error', atom()}.
-demo() ->
-    Priv = code:priv_dir(wx),
-    Demo = filename:join([filename:dirname(Priv),examples,demo]),
-    Mod  = list_to_atom("demo"), %% Fool xref tests
-    case file:set_cwd(Demo) of
-	ok ->
-	    apply(Mod, start, []),
-	    ok;
-	_  ->
-	    {error, no_demo_dir}
-    end.
-
diff -Ndurp otp_src_19.0/lib/wx/src/wxe_util.erl otp_src_19.0-lib-wx/lib/wx/src/wxe_util.erl
--- otp_src_19.0/lib/wx/src/wxe_util.erl	2016-06-21 16:12:42.000000000 +0300
+++ otp_src_19.0-lib-wx/lib/wx/src/wxe_util.erl	2016-06-23 12:54:05.474830570 +0300
@@ -240,7 +240,7 @@ priv_dir(Driver0, Silent) ->
     Priv = case filelib:is_regular(Path) of
 	       true ->
 		   Beam = filename:join(["ebin/",atom_to_list(?MODULE) ++ ".beam"]),
-		   filename:join(strip(Path, Beam), "priv");
+		   filename:join(strip(Path, Beam), "priv/lib");
 	       false ->
 		   code:priv_dir(wx)
 	   end,

Places

File otp_src_19.0-lib-wx.patch of Package erlang (Revision 66a224e208ffe9ee89602bad56a74dfa)

Places