Version: 1.4.3 (using KDE KDE 3.5.5) Installed from: Debian testing/unstable Packages Compiler: gcc version 4.1.2 20061020 (prerelease) (Debian 4.1.1-17) OS: Linux libhttp11.so is installed under /usr/share, when it should be in /usr/lib -- it's architecture-specific. This bug report was originally filed in the Debian bug tracker at http://bugs.debian.org/392392
Created attachment 18234 [details] Fix installation directory of libhttp11.so* This installs the .so* files into what seems to be the right directory to me. I'm not sure how to determine whether Amarok can still find the files at runtime, though -- I can't see which function uses these files.
SVN commit 598546 by aoliveira: Install libhttp11.so on the correct dir. Patch by Ted Percival <ted@midg3t.net>. Blame eean in case it breaks something. BUG: 136185 M +1 -1 Makefile.am --- trunk/extragear/multimedia/amarok/src/mediadevice/daap/mongrel/http11/Makefile.am #598545:598546 @@ -1,4 +1,4 @@ -amarokrubylibdir = $(kde_datadir)/amarok/ruby_lib +amarokrubylibdir = $(libexecdir)/ruby_lib amarokrubylib_LTLIBRARIES = libhttp11.la
SVN commit 598565 by aoliveira: Make it actually work CCBUG: 136185 M +13 -11 amarok_daapserver.rb M +1 -0 daapserver.cpp M +1 -1 mongrel/http11/Makefile.am --- trunk/extragear/multimedia/amarok/src/mediadevice/daap/amarok_daapserver.rb #598564:598565 @@ -5,10 +5,12 @@ # License: GNU General Public License V2 $LOAD_PATH.push(ARGV[0]) puts "here it is: #{ARGV[0]}" +$LOAD_PATH.push(ARGV[1]) +puts "here it is: #{ARGV[1]}" require "codes.rb" require 'mongrel' -require "#{ARGV[1]}" #debug.rb +require "#{ARGV[2]}" #debug.rb require 'uri' require 'pp' @@ -20,11 +22,11 @@ class Element attr_accessor :name - public + public def initialize(name, value = Array.new) @name, @value = name, value end - + def to_s( codes = nil ) if @value.nil? then log @name + ' is null' @@ -34,11 +36,11 @@ @name + Element.long_convert(content.length) + content end end - + def collection? @value.class == Array end - + def <<( child ) @value << child end @@ -47,7 +49,7 @@ @value.size end - def Element.char_convert( v ) + def Element.char_convert( v ) packing( v, 'c' ) end @@ -67,13 +69,13 @@ b[0] = v & 0xffffffff a.pack('N') + b.pack('N') end - + protected def valueToString( codes ) case CODE_TYPE[@name] when :string then @value - when :long then + when :long then Element.long_convert( @value ) when :container then values = String.new @@ -127,7 +129,7 @@ genre = Hash.new year = Hash.new device_paths = Hash.new - indexes = [ { :dbresult=> query( 'select * from album' ), :indexed => albums }, + indexes = [ { :dbresult=> query( 'select * from album' ), :indexed => albums }, { :dbresult=> query( 'select * from artist' ), :indexed => artists }, { :dbresult=> query( 'select * from genre' ) , :indexed => genre }, { :dbresult=> query( 'select * from year' ) , :indexed => year }, @@ -363,7 +365,7 @@ out end debugMethod(:query) - + def write_resp( response, value ) response.start do | head, out | head['DAAP-Server'] = 'amarok-kaylee' @@ -384,7 +386,7 @@ def initialize port = 3689 no_server = true - while no_server + while no_server begin server = Mongrel::HttpServer.new('0.0.0.0', port) no_server = false --- trunk/extragear/multimedia/amarok/src/mediadevice/daap/daapserver.cpp #598564:598565 @@ -31,6 +31,7 @@ m_server->setComm( KProcess::All ); *m_server << "amarok_daapserver.rb"; *m_server << locate( "data", "amarok/ruby_lib/" ); + *m_server << locate( "lib", "ruby_lib/" ); *m_server << locate( "data", "amarok/scripts/ruby_debug/debug.rb" ); if( !m_server->start( KProcIO::NotifyOnExit, true ) ) { error() << "Failed to start amarok_daapserver.rb" << endl; --- trunk/extragear/multimedia/amarok/src/mediadevice/daap/mongrel/http11/Makefile.am #598564:598565 @@ -1,4 +1,4 @@ -amarokrubylibdir = $(libexecdir)/ruby_lib +amarokrubylibdir = $(libdir)/ruby_lib amarokrubylib_LTLIBRARIES = libhttp11.la