Author: arekm                        Date: Sun May 13 15:05:57 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; fix plugin path (from archlinux)

---- Files affected:
packages/phonon:
   phonon.spec (1.60 -> 1.61) , fix-plugindir-for-qt-app.patch (NONE -> 1.1)  
(NEW)

---- Diffs:

================================================================
Index: packages/phonon/phonon.spec
diff -u packages/phonon/phonon.spec:1.60 packages/phonon/phonon.spec:1.61
--- packages/phonon/phonon.spec:1.60    Thu Jan 19 08:34:13 2012
+++ packages/phonon/phonon.spec Sun May 13 17:05:52 2012
@@ -1,16 +1,17 @@
 # $Revision$, $Date$
-%define                qtver           4.7.4
+%define                qtver           4.8.1
 
 Summary:       Phonon: multimedia API for Qt4/KDE4
 Summary(pl.UTF-8):     Phonon - biblioteka multimedialna dla Qt4/KDE4
 Name:          phonon
 Version:       4.6.0
-Release:       2
+Release:       3
 License:       LGPL v2.1 or LGPL v3
 Group:         X11/Libraries
 Source0:       
ftp://ftp.kde.org/pub/kde/stable/phonon/%{version}/src/%{name}-%{version}.tar.xz
 # Source0-md5: bbe0c1c62ed14c31479c4c1a6cf1e173
 Patch0:                %{name}-pkg.patch
+Patch1:                fix-plugindir-for-qt-app.patch
 URL:           http://phonon.kde.org/
 BuildRequires: QtCore-devel >= %{qtver}
 BuildRequires: QtDBus-devel >= %{qtver}
@@ -73,6 +74,8 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+
 
 %build
 install -d build
@@ -131,6 +134,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.61  2012/05/13 15:05:52  arekm
+- rel 3; fix plugin path (from archlinux)
+
 Revision 1.60  2012/01/19 07:34:13  arekm
 - release 2
 

================================================================
Index: packages/phonon/fix-plugindir-for-qt-app.patch
diff -u /dev/null packages/phonon/fix-plugindir-for-qt-app.patch:1.1
--- /dev/null   Sun May 13 17:05:57 2012
+++ packages/phonon/fix-plugindir-for-qt-app.patch      Sun May 13 17:05:52 2012
@@ -0,0 +1,11 @@
+--- a/phonon/CMakeLists.txt
++++ b/phonon/CMakeLists.txt
+@@ -78,7 +78,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})
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/phonon/phonon.spec?r1=1.60&r2=1.61

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to