Author: glen Date: Fri Apr 23 14:25:50 2010 GMT Module: packages Tag: AMAROK_1_4 ---- Log message: - ruby19 and gcc45 patches from devel-en by Andrzej Augustyński however no need to patch mongrel part, we use system ruby package there
---- Files affected: packages/amarok: amarok.spec (1.200.2.9 -> 1.200.2.10) , amarok-gcc45.patch (NONE -> 1.1.2.1) (NEW), amarok-ruby19.patch (NONE -> 1.1.2.1) (NEW) ---- Diffs: ================================================================ Index: packages/amarok/amarok.spec diff -u packages/amarok/amarok.spec:1.200.2.9 packages/amarok/amarok.spec:1.200.2.10 --- packages/amarok/amarok.spec:1.200.2.9 Sun Feb 28 22:19:38 2010 +++ packages/amarok/amarok.spec Fri Apr 23 16:25:45 2010 @@ -1,26 +1,28 @@ # $Revision$, $Date$ # TODO: # - create branch diff from http://gitorious.org/amarok/history -# - postgresql support alongside mysql # - NMM audio backend support (fix build - propably some BRs) # - make descriptions less useless # - track http://websvn.kde.org/trunk/extragear/multimedia/amarok/TODO?rev=470324&r1=470292&r2=470324 # - include /usr/bin/amarok_proxy.rb (proxy server for last.fm, but req. ruby) # - main package pulls /usr/bin/ruby # - monitor http://bugs.kde.org/show_bug.cgi?id=137390 to remove the temporary fix +# - monitor http://amarok-14.sourceforge.net/ for changes +# - monitor http://code.google.com/p/clementine-player/ for changes +# - monitor http://pana.bunnies.net/ for changes # - ProjectM (see README) # - karma & MFS (see README) # - needs autoconf < 2.64-3 to build (make patch) # # Conditional builds: %bcond_without xine # disable xine engine -%bcond_without zeroconf # disable support for zeroconf +%bcond_with zeroconf # enable support for zeroconf %bcond_without included_sqlite # don't use included sqlite (VERY BAD IDEA), needs sqlite >= 3.3 otherwise %bcond_without helix # disable HelixPlayer engine %bcond_without mp3players # disable iPod and iRiver MP3 players support %bcond_with nmm # enable NMM audio backend -%bcond_with mysql # enable MySQL support -%bcond_with pgsql # enable PostgreSQL support +%bcond_without mysql # disable MySQL support +%bcond_without pgsql # disable PostgreSQL support %ifarch i386 %undefine with_helix @@ -30,7 +32,7 @@ Summary(pl.UTF-8): Odtwarzacz audio dla KDE Name: amarok Version: 1.4.10 -Release: 13 +Release: 13.1 License: GPL Group: X11/Applications/Multimedia Source0: ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/%{name}-%{version}.tar.bz2 @@ -51,6 +53,8 @@ Patch11: gcc44.patch Patch12: coverfetcher.patch Patch13: amarok-ac.patch +Patch14: %{name}-ruby19.patch +Patch15: %{name}-gcc45.patch URL: http://amarok.kde.org/ # Upgrade to 2.0.1.1 required? # http://www.trapkit.de/advisories/TKADV2009-002.txt @@ -78,7 +82,7 @@ BuildRequires: pkgconfig BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.129 -BuildRequires: ruby-devel >= 1.8 +BuildRequires: ruby-devel >= 1.9 BuildRequires: sed >= 4.0 %{!?with_included_sqlite:BuildRequires: sqlite3-devel >= 3.3} BuildRequires: taglib-devel >= 1.4 @@ -224,6 +228,8 @@ %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 +%patch15 -p1 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;AudioVideo;Player;/' \ amarok/src/amarok.desktop \ @@ -379,13 +385,11 @@ %{_datadir}/services/amarok_xine-engine.desktop %endif -%if 0 %if %{with zeroconf} %files zeroconf %defattr(644,root,root,755) #%{_datadir}/apps/zeroconf/_shoutcast._tcp %endif -%endif %files scripts %defattr(644,root,root,755) @@ -469,6 +473,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.200.2.10 2010/04/23 14:25:45 glen +- ruby19 and gcc45 patches from devel-en by Andrzej Augustyński + however no need to patch mongrel part, we use system ruby package there + Revision 1.200.2.9 2010/02/28 21:19:38 glen - release 13 ================================================================ Index: packages/amarok/amarok-gcc45.patch diff -u /dev/null packages/amarok/amarok-gcc45.patch:1.1.2.1 --- /dev/null Fri Apr 23 16:25:50 2010 +++ packages/amarok/amarok-gcc45.patch Fri Apr 23 16:25:45 2010 @@ -0,0 +1,12 @@ +--- amarok-1.4.10/amarok/src/osd.h.orig 2008-08-13 23:21:51.000000000 +0200 ++++ amarok-1.4.10/amarok/src/osd.h 2010-04-21 15:50:05.000000000 +0200 +@@ -37,7 +37,7 @@ + + public slots: + /** calls setText() then show(), after setting image if needed */ +- void show( const QString &text, QImage newImage = QImage::QImage() ); ++ void show( const QString &text, QImage newImage = QImage() ); + void ratingChanged( const short rating ); + void ratingChanged( const QString& path, int rating ); + void volChanged( unsigned char volume ); + ================================================================ Index: packages/amarok/amarok-ruby19.patch diff -u /dev/null packages/amarok/amarok-ruby19.patch:1.1.2.1 --- /dev/null Fri Apr 23 16:25:50 2010 +++ packages/amarok/amarok-ruby19.patch Fri Apr 23 16:25:45 2010 @@ -0,0 +1,62 @@ +--- amarok-1.4.10/amarok/configure.in.in.orig 2008-08-13 23:21:51.000000000 +0200 ++++ amarok-1.4.10/amarok/configure.in.in 2010-04-21 15:25:11.000000000 +0200 +@@ -1082,7 +1082,9 @@ + + AC_PATH_PROG(RUBY, ruby, no) + +-ruby_includes=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["archdir"] )'`] ++rubyhdrdir=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["rubyhdrdir"] )'`] ++rubyhdrdirarch=[$rubyhdrdir/`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["arch"] )'`] ++ruby_includes=["$rubyhdrdir -I$rubyhdrdirarch"] + ruby_ldflags=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["LIBRUBYARG_SHARED"] )'`] + + AC_SUBST(ruby_includes) +--- amarok-1.4.10/amarok/src/mediadevice/daap/mongrel/http11/http11.c 2008-08-13 22:21:51.000000000 +0100 ++++ amarok-1.4.10/amarok/src/mediadevice/daap/mongrel/http11/http11.c.new 2009-09-24 12:38:59.254559471 +0100 +@@ -74,7 +74,7 @@ + f = rb_str_dup(global_http_prefix); + f = rb_str_buf_cat(f, field, flen); + +- for(ch = RSTRING(f)->ptr, end = ch + RSTRING(f)->len; ch < end; ch++) { ++ for(ch = RSTRING_PTR(f), end = ch + RSTRING_LEN(f); ch < end; ch++) { + if(*ch == '-') { + *ch = '_'; + } else { +@@ -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) { +- colon = strchr(RSTRING(temp)->ptr, ':'); ++ colon = strchr(RSTRING_PTR(temp), ':'); + 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_name, rb_str_substr(temp, 0, colon - RSTRING_PTR(temp))); + rb_hash_aset(req, global_server_port, +- rb_str_substr(temp, colon - RSTRING(temp)->ptr+1, +- RSTRING(temp)->len)); ++ rb_str_substr(temp, colon - RSTRING_PTR(temp)+1, ++ RSTRING_LEN(temp))); + } else { + rb_hash_aset(req, global_server_name, temp); + rb_hash_aset(req, global_server_port, global_port_80); +@@ -281,8 +281,8 @@ + DATA_GET(self, http_parser, http); + + from = FIX2INT(start); +- dptr = RSTRING(data)->ptr; +- dlen = RSTRING(data)->len; ++ dptr = RSTRING_PTR(data); ++ dlen = RSTRING_LEN(data); + + if(from >= dlen) { + rb_raise(eHttpParserError, "Requested start is after data buffer end."); +@@ -512,7 +512,7 @@ + if(pref_len == 1 && uri_str[0] == '/') { + rb_ary_push(result, uri); + } else { +- rb_ary_push(result, rb_str_substr(uri, pref_len, RSTRING(uri)->len)); ++ rb_ary_push(result, rb_str_substr(uri, pref_len, RSTRING_LEN(uri))); + } + + rb_ary_push(result, (VALUE)handler); + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/amarok/amarok.spec?r1=1.200.2.9&r2=1.200.2.10&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
