1 --- amarok-1.4.9.1/amarok/src/mediadevice/daap/daapserver.cpp~ 2008-04-10 23:16:37.000000000 +0300
2 +++ amarok-1.4.9.1/amarok/src/mediadevice/daap/daapserver.cpp 2008-05-03 20:38:40.854585305 +0300
4 m_server = new KProcIO();
5 m_server->setComm( KProcess::All );
6 *m_server << "amarok_daapserver.rb";
7 - *m_server << locate( "data", "amarok/ruby_lib/" );
8 - *m_server << locate( "lib", "ruby_lib/" );
9 - *m_server << locate( "data", "amarok/scripts/ruby_debug/debug.rb" );
10 if( !m_server->start( KProcIO::NotifyOnExit, true ) ) {
11 error() << "Failed to start amarok_daapserver.rb" << endl;
13 --- amarok-1.4.9.1/amarok/src/mediadevice/daap/Makefile.am~ 2008-05-03 20:42:53.000000000 +0300
14 +++ amarok-1.4.9.1/amarok/src/mediadevice/daap/Makefile.am 2008-05-03 20:43:00.885572020 +0300
16 SUBDIRS = daapreader mongrel
19 - $(kde_datadir)/amarok/ruby_lib
20 + $(ruby_rubylibdir)/amarok
22 amarokrubylib_DATA = \
24 --- amarok-1.4.9.1/amarok/src/mediadevice/daap/amarok_daapserver.rb~ 2008-04-10 23:16:37.000000000 +0300
25 +++ amarok-1.4.9.1/amarok/src/mediadevice/daap/amarok_daapserver.rb 2008-05-03 20:43:49.504374104 +0300
28 # (c) 2006 Ian Monroe <ian@monroe.nu>
29 # License: GNU General Public License V2
30 -$LOAD_PATH.push(ARGV[0])
31 -puts "here it is: #{ARGV[0]}"
32 -$LOAD_PATH.push(ARGV[1])
33 -puts "here it is: #{ARGV[1]}"
36 +require "amarok/codes"
38 -require "#{ARGV[2]}" #debug.rb
40 +require "amarok/debug"
44 --- amarok-1.4.9.1/amarok/src/scripts/ruby_debug/Makefile.am~ 2008-04-10 23:16:37.000000000 +0300
45 +++ amarok-1.4.9.1/amarok/src/scripts/ruby_debug/Makefile.am 2008-05-03 20:44:52.908028283 +0300
48 - $(kde_datadir)/amarok/scripts/ruby_debug
49 + $(ruby_rubylibdir)/amarok