[Python-modules-commits] r15691 - in packages/pyside/trunk/debian/patches (2 files)

[odyx-guest at users.alioth.debian.org]

    Date: Monday, February 14, 2011 @ 16:52:16
  Author: odyx-guest
Revision: 15691

Remove 0d60daf_fix_phonon_VideoCaptureDevice_detection.patch: was from upstream.

Modified:
  packages/pyside/trunk/debian/patches/series
Deleted:
  packages/pyside/trunk/debian/patches/u_0d60daf_fix_phonon_VideoCaptureDevice_detection.patch

Modified: packages/pyside/trunk/debian/patches/series
===================================================================
--- packages/pyside/trunk/debian/patches/series	2011-02-14 16:51:02 UTC (rev 15690)
+++ packages/pyside/trunk/debian/patches/series	2011-02-14 16:52:16 UTC (rev 15691)
@@ -1,4 +1,3 @@
-u_0d60daf_fix_phonon_VideoCaptureDevice_detection.patch
 libPythonVersionPostfix.patch
 usePySpecificShiboken.patch
 lessBuildVerbosity.patch

Deleted: packages/pyside/trunk/debian/patches/u_0d60daf_fix_phonon_VideoCaptureDevice_detection.patch
===================================================================
--- packages/pyside/trunk/debian/patches/u_0d60daf_fix_phonon_VideoCaptureDevice_detection.patch	2011-02-14 16:51:02 UTC (rev 15690)
+++ packages/pyside/trunk/debian/patches/u_0d60daf_fix_phonon_VideoCaptureDevice_detection.patch	2011-02-14 16:52:16 UTC (rev 15691)
@@ -1,32 +0,0 @@
-From 0d60daf1e1a6edd95b58c7bdd33da8f4c1629c90 Mon Sep 17 00:00:00 2001
-From: Kalev Lember <kalev at smartlink.ee>
-Date: Fri, 26 Nov 2010 23:31:14 +0200
-Subject: [PATCH] Fix phonon VideoCaptureDevice detection to properly use phonon_ namespace
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-Fixes build with phonon 4.4.3 on Fedora rawhide.
-
-Reviewer: Renato Araújo <renato.filho at openbossa.org>
-          Hugo Parente Lima <hugo.pl at gmail.com>
----
- cmake/Macros/PySideModules.cmake |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/cmake/Macros/PySideModules.cmake b/cmake/Macros/PySideModules.cmake
-index 639a0ab..1686df8 100644
---- a/cmake/Macros/PySideModules.cmake
-+++ b/cmake/Macros/PySideModules.cmake
-@@ -58,7 +58,7 @@ macro(check_qt_class module class global_sources)
-     endif ()
-     string(TOLOWER ${class} _class)
-     string(TOUPPER ${module} _module)
--    if (${namespace})
-+    if (_namespace)
-         set(_cppfile ${CMAKE_CURRENT_BINARY_DIR}/PySide/${module}/${_namespace}_${_class}_wrapper.cpp)
-     else ()
-         set(_cppfile ${CMAKE_CURRENT_BINARY_DIR}/PySide/${module}/${_class}_wrapper.cpp)
--- 
-1.6.1
-