Hello community,

here is the log from the commit of package phonon for openSUSE:Factory checked 
in at 2013-05-16 11:23:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/phonon (Old)
 and      /work/SRC/openSUSE:Factory/.phonon.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "phonon"

Changes:
--------
--- /work/SRC/openSUSE:Factory/phonon/phonon.changes    2013-04-18 
10:40:52.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.phonon.new/phonon.changes       2013-05-16 
11:23:20.000000000 +0200
@@ -1,0 +2,7 @@
+Tue May 14 16:01:45 UTC 2013 - d...@dominik-schmidt.de
+
+- Add phonon-4.6.0-find-backends-outside-of-kde-session.diff:
+  Fixes loading of plugins outside of KDE sessions although the
+  plugins are installed in the KDE dir
+
+-------------------------------------------------------------------

New:
----
  phonon-4.6.0-find-backends-outside-of-kde-session.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ phonon.spec ++++++
--- /var/tmp/diff_new_pack.cBQq7h/_old  2013-05-16 11:23:20.000000000 +0200
+++ /var/tmp/diff_new_pack.cBQq7h/_new  2013-05-16 11:23:20.000000000 +0200
@@ -34,6 +34,9 @@
 BuildRequires:  xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
+# PATCH-FIX-UPSTREAM: taken from master
+Patch0:         phonon-4.6.0-find-backends-outside-of-kde-session.diff
+
 %description
 Phonon is a cross-platform portable multimedia support abstraction,
 which allows you to play multiple audio or video formats with the same

++++++ phonon-4.6.0-find-backends-outside-of-kde-session.diff ++++++
commit ce33564f5fb11351246bf4e83e93dd545ea0fe99
Author: Rex Dieter <rdie...@fedoraproject.org>
Date:   Fri Jan 6 08:48:56 2012 -0500

    Upstream fedora patch that fixes platform plugin loading that is outside of 
a kde session

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 08652b7..d2ecbd2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -85,7 +85,7 @@ if (PHONON_NO_PLATFORMPLUGIN)
     add_definitions(-DQT_NO_PHONON_PLATFORMPLUGIN)
 endif (PHONON_NO_PLATFORMPLUGIN)
 
-add_definitions(-DPHONON_LIBRARY_PATH="${PLUGIN_INSTALL_DIR}/plugins")
+add_definitions(-DPHONON_LIBRARY_PATH="${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_DIR}/plugins")
 
 automoc4_add_library(phonon SHARED ${phonon_LIB_SRCS})
 target_link_libraries(phonon ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to