[Python-modules-commits] r29169 - in packages/python-qt4/trunk/debian (3 files)
mitya57-guest at users.alioth.debian.org
mitya57-guest at users.alioth.debian.org
Sun Jun 1 08:36:02 UTC 2014
Date: Sunday, June 1, 2014 @ 08:36:01
Author: mitya57-guest
Revision: 29169
Backport add_pro_files.diff from upstream to make configure.py work.
Added:
packages/python-qt4/trunk/debian/patches/add_pro_files.diff
Modified:
packages/python-qt4/trunk/debian/changelog
packages/python-qt4/trunk/debian/patches/series
Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog 2014-05-31 18:52:48 UTC (rev 29168)
+++ packages/python-qt4/trunk/debian/changelog 2014-06-01 08:36:01 UTC (rev 29169)
@@ -2,6 +2,7 @@
* New upstream release.
* Drop qstring_conversion.diff, applied upstream.
+ * Backport add_pro_files.diff from upstream to make configure.py work.
* Refresh other patches.
* Bump required sip4 version to 4.16.
Added: packages/python-qt4/trunk/debian/patches/add_pro_files.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/add_pro_files.diff (rev 0)
+++ packages/python-qt4/trunk/debian/patches/add_pro_files.diff 2014-06-01 08:36:01 UTC (rev 29169)
@@ -0,0 +1,306 @@
+Description: add missing .pro files needed by configure.py
+Origin: upstream, changeset e8700c99e8da
+Last-Update: 2014-06-01
+
+--- a/qpy/QtCore/qpycore.pro
++++ b/qpy/QtCore/qpycore.pro
+@@ -0,0 +1,84 @@
++# This is the qmake project file for the QPy support code for the QtCore
++# module. Note that it is not required by configure-ng.py.
++#
++# Copyright (c) 2014 Riverbank Computing Limited <info at riverbankcomputing.com>
++#
++# This file is part of PyQt.
++#
++# This file may be used under the terms of the GNU General Public
++# License versions 2.0 or 3.0 as published by the Free Software
++# Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
++# included in the packaging of this file. Alternatively you may (at
++# your option) use any later version of the GNU General Public
++# License if such license has been publicly approved by Riverbank
++# Computing Limited (or its successors, if any) and the KDE Free Qt
++# Foundation. In addition, as a special exception, Riverbank gives you
++# certain additional rights. These rights are described in the Riverbank
++# GPL Exception version 1.1, which can be found in the file
++# GPL_EXCEPTION.txt in this package.
++#
++# If you are unsure which license is appropriate for your use, please
++# contact the sales department at sales at riverbankcomputing.com.
++#
++# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
++# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
++
++
++CONFIG += static warn_on
++TARGET = qpycore
++TEMPLATE = lib
++DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x04ffff
++
++# Python's type system relies on type punning.
++!win32: QMAKE_CXXFLAGS += -fno-strict-aliasing
++
++# This seems to be necessary for Qt v4.5.2.
++win32: INCLUDEPATH += .
++
++SOURCES = \
++ qpycore_qabstracteventdispatcher.cpp \
++ qpycore_chimera.cpp \
++ qpycore_chimera_signature.cpp \
++ qpycore_chimera_storage.cpp \
++ qpycore_classinfo.cpp \
++ qpycore_init.cpp \
++ qpycore_misc.cpp \
++ qpycore_post_init.cpp \
++ qpycore_pyqtboundsignal.cpp \
++ qpycore_pyqtconfigure.cpp \
++ qpycore_pyqtmethodproxy.cpp \
++ qpycore_pyqtproperty.cpp \
++ qpycore_pyqtproxy.cpp \
++ qpycore_pyqtpyobject.cpp \
++ qpycore_pyqtsignal.cpp \
++ qpycore_pyqtslot.cpp \
++ qpycore_qmetaobject.cpp \
++ qpycore_qmetaobject_helpers.cpp \
++ qpycore_qobject_getattr.cpp \
++ qpycore_qobject_helpers.cpp \
++ qpycore_qpynullvariant.cpp \
++ qpycore_qstring.cpp \
++ qpycore_qstringlist.cpp \
++ qpycore_sip_helpers.cpp \
++ qpycore_types.cpp \
++ qpycore_qvariant.cpp \
++ qpycore_qvariant_value.cpp
++
++HEADERS = \
++ qpycore_api.h \
++ qpycore_chimera.h \
++ qpycore_classinfo.h \
++ qpycore_misc.h \
++ qpycore_namespace.h \
++ qpycore_pyqtboundsignal.h \
++ qpycore_pyqtproperty.h \
++ qpycore_pyqtproxy.h \
++ qpycore_pyqtpyobject.h \
++ qpycore_pyqtsignal.h \
++ qpycore_pyqtmethodproxy.h \
++ qpycore_qmetaobjectbuilder.h \
++ qpycore_qobject_helpers.h \
++ qpycore_qpynullvariant.h \
++ qpycore_sip.h \
++ qpycore_sip_helpers.h \
++ qpycore_types.h
+--- a/qpy/QtDBus/qpydbus.pro
++++ b/qpy/QtDBus/qpydbus.pro
+@@ -0,0 +1,42 @@
++# This is the qmake project file for the QPy support code for the QtDBus
++# module. Note that it is not required by configure-ng.py.
++#
++# Copyright (c) 2014 Riverbank Computing Limited <info at riverbankcomputing.com>
++#
++# This file is part of PyQt.
++#
++# This file may be used under the terms of the GNU General Public
++# License versions 2.0 or 3.0 as published by the Free Software
++# Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
++# included in the packaging of this file. Alternatively you may (at
++# your option) use any later version of the GNU General Public
++# License if such license has been publicly approved by Riverbank
++# Computing Limited (or its successors, if any) and the KDE Free Qt
++# Foundation. In addition, as a special exception, Riverbank gives you
++# certain additional rights. These rights are described in the Riverbank
++# GPL Exception version 1.1, which can be found in the file
++# GPL_EXCEPTION.txt in this package.
++#
++# If you are unsure which license is appropriate for your use, please
++# contact the sales department at sales at riverbankcomputing.com.
++#
++# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
++# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
++
++
++QT += dbus
++CONFIG += static warn_on
++TARGET = qpydbus
++TEMPLATE = lib
++
++SOURCES = \
++ qpydbus_chimera_helpers.cpp \
++ qpydbus_post_init.cpp \
++ qpydbuspendingreply.cpp \
++ qpydbusreply.cpp
++
++HEADERS = \
++ qpydbus_api.h \
++ qpydbus_chimera_helpers.h \
++ qpydbuspendingreply.h \
++ qpydbusreply.h
+--- a/qpy/QtDeclarative/qpydeclarative.pro
++++ b/qpy/QtDeclarative/qpydeclarative.pro
+@@ -0,0 +1,43 @@
++# This is the qmake project file for the QPy support code for the QtDeclarative
++# module. Note that it is not required by configure-ng.py.
++#
++# Copyright (c) 2014 Riverbank Computing Limited <info at riverbankcomputing.com>
++#
++# This file is part of PyQt.
++#
++# This file may be used under the terms of the GNU General Public
++# License versions 2.0 or 3.0 as published by the Free Software
++# Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
++# included in the packaging of this file. Alternatively you may (at
++# your option) use any later version of the GNU General Public
++# License if such license has been publicly approved by Riverbank
++# Computing Limited (or its successors, if any) and the KDE Free Qt
++# Foundation. In addition, as a special exception, Riverbank gives you
++# certain additional rights. These rights are described in the Riverbank
++# GPL Exception version 1.1, which can be found in the file
++# GPL_EXCEPTION.txt in this package.
++#
++# If you are unsure which license is appropriate for your use, please
++# contact the sales department at sales at riverbankcomputing.com.
++#
++# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
++# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
++
++
++QT += declarative
++CONFIG += static warn_on
++TARGET = qpydeclarative
++TEMPLATE = lib
++
++SOURCES = \
++ qpydeclarative_chimera_helpers.cpp \
++ qpydeclarative_listwrapper.cpp \
++ qpydeclarative_post_init.cpp \
++ qpydeclarativelistproperty.cpp
++
++HEADERS = \
++ qpydeclarative_api.h \
++ qpydeclarative_chimera_helpers.h \
++ qpydeclarative_listwrapper.h \
++ qpydeclarativelistproperty.h \
++ qpydeclarativepropertyvaluesource.h
+--- a/qpy/QtDesigner/qpydesigner.pro
++++ b/qpy/QtDesigner/qpydesigner.pro
+@@ -0,0 +1,46 @@
++# This is the qmake project file for the QPy support code for the QtDesigner
++# module. Note that it is not required by configure-ng.py.
++#
++# Copyright (c) 2014 Riverbank Computing Limited <info at riverbankcomputing.com>
++#
++# This file is part of PyQt.
++#
++# This file may be used under the terms of the GNU General Public
++# License versions 2.0 or 3.0 as published by the Free Software
++# Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
++# included in the packaging of this file. Alternatively you may (at
++# your option) use any later version of the GNU General Public
++# License if such license has been publicly approved by Riverbank
++# Computing Limited (or its successors, if any) and the KDE Free Qt
++# Foundation. In addition, as a special exception, Riverbank gives you
++# certain additional rights. These rights are described in the Riverbank
++# GPL Exception version 1.1, which can be found in the file
++# GPL_EXCEPTION.txt in this package.
++#
++# If you are unsure which license is appropriate for your use, please
++# contact the sales department at sales at riverbankcomputing.com.
++#
++# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
++# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
++
++
++CONFIG += static plugin warn_on
++
++greaterThan(QT_MAJOR_VERSION, 4) {
++ QT += designer
++}
++
++lessThan(QT_MAJOR_VERSION, 5) {
++ CONFIG += designer
++}
++
++TARGET = qpydesigner
++TEMPLATE = lib
++
++HEADERS = \
++ qpydesignercontainerextension.h \
++ qpydesignercustomwidgetcollectionplugin.h \
++ qpydesignercustomwidgetplugin.h \
++ qpydesignermembersheetextension.h \
++ qpydesignerpropertysheetextension.h \
++ qpydesignertaskmenuextension.h
+--- a/qpy/QtGui/qpygui.pro
++++ b/qpy/QtGui/qpygui.pro
+@@ -0,0 +1,32 @@
++# This is the qmake project file for the QPy support code for the QtGui module.
++# Note that it is not required by configure-ng.py.
++#
++# Copyright (c) 2014 Riverbank Computing Limited <info at riverbankcomputing.com>
++#
++# This file is part of PyQt.
++#
++# This file may be used under the terms of the GNU General Public
++# License versions 2.0 or 3.0 as published by the Free Software
++# Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
++# included in the packaging of this file. Alternatively you may (at
++# your option) use any later version of the GNU General Public
++# License if such license has been publicly approved by Riverbank
++# Computing Limited (or its successors, if any) and the KDE Free Qt
++# Foundation. In addition, as a special exception, Riverbank gives you
++# certain additional rights. These rights are described in the Riverbank
++# GPL Exception version 1.1, which can be found in the file
++# GPL_EXCEPTION.txt in this package.
++#
++# If you are unsure which license is appropriate for your use, please
++# contact the sales department at sales at riverbankcomputing.com.
++#
++# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
++# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
++
++
++CONFIG += static warn_on
++TARGET = qpygui
++TEMPLATE = lib
++
++HEADERS = \
++ qpytextobject.h
+--- a/qpy/QtOpenGL/qpyopengl.pro
++++ b/qpy/QtOpenGL/qpyopengl.pro
+@@ -0,0 +1,37 @@
++# This is the qmake project file for the QPy support code for the QtOpenGL
++# module. Note that it is not required by configure-ng.py.
++#
++# Copyright (c) 2014 Riverbank Computing Limited <info at riverbankcomputing.com>
++#
++# This file is part of PyQt.
++#
++# This file may be used under the terms of the GNU General Public
++# License versions 2.0 or 3.0 as published by the Free Software
++# Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
++# included in the packaging of this file. Alternatively you may (at
++# your option) use any later version of the GNU General Public
++# License if such license has been publicly approved by Riverbank
++# Computing Limited (or its successors, if any) and the KDE Free Qt
++# Foundation. In addition, as a special exception, Riverbank gives you
++# certain additional rights. These rights are described in the Riverbank
++# GPL Exception version 1.1, which can be found in the file
++# GPL_EXCEPTION.txt in this package.
++#
++# If you are unsure which license is appropriate for your use, please
++# contact the sales department at sales at riverbankcomputing.com.
++#
++# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
++# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
++
++
++QT += opengl
++CONFIG += static warn_on
++TARGET = qpyopengl
++TEMPLATE = lib
++
++SOURCES = \
++ qpyopengl_attribute_array.cpp \
++ qpyopengl_uniform_value_array.cpp
++
++HEADERS = \
++ qpyopengl_api.h
Modified: packages/python-qt4/trunk/debian/patches/series
===================================================================
--- packages/python-qt4/trunk/debian/patches/series 2014-05-31 18:52:48 UTC (rev 29168)
+++ packages/python-qt4/trunk/debian/patches/series 2014-06-01 08:36:01 UTC (rev 29169)
@@ -1,3 +1,4 @@
+add_pro_files.diff
debian_configure_changes.diff
qreal_float_support.diff
config_flags.diff
More information about the Python-modules-commits
mailing list