projects / packages / amarok.git / blame
| Commit | Line | Data |
|---|---|---|
| a6dedee5 ER |
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 | |
| 3 | @@ -30,9 +30,6 @@ | |
| 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; | |
| 12 | return; | |
| c4468fc4 ER |
13 | --- amarok-1.4.9.1/amarok/src/mediadevice/daap/Makefile.am 2008-05-03 20:43:00.885572020 +0300 |
| 14 | +++ amarok-1.4.9.1/amarok/src/mediadevice/daap/Makefile.am 2008-05-03 20:47:24.272751916 +0300 | |
| 15 | @@ -36,10 +36,10 @@ | |
| 16 | ||
| 17 | bin_SCRIPTS = amarok_daapserver.rb | |
| 18 | ||
| 19 | -SUBDIRS = daapreader mongrel | |
| 20 | +SUBDIRS = daapreader | |
| c76c5ffd ER |
21 | |
| 22 | amarokrubylibdir = \ | |
| 23 | - $(kde_datadir)/amarok/ruby_lib | |
| 24 | + $(ruby_rubylibdir)/amarok | |
| 25 | ||
| 26 | amarokrubylib_DATA = \ | |
| 27 | codes.rb | |
| 28 | --- amarok-1.4.9.1/amarok/src/mediadevice/daap/amarok_daapserver.rb~ 2008-04-10 23:16:37.000000000 +0300 | |
| 29 | +++ amarok-1.4.9.1/amarok/src/mediadevice/daap/amarok_daapserver.rb 2008-05-03 20:43:49.504374104 +0300 | |
| 30 | @@ -3,15 +3,10 @@ | |
| 31 | #A DAAP Server | |
| 32 | # (c) 2006 Ian Monroe <ian@monroe.nu> | |
| 33 | # License: GNU General Public License V2 | |
| 34 | -$LOAD_PATH.push(ARGV[0]) | |
| 35 | -puts "here it is: #{ARGV[0]}" | |
| 36 | -$LOAD_PATH.push(ARGV[1]) | |
| 37 | -puts "here it is: #{ARGV[1]}" | |
| 38 | ||
| 39 | -require "codes.rb" | |
| 40 | +require "amarok/codes" | |
| 41 | require 'mongrel' | |
| 42 | -require "#{ARGV[2]}" #debug.rb | |
| 43 | - | |
| 44 | +require "amarok/debug" | |
| 45 | require 'uri' | |
| 46 | require 'pp' | |
| 47 | #require 'ruby-prof' | |
| 48 | --- amarok-1.4.9.1/amarok/src/scripts/ruby_debug/Makefile.am~ 2008-04-10 23:16:37.000000000 +0300 | |
| 49 | +++ amarok-1.4.9.1/amarok/src/scripts/ruby_debug/Makefile.am 2008-05-03 20:44:52.908028283 +0300 | |
| 50 | @@ -1,5 +1,5 @@ | |
| 51 | rubydebugdir = \ | |
| 52 | - $(kde_datadir)/amarok/scripts/ruby_debug | |
| 53 | + $(ruby_rubylibdir)/amarok | |
| 54 | ||
| 55 | rubydebug_DATA = \ | |
| 56 | debug.rb | |
| 7f23f7df ER |
57 | --- amarok-1.4.9.1/amarok/src/scripts/lyrics_lyrc/lyrics_lyrc.rb~ 2008-05-03 20:49:32.000000000 +0300 |
| 58 | +++ amarok-1.4.9.1/amarok/src/scripts/lyrics_lyrc/lyrics_lyrc.rb 2008-05-04 13:10:28.364031973 +0300 | |
| 59 | @@ -12,7 +12,7 @@ | |
| 60 | ||
| 61 | require "net/http" | |
| 62 | require "rexml/document" | |
| 63 | -# require File.dirname( File.expand_path( __FILE__ ) ) + "/../ruby_debug/debug.rb" | |
| 796d5c5d | 64 | +# require "amarok/debug" |
| 7f23f7df ER |
65 | require "uri" |
| 66 | ||
| 67 | @app_name = "Lyrics_Lyrc" |