[PyQt4] avoid startswith to make python3 happy

Rex Dieter rdieter at fedoraproject.org
Thu Nov 14 20:54:02 UTC 2013


commit 75eca97a38fc57f62004846e179bba52c1e49a07
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Nov 14 14:54:07 2013 -0600

    avoid startswith to make python3 happy

 PyQt-x11-gpl-4.10.3-phonon_detect.patch |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/PyQt-x11-gpl-4.10.3-phonon_detect.patch b/PyQt-x11-gpl-4.10.3-phonon_detect.patch
index d9ed609..7257b4c 100644
--- a/PyQt-x11-gpl-4.10.3-phonon_detect.patch
+++ b/PyQt-x11-gpl-4.10.3-phonon_detect.patch
@@ -1,6 +1,6 @@
 diff -up PyQt-x11-gpl-4.10.3/configure.py.phonon_detect PyQt-x11-gpl-4.10.3/configure.py
---- PyQt-x11-gpl-4.10.3/configure.py.phonon_detect	2013-11-14 14:12:50.437564346 -0600
-+++ PyQt-x11-gpl-4.10.3/configure.py	2013-11-14 14:13:41.230630403 -0600
+--- PyQt-x11-gpl-4.10.3/configure.py.phonon_detect	2013-11-14 14:52:49.201970637 -0600
++++ PyQt-x11-gpl-4.10.3/configure.py	2013-11-14 14:53:35.976106443 -0600
 @@ -69,6 +69,7 @@ pydbusmoddir = None
  dbusincdirs = []
  dbuslibdirs = []
@@ -9,20 +9,19 @@ diff -up PyQt-x11-gpl-4.10.3/configure.py.phonon_detect PyQt-x11-gpl-4.10.3/conf
  
  
  # Under Windows qmake and the Qt DLLs must be on the system PATH otherwise the
-@@ -340,6 +341,12 @@ class ConfigurePyQt4:
+@@ -340,6 +341,11 @@ class ConfigurePyQt4:
              ass_lib_dirs = None
              ass_libs = None
  
 +        phonon_sout = get_command_stdout("pkg-config --cflags-only-I phonon")
 +        phonon_iflags = phonon_sout.read().strip()
 +        for f in phonon_iflags.split():
-+            if f.startswith("-I"):
-+                phononincdirs.append(f[2:])
++            phononincdirs.append(f[2:])
 +
          # Note that the order in which we check is important for the
          # consolidated module - a module's dependencies must be checked first.
          pyqt_modules.append("QtCore")
-@@ -372,7 +379,7 @@ class ConfigurePyQt4:
+@@ -372,7 +378,7 @@ class ConfigurePyQt4:
          check_module("QtWebKit", "qwebpage.h", "new QWebPage()")
          check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()")
          check_module("phonon", "phonon/videowidget.h",


More information about the scm-commits mailing list