Hello community, here is the log from the commit of package amarok checked in at Thu Sep 21 11:16:52 CEST 2006. -------- --- KDE/amarok/amarok.changes 2006-09-15 18:15:55.000000000 +0200 +++ amarok/amarok.changes 2006-09-18 16:45:52.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 18 16:45:40 CEST 2006 - dmueller@suse.de + +- fix build for SL < 10.2 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.RN5Hji/_old 2006-09-21 11:16:28.000000000 +0200 +++ /var/tmp/diff_new_pack.RN5Hji/_new 2006-09-21 11:16:28.000000000 +0200 @@ -29,7 +29,7 @@ Group: Productivity/Multimedia/Sound/Players Summary: Media Player for KDE Version: 1.4.3 -Release: 4 +Release: 6 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define mversion 0.5 Source0: %name-%version.tar.bz2 @@ -255,6 +255,8 @@ %endif %changelog -n amarok +* Mon Sep 18 2006 - dmueller@suse.de +- fix build for SL < 10.2 * Fri Sep 15 2006 - dmueller@suse.de - use system icons by default * Fri Sep 15 2006 - dmueller@suse.de ++++++ amarok.diff ++++++ --- /var/tmp/diff_new_pack.RN5Hji/_old 2006-09-21 11:16:29.000000000 +0200 +++ /var/tmp/diff_new_pack.RN5Hji/_new 2006-09-21 11:16:29.000000000 +0200 @@ -1,38 +1,140 @@ ---- amarok/src/amarok.desktop -+++ amarok/src/amarok.desktop -@@ -75,6 +75,7 @@ - Comment[nl]=Oom Rodney zegt, "10/10, Amarok is werkelijk fantastisch!" - Comment[pa]=ਅੰਕਲ ਰੋਡੀਨੇ ਕਹਿੰਦੇ ਹਨ, "10/10, ਅਮਰੋਕ ਸਹੀਂ 'ਚ ਸੁਪਰ ਹੈ!" - Comment[pl]=Wujek Dobra Rada twierdzi: "10/10, Amarok jest po prostu super!" -+InitialPreference=12 - Comment[pt]=O Tio Rodney diz, "10/10, Amarok é excelente!" - Comment[pt_BR]=O Tio Rodney diz: "10/10, o Amarok é mesmo muito bom!" - Comment[ru]=amaroK - просто лучший плеер. ---- amarok/src/enginecontroller.cpp -+++ amarok/src/enginecontroller.cpp -@@ -145,6 +145,11 @@ - QString query = "[X-KDE-Amarok-plugintype] == 'engine' and [X-KDE-Amarok-name] != '%1'"; - KTrader::OfferList offers = PluginManager::query( query.arg( engineName ) ); - -+ for( int n = offers.count()-1, i = 0; i < n; i++ ) -+ if ( offers[n]->property("X-KDE-amaroK-name") == "xine-engine" && -+ !QFile::exists("/usr/share/xine/mad") ) -+ offers[n]->property( "X-KDE-amaroK-rank" ) = "128"; -+ - // sort by rank, QValueList::operator[] is O(n), so this is quite inefficient - #define rank( x ) (x)->property( "X-KDE-Amarok-rank" ).toInt() - for( int n = offers.count()-1, i = 0; i < n; i++ ) ---- amarok/src/mediadevice/daap/mongrel/http11/Makefile.am -+++ amarok/src/mediadevice/daap/mongrel/http11/Makefile.am -@@ -4,10 +4,7 @@ - - amarokrubylib_DATA = http11.rb - --INCLUDES = \ -- -I$(ruby_includes) -- --CFLAGS = -Wall -+INCLUDES = -I$(ruby_includes) -Dinline=__inline__ +--- amarok/src/mediadevice/daap/mongrel/http11/http11.c ++++ amarok/src/mediadevice/daap/mongrel/http11/http11.c +@@ -392,7 +392,7 @@ + { + VALUE hash; - libhttp11_la_LDFLAGS = \ - -shared \ +- // we create an internal hash to protect stuff from the GC ++ /* we create an internal hash to protect stuff from the GC */ + hash = rb_hash_new(); + rb_ivar_set(self, id_handler_map, hash); + +@@ -508,23 +508,24 @@ + + handler = tst_search(uri_str, tst, &pref_len); + +- // setup for multiple return values ++ /* setup for multiple return values */ + result = rb_ary_new(); + + if(handler) { + rb_ary_push(result, rb_str_substr (uri, 0, pref_len)); +- // compensate for a script_name="/" where we need to add the "/" to path_info to keep it consistent ++ /* compensate for a script_name="/" where we need to add the "/" to path_info to keep it ++ * consistent */ + if(pref_len == 1 && uri_str[0] == '/') { +- // matches the root URI so we have to use the whole URI as the path_info ++ /* matches the root URI so we have to use the whole URI as the path_info */ + rb_ary_push(result, uri); + } else { +- // matches a script so process like normal ++ /* matches a script so process like normal */ + rb_ary_push(result, rb_str_substr(uri, pref_len, RSTRING(uri)->len)); + } + + rb_ary_push(result, (VALUE)handler); + } else { +- // not found so push back nothing ++ /* not found so push back nothing */ + rb_ary_push(result, Qnil); + rb_ary_push(result, Qnil); + rb_ary_push(result, Qnil); + +--- amarok/src/mediadevice/daap/mongrel/http11/http11.c ++++ amarok/src/mediadevice/daap/mongrel/http11/http11.c +@@ -72,7 +72,7 @@ + + v = rb_str_new(value, vlen); + f = rb_str_dup(global_http_prefix); +- f = rb_str_buf_cat(f, field, flen); ++ f = rb_str_buf_cat(f, field, flen); + + for(ch = RSTRING(f)->ptr, end = ch + RSTRING(f)->len; ch < end; ch++) { + if(*ch == '-') { +@@ -157,12 +157,12 @@ + + rb_hash_aset(req, global_gateway_interface, global_gateway_interface_value); + if((temp = rb_hash_aref(req, global_http_host)) != Qnil) { +- // ruby better close strings off with a '\0' dammit ++ /* ruby better close strings off with a '\0' dammit */ + colon = strchr(RSTRING(temp)->ptr, ':'); + if(colon != NULL) { + rb_hash_aset(req, global_server_name, rb_str_substr(temp, 0, colon - RSTRING(temp)->ptr)); +- rb_hash_aset(req, global_server_port, +- rb_str_substr(temp, colon - RSTRING(temp)->ptr+1, ++ rb_hash_aset(req, global_server_port, ++ rb_str_substr(temp, colon - RSTRING(temp)->ptr+1, + RSTRING(temp)->len)); + } else { + rb_hash_aset(req, global_server_name, temp); +@@ -170,7 +170,7 @@ + } + } + +- // grab the initial body and stuff it into an ivar ++ /* grab the initial body and stuff it into an ivar */ + rb_ivar_set(req, id_http_body, rb_str_new(at, length)); + rb_hash_aset(req, global_server_protocol, global_server_protocol_value); + rb_hash_aset(req, global_server_software, global_mongrel_version); +@@ -264,13 +264,13 @@ + * returning an Integer to indicate how much of the data has been read. No matter + * what the return value, you should call HttpParser#finished? and HttpParser#error? + * to figure out if it's done parsing or there was an error. +- * +- * This function now throws an exception when there is a parsing error. This makes +- * the logic for working with the parser much easier. You can still test for an ++ * ++ * This function now throws an exception when there is a parsing error. This makes ++ * the logic for working with the parser much easier. You can still test for an + * error, but now you need to wrap the parser with an exception handling block. + * + * The third argument allows for parsing a partial request and then continuing +- * the parsing from that position. It needs all of the original data as well ++ * the parsing from that position. It needs all of the original data as well + * so you have to append to the data buffer as you read. + */ + VALUE HttpParser_execute(VALUE self, VALUE req_hash, VALUE data, VALUE start) +@@ -350,7 +350,7 @@ + } + + +-void URIClassifier_free(void *data) ++void URIClassifier_free(void *data) + { + TRACE(); + +@@ -410,7 +410,7 @@ + * return SomeHandler immediatly, with no additional searches, but it will + * return path info with "/iwant". + * +- * You actually can reuse this class to register nearly anything and ++ * You actually can reuse this class to register nearly anything and + * quickly resolve it. This could be used for caching, fast mapping, etc. + * The downside is it uses much more memory than a Hash, but it can be + * a lot faster. It's main advantage is that it works on prefixes, which +@@ -469,20 +469,20 @@ + * uc.resolve("/someuri/pathinfo") -> "/someuri", "/pathinfo", handler + * uc.resolve("/notfound/orhere") -> nil, nil, nil + * uc.resolve("/") -> "/", "/", handler # if uc.register("/", handler) +- * uc.resolve("/path/from/root") -> "/", "/path/from/root", handler # if uc.register("/", handler) +- * ++ * uc.resolve("/path/from/root") -> "/", "/path/from/root", handler # if uc.register("/", handler) ++ * + * Attempts to resolve either the whole URI or at the longest prefix, returning + * the prefix (as script_info), path (as path_info), and registered handler + * (usually an HttpHandler). If it doesn't find a handler registered at the longest + * match then it returns nil,nil,nil. + * + * Because the resolver uses a trie you are able to register a handler at *any* character +- * in the URI and it will be handled as long as it's the longest prefix. So, if you ++ * in the URI and it will be handled as long as it's the longest prefix. So, if you + * registered handler #1 at "/something/lik", and #2 at "/something/like/that", then a + * a search for "/something/like" would give you #1. A search for "/something/like/that/too" + * would give you #2. +- * +- * This is very powerful since it means you can also attach handlers to parts of the ; ++ * ++ * This is very powerful since it means you can also attach handlers to parts of the ; + * (semi-colon) separated path params, any part of the path, use off chars, anything really. + * It also means that it's very efficient to do this only taking as long as the URI has + * characters. ++++++ default-engine.diff ++++++ --- /var/tmp/diff_new_pack.RN5Hji/_old 2006-09-21 11:16:29.000000000 +0200 +++ /var/tmp/diff_new_pack.RN5Hji/_new 2006-09-21 11:16:29.000000000 +0200 @@ -9,44 +9,4 @@ X-KDE-Amarok-version=1 X-KDE-Amarok-framework-version=27 ---- amarok/src/mediadevice/daap/mongrel/http11/http11.c -+++ amarok/src/mediadevice/daap/mongrel/http11/http11.c -@@ -392,7 +392,7 @@ - { - VALUE hash; - -- // we create an internal hash to protect stuff from the GC -+ /* we create an internal hash to protect stuff from the GC */ - hash = rb_hash_new(); - rb_ivar_set(self, id_handler_map, hash); - -@@ -508,23 +508,24 @@ - - handler = tst_search(uri_str, tst, &pref_len); - -- // setup for multiple return values -+ /* setup for multiple return values */ - result = rb_ary_new(); - - if(handler) { - rb_ary_push(result, rb_str_substr (uri, 0, pref_len)); -- // compensate for a script_name="/" where we need to add the "/" to path_info to keep it consistent -+ /* compensate for a script_name="/" where we need to add the "/" to path_info to keep it -+ * consistent */ - if(pref_len == 1 && uri_str[0] == '/') { -- // matches the root URI so we have to use the whole URI as the path_info -+ /* matches the root URI so we have to use the whole URI as the path_info */ - rb_ary_push(result, uri); - } else { -- // matches a script so process like normal -+ /* matches a script so process like normal */ - rb_ary_push(result, rb_str_substr(uri, pref_len, RSTRING(uri)->len)); - } - - rb_ary_push(result, (VALUE)handler); - } else { -- // not found so push back nothing -+ /* not found so push back nothing */ - rb_ary_push(result, Qnil); - rb_ary_push(result, Qnil); - rb_ary_push(result, Qnil); + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org