[python-pyside] upstream candidate fix for FTBFS

Rex Dieter rdieter at fedoraproject.org
Wed Sep 4 14:09:26 UTC 2013


commit 81e56a97033f08d97f3db3dbb316a1fac999e85c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Sep 4 09:08:59 2013 -0500

    upstream candidate fix for FTBFS

 pyside-qt4.8+1.2.1-PYSIDE-172.patch |   20 ++++++++++++++++++++
 python-pyside.spec                  |    5 +++++
 2 files changed, 25 insertions(+), 0 deletions(-)
---
diff --git a/pyside-qt4.8+1.2.1-PYSIDE-172.patch b/pyside-qt4.8+1.2.1-PYSIDE-172.patch
new file mode 100644
index 0000000..86f346d
--- /dev/null
+++ b/pyside-qt4.8+1.2.1-PYSIDE-172.patch
@@ -0,0 +1,20 @@
+diff -up pyside-qt4.8+1.2.1/PySide/QtGui/CMakeLists.txt.PYSIDE-172 pyside-qt4.8+1.2.1/PySide/QtGui/CMakeLists.txt
+--- pyside-qt4.8+1.2.1/PySide/QtGui/CMakeLists.txt.PYSIDE-172	2013-08-12 16:24:05.000000000 -0500
++++ pyside-qt4.8+1.2.1/PySide/QtGui/CMakeLists.txt	2013-09-04 09:02:04.544514264 -0500
+@@ -403,7 +403,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui
+ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qworkspace_wrapper.cpp
+ 
+ ${SPECIFIC_OS_FILES}
+-${QPYTEXTOBJECT_MOC}
+ ${QtGui_46_SRC}
+ ${QtGui_47_SRC}
+ ${QtGui_OPTIONAL_SRC}
+@@ -434,7 +433,7 @@ create_pyside_module(QtGui
+                      QtGui_deps
+                      QtGui_typesystem_path
+                      QtGui_SRC
+-                     ""
++                     QPYTEXTOBJECT_MOC
+                      ${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml)
+ 
+ install(FILES ${pyside_SOURCE_DIR}/qpytextobject.h DESTINATION include/PySide/QtGui/)
diff --git a/python-pyside.spec b/python-pyside.spec
index 3d244e8..44afa35 100644
--- a/python-pyside.spec
+++ b/python-pyside.spec
@@ -9,6 +9,9 @@ License:        LGPLv2
 URL:            http://www.pyside.org
 Source0:        http://download.qt-project.org/official_releases/pyside/pyside-qt4.8+%{version}.tar.bz2
 
+# https://bugreports.qt-project.org/browse/PYSIDE-172
+Patch1: pyside-qt4.8+1.2.1-PYSIDE-172.patch
+
 BuildRequires:  cmake
 BuildRequires:  generatorrunner-devel
 BuildRequires:  phonon-devel
@@ -49,6 +52,8 @@ developing applications that use %{name}.
 %prep
 %setup -q -n pyside-qt4.8+%{version}
 
+%patch1 -p1 -b .PYSIDE-172
+
 # Fix up unit tests to use lrelease-qt4
 sed -i -e "s/lrelease /lrelease-qt4 /" tests/QtCore/translation_test.py
 


More information about the scm-commits mailing list