Hello community, here is the log from the commit of package kde3-kaffeine for openSUSE:Factory checked in at 2012-06-19 21:42:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kde3-kaffeine (Old) and /work/SRC/openSUSE:Factory/.kde3-kaffeine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kde3-kaffeine", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/kde3-kaffeine/kde3-kaffeine.changes 2012-02-08 17:18:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kde3-kaffeine.new/kde3-kaffeine.changes 2012-06-19 21:42:26.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jun 18 22:01:19 UTC 2012 - [email protected] + +- fix build with xine-1.2 + +------------------------------------------------------------------- New: ---- kaffeine-0.8.8-kxinewidget.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde3-kaffeine.spec ++++++ --- /var/tmp/diff_new_pack.BZLpNc/_old 2012-06-19 21:42:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BZLpNc/_new 2012-06-19 21:42:28.000000000 +0200 @@ -15,20 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: kde3-kaffeine BuildRequires: kdelibs3-devel xine-devel xine-lib -%if %suse_version > 1001 BuildRequires: gstreamer010-plugins-base-devel -%else -BuildRequires: gstreamer-plugins-devel -%endif -%if %suse_version > 1110 BuildRequires: cdparanoia-devel -%else -BuildRequires: cdparanoia +%if %suse_version > 1210 +BuildRequires: libavutil-devel %endif Url: http://kaffeine.sourceforge.net/ License: GPL-2.0+ @@ -61,6 +53,7 @@ Patch10: kaffeine-tmpobject.diff Patch11: dvbaudio-fix-build.patch Patch12: old-paranoia.diff +Patch13: kaffeine-0.8.8-kxinewidget.patch %description Kaffeine plays all files and devices supported by Xine. For example, @@ -97,6 +90,7 @@ %patch10 %patch11 %patch12 +%patch13 cp %SOURCE5 po/ . /etc/opt/kde3/common_options update_admin ++++++ kaffeine-0.8.8-kxinewidget.patch ++++++ --- kaffeine/src/player-parts/xine-part/kxinewidget.cpp~ 2009-05-15 16:16:26.000000000 +0100 +++ kaffeine/src/player-parts/xine-part/kxinewidget.cpp 2012-02-25 23:45:45.000000000 +0000 @@ -2638,7 +2638,7 @@ int num; int i = 0; - urls = xine_get_autoplay_mrls(m_xineEngine, plugin.ascii(), &num); + urls = (char**)xine_get_autoplay_mrls(m_xineEngine, plugin.ascii(), &num); if (urls) { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
