rev 8553 - in branches/qt4-x11/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2007-12-26 19:53:27 +0000 (Wed, 26 Dec 2007)
New Revision: 8553

Added:
   branches/qt4-x11/debian/patches/09_install_phonon_gstreamer.diff
Modified:
   branches/qt4-x11/debian/changelog
   branches/qt4-x11/debian/control
   branches/qt4-x11/debian/libqt4-phonon.install
   branches/qt4-x11/debian/patches/08_load_ssl.diff
   branches/qt4-x11/debian/patches/series
Log:
* Add gstreamer0.10-plugins-good Recommends to libqt4-phonon.
* Enable patches 06, 07 and 08.
* Add patch to fix phonon_gstreamer plugin install.
* Install phonon gstreamer plugin.


Modified: branches/qt4-x11/debian/changelog
===================================================================
--- branches/qt4-x11/debian/changelog	2007-12-26 17:23:30 UTC (rev 8552)
+++ branches/qt4-x11/debian/changelog	2007-12-26 19:53:27 UTC (rev 8553)
@@ -22,8 +22,9 @@
     * Add DEB_DH_SHLIBDEPS_ARGS_ALL workaround.
     * Enable Phonon, WebKit and XmlPatterns.
     * Enable exceptions. It is a dependency to XmlPatterns module.
-  * Refresh patches: 01, 02, 03, 04, 05.
+  * Refresh patches: 01, 02, 03, 04, 05, 06, 07, 08.
   * Disable all other patches.
+  * Add patch to fix phonon_gstreamer plugin install.
   * Update .install files: libqt4-core, libqt4-gui and qt4-dev-tools.
   * Add packages: libqt4-dbus, libqt4-phonon , libqt4-webkit and
     libqt4-xmlpatterns.

Modified: branches/qt4-x11/debian/control
===================================================================
--- branches/qt4-x11/debian/control	2007-12-26 17:23:30 UTC (rev 8552)
+++ branches/qt4-x11/debian/control	2007-12-26 19:53:27 UTC (rev 8553)
@@ -169,6 +169,7 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: gstreamer0.10-plugins-good
 Description: Qt 4 Phonon module
  Qt is a cross-platform C++ application framework.  Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.

Modified: branches/qt4-x11/debian/libqt4-phonon.install
===================================================================
--- branches/qt4-x11/debian/libqt4-phonon.install	2007-12-26 17:23:30 UTC (rev 8552)
+++ branches/qt4-x11/debian/libqt4-phonon.install	2007-12-26 19:53:27 UTC (rev 8553)
@@ -1 +1,2 @@
 usr/lib/libphonon.so.*
+usr/lib/qt4/plugins/phonon_backend/libphonon_gstreamer.so
\ No newline at end of file

Modified: branches/qt4-x11/debian/patches/08_load_ssl.diff
===================================================================
--- branches/qt4-x11/debian/patches/08_load_ssl.diff	2007-12-26 17:23:30 UTC (rev 8552)
+++ branches/qt4-x11/debian/patches/08_load_ssl.diff	2007-12-26 19:53:27 UTC (rev 8553)
@@ -1,6 +1,6 @@
---- a/src/network/qsslsocket_openssl_symbols.cpp
-+++ b/src/network/qsslsocket_openssl_symbols.cpp
-@@ -247,7 +247,7 @@
+--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
++++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
+@@ -293,7 +293,7 @@
          return false;
      }
  #else
@@ -9,7 +9,7 @@
      if (!libssl.load()) {
          // Cannot find libssl
          qWarning("QSslSocket: cannot find ssl library: %s.",
-@@ -255,7 +255,7 @@
+@@ -301,7 +301,7 @@
          return false;
      }
  

Added: branches/qt4-x11/debian/patches/09_install_phonon_gstreamer.diff
===================================================================
--- branches/qt4-x11/debian/patches/09_install_phonon_gstreamer.diff	                        (rev 0)
+++ branches/qt4-x11/debian/patches/09_install_phonon_gstreamer.diff	2007-12-26 19:53:27 UTC (rev 8553)
@@ -0,0 +1,12 @@
+--- a/src/plugins/phonon/gstreamer/gstreamer.pro
++++ b/src/plugins/phonon/gstreamer/gstreamer.pro
+@@ -3,6 +3,9 @@
+ TARGET = phonon_gstreamer
+ DESTDIR = $$QT_BUILD_TREE/plugins/phonon_backend
+ 
++target.path += $$[QT_INSTALL_PLUGINS]/phonon_backend
++INSTALLS += target
++
+ DEPENDPATH += .
+ INCLUDEPATH += .
+ 

Modified: branches/qt4-x11/debian/patches/series
===================================================================
--- branches/qt4-x11/debian/patches/series	2007-12-26 17:23:30 UTC (rev 8552)
+++ branches/qt4-x11/debian/patches/series	2007-12-26 19:53:27 UTC (rev 8553)
@@ -22,9 +22,10 @@
 03_launch_moc-qt4.diff
 04_launch_uic-qt4.diff
 05_append_qt4_target.diff
-# 06_qtdemo_destdir.diff
-# 07_trust_dpkg-arch_over_uname-m.diff
-# 08_load_ssl.diff
+06_qtdemo_destdir.diff
+07_trust_dpkg-arch_over_uname-m.diff
+08_load_ssl.diff
+09_install_phonon_gstreamer.diff
 # 20_mips_atomic_ops.diff
 # #21_assume_no_fpu_for_embedded_devices.diff
 # 30_arm_ftbfs_fixes.diff