Hello community, here is the log from the commit of package kde3-amarok for openSUSE:Factory checked in at 2012-06-18 16:31:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kde3-amarok (Old) and /work/SRC/openSUSE:Factory/.kde3-amarok.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kde3-amarok", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/kde3-amarok/kde3-amarok.changes 2012-05-14 16:14:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kde3-amarok.new/kde3-amarok.changes 2012-06-18 16:31:48.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jun 18 13:31:17 UTC 2012 - an...@opensuse.org + +- fix build with xine-1.2 + +------------------------------------------------------------------- New: ---- amarok-gentoo-1.4.10-xinelib-1.2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde3-amarok.spec ++++++ --- /var/tmp/diff_new_pack.UhxRxe/_old 2012-06-18 16:31:50.000000000 +0200 +++ /var/tmp/diff_new_pack.UhxRxe/_new 2012-06-18 16:31:50.000000000 +0200 @@ -24,6 +24,9 @@ BuildRequires: libnjb-devel BuildRequires: libmtp-devel BuildRequires: kdebindings3-javascript-devel libusb-devel +%if %suse_version > 1210 +BuildRequires: libavutil-devel +%endif Url: http://amarok.kde.org License: GPL-2.0 Group: Productivity/Multimedia/Sound/Players @@ -65,6 +68,7 @@ Patch29: amarok-wiki-utf-fix.patch Patch30: amarok-1.4.10-alt-ruby19.patch Patch31: amarok-1.4.10-alt-mongrel.patch +Patch32: amarok-gentoo-1.4.10-xinelib-1.2.patch %description Amarok is a media player for all kinds of media. This includes MP3, Ogg @@ -157,6 +161,7 @@ %patch30 -p2 %patch31 -p1 %endif +%patch32 sed -i 1i\ '#include <cstddef>' amarok/src/magnatunebrowser/magnatuneredownloaddialog.h sed -i 's|WFlags|Qt::WFlags|g' amarok/src/magnatunebrowser/magnatuneredownloaddialog.h ++++++ amarok-gentoo-1.4.10-xinelib-1.2.patch ++++++ --- amarok/src/engine/xine/xine-engine.cpp~ 2008-08-13 22:21:51.000000000 +0100 +++ amarok/src/engine/xine/xine-engine.cpp 2012-02-26 08:46:25.000000000 +0000 @@ -1148,7 +1148,7 @@ emit statusText(i18n("Getting AudioCD contents...")); - xine_urls = xine_get_autoplay_mrls(m_xine, "CD", &num); + xine_urls = (char**)xine_get_autoplay_mrls(m_xine, "CD", &num); if (xine_urls) { while (xine_urls[i]) { -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
