From d9f068cd3416a6888afd3d72eb664610362d56bf565f3eb39cf57b062e6369fd Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 5 Feb 2008 01:05:31 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kaffeine?expand=0&rev=14 --- kaffeine-tmpobject.diff | 12 ++++++++++++ kaffeine.changes | 5 +++++ kaffeine.spec | 8 ++++++-- 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 kaffeine-tmpobject.diff diff --git a/kaffeine-tmpobject.diff b/kaffeine-tmpobject.diff new file mode 100644 index 0000000..b16584a --- /dev/null +++ b/kaffeine-tmpobject.diff @@ -0,0 +1,12 @@ +--- kaffeine/src/player-parts/xine-part/kxinewidget.cpp ++++ kaffeine/src/player-parts/xine-part/kxinewidget.cpp +@@ -2970,7 +2970,8 @@ void KXineWidget::setStreamSaveDir(const + if (!xine_config_lookup_entry(m_xineEngine, "misc.save_dir", &config)) return; /* older xine-lib */ + + debugOut(QString("Set misc.save_dir to: %1").arg(dir)); +- config.str_value = QFile::encodeName(dir).data(); ++ QCString edir = QFile::encodeName(dir); ++ config.str_value = edir.data(); + xine_config_update_entry (m_xineEngine, &config); + } + diff --git a/kaffeine.changes b/kaffeine.changes index e204b6f..12eb231 100644 --- a/kaffeine.changes +++ b/kaffeine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 4 22:04:26 CET 2008 - schwab@suse.de + +- Fix use of temporary object. + ------------------------------------------------------------------- Sun Jan 27 08:58:32 CET 2008 - stbinner@suse.de diff --git a/kaffeine.spec b/kaffeine.spec index a165d05..3ace55e 100644 --- a/kaffeine.spec +++ b/kaffeine.spec @@ -22,7 +22,7 @@ License: GPL v2 or later Group: Productivity/Multimedia/Video/Players Summary: Xine-Based Multimedia Player Version: 0.8.6 -Release: 1 +Release: 5 %define rversion %version BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) @@ -42,6 +42,7 @@ Patch4: mutex.diff Patch5: kaffeine-media.diff Patch8: kaffeine-quote-subs.patch Patch9: pedantic.diff +Patch10: kaffeine-tmpobject.diff %description Kaffeine plays all files and devices supported by Xine. For example, @@ -81,6 +82,7 @@ Authors: #%patch5 %patch8 %patch9 +%patch10 cp %SOURCE5 po/ . /etc/opt/kde3/common_options update_admin @@ -144,6 +146,8 @@ kde_post_install %endif %changelog +* Mon Feb 04 2008 schwab@suse.de +- Fix use of temporary object. * Sun Jan 27 2008 stbinner@suse.de - update to 0.8.6: * xine-part: added fastforward/slowmotion dcop calls, escape @@ -406,7 +410,7 @@ kde_post_install * Mon Aug 25 2003 adrian@suse.de - fix configure script to detect libXtest -> no DPMS anymore during playing -* Sat Aug 23 2003 adrian@suse.de +* Sun Aug 24 2003 adrian@suse.de - drop some delete calls, which are reported as invalid by valgrind seems that fixes the crashes * Mon Jul 28 2003 adrian@suse.de