[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.6.0really4.5.0-4-2-g8bf9ed7

Pino Toscano pino at alioth.debian.org
Sat Sep 10 14:03:48 UTC 2011


The following commit has been merged in the master branch:
commit 8bf9ed7862dba544501d9f8a6b6350de79f65a5e
Author: Pino Toscano <pino at debian.org>
Date:   Sat Sep 10 16:03:15 2011 +0200

    do not make X11 mandatory for phonon and its backends (#641111)
    
    patch findqt4_optional_x11.diff.
---
 debian/changelog                         |    3 +++
 debian/patches/findqt4_optional_x11.diff |   16 ++++++++++++++++
 debian/patches/series                    |    1 +
 3 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6d5ef69..2198446 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 phonon (4:4.6.0really4.5.0-5) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Do not make X11 mandatory for phonon and its backends (patch
+    findqt4_optional_x11.diff). (Closes: #641111)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 10 Sep 2011 15:14:26 +0200
 
diff --git a/debian/patches/findqt4_optional_x11.diff b/debian/patches/findqt4_optional_x11.diff
new file mode 100644
index 0000000..61a4869
--- /dev/null
+++ b/debian/patches/findqt4_optional_x11.diff
@@ -0,0 +1,16 @@
+Qt doesn't expose the X11 headers to the world, so no need to make it required.
+---
+ cmake/FindQt4.cmake |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/cmake/FindQt4.cmake
++++ b/cmake/FindQt4.cmake
+@@ -1427,7 +1427,7 @@ IF (QT4_QMAKE_FOUND)
+   IF(UNIX)
+     # on OS X X11 may not be required
+     IF (Q_WS_X11)
+-      FIND_PACKAGE(X11 REQUIRED)
++      FIND_PACKAGE(X11)
+     ENDIF (Q_WS_X11)
+     FIND_PACKAGE(Threads)
+     SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
diff --git a/debian/patches/series b/debian/patches/series
index 953d98d..0ac5673 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ phonon-inc.patch
 no_rpath.patch
 phonon_is_not_forced_in_KDE.diff
 upstream_PHONON_EXPORT_DEPRECATED.diff
+findqt4_optional_x11.diff

-- 
Phonon Multimedia Framework packaging



More information about the pkg-kde-commits mailing list