rev 18575 - in trunk/packages/phonon/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2010-07-24 16:20:32 +0000 (Sat, 24 Jul 2010)
New Revision: 18575

Added:
   trunk/packages/phonon/debian/patches/04_add_phonon_qt_config.diff
Modified:
   trunk/packages/phonon/debian/changelog
   trunk/packages/phonon/debian/patches/series
Log:
Add 04_add_phonon_qt_config.diff
define Phonon module when Qt is built without Phonon and Phonon is
installed separately (needs Qt >= 4.7.0~beta2-3 to work).


Modified: trunk/packages/phonon/debian/changelog
===================================================================
--- trunk/packages/phonon/debian/changelog	2010-07-23 22:10:00 UTC (rev 18574)
+++ trunk/packages/phonon/debian/changelog	2010-07-24 16:20:32 UTC (rev 18575)
@@ -1,3 +1,11 @@
+phonon (4:4.6.0really4.4.2-2) UNRELEASED; urgency=low
+
+  * Add 04_add_phonon_qt_config.diff:
+    define Phonon module when Qt is built without Phonon and Phonon is
+    installed separately (needs Qt >= 4.7.0~beta2-3 to work).
+
+ -- Fathi Boudra <fabo at debian.org>  Sat, 24 Jul 2010 19:15:47 +0300
+
 phonon (4:4.6.0really4.4.2-1) unstable; urgency=low
 
   * New upstream release:

Added: trunk/packages/phonon/debian/patches/04_add_phonon_qt_config.diff
===================================================================
--- trunk/packages/phonon/debian/patches/04_add_phonon_qt_config.diff	                        (rev 0)
+++ trunk/packages/phonon/debian/patches/04_add_phonon_qt_config.diff	2010-07-24 16:20:32 UTC (rev 18575)
@@ -0,0 +1,19 @@
+Description: Qt applications do not recognize the availability of Phonon if Qt
+             is built without Phonon and Phonon is installed separately.
+             This patch needs Qt >= 4.7.0~beta2-3
+Author: Fathi Boudra <fabo at debian.org>
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -268,4 +268,6 @@ if(NOT WIN32) # pkgconfig file
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/phonon.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+ endif(NOT WIN32)
+ 
++install(FILES qt_phonon.pri DESTINATION  ${QT_MKSPECS_DIR}/modules)
++
+ macro_display_feature_log()
+--- /dev/null
++++ b/qt_phonon.pri
+@@ -0,0 +1,2 @@
++#configuration
++QT_CONFIG *= phonon

Modified: trunk/packages/phonon/debian/patches/series
===================================================================
--- trunk/packages/phonon/debian/patches/series	2010-07-23 22:10:00 UTC (rev 18574)
+++ trunk/packages/phonon/debian/patches/series	2010-07-24 16:20:32 UTC (rev 18575)
@@ -1,3 +1,4 @@
 01_phonon-inc.patch
 02_no_rpath.patch
 03_phonon_is_not_forced_in_KDE.diff
+04_add_phonon_qt_config.diff