[Python-modules-commits] r3148 - in /packages/python-qt4/trunk/debian: changelog patches/00list patches/00list.armel patches/02_htmllinks.dpatch patches/03_qreal.dpatch patches/04_qreal_api_fixes.dpatch rules
shlomme at users.alioth.debian.org
shlomme at users.alioth.debian.org
Fri Aug 31 20:46:56 UTC 2007
Author: shlomme
Date: Fri Aug 31 20:46:56 2007
New Revision: 3148
URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3148
Log:
* handle DEB_BUILD_OPTIONS correctly
* should now build correctly on all archictures
Added:
packages/python-qt4/trunk/debian/patches/00list.armel
packages/python-qt4/trunk/debian/patches/04_qreal_api_fixes.dpatch
Modified:
packages/python-qt4/trunk/debian/changelog
packages/python-qt4/trunk/debian/patches/00list
packages/python-qt4/trunk/debian/patches/02_htmllinks.dpatch
packages/python-qt4/trunk/debian/patches/03_qreal.dpatch
packages/python-qt4/trunk/debian/rules
Modified: packages/python-qt4/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt4/trunk/debian/changelog?rev=3148&op=diff
==============================================================================
--- packages/python-qt4/trunk/debian/changelog (original)
+++ packages/python-qt4/trunk/debian/changelog Fri Aug 31 20:46:56 2007
@@ -1,3 +1,12 @@
+python-qt4 (4.3-4) unstable; urgency=low
+
+ * Forward CXXFLAGS to the build system (Closes: #438392)
+ * Handle nostrip build option correctly (Closes: #437867)
+ * Fixed another build error related to qreal/double/float.
+ * Added dpatch patch list for armel.
+
+ -- Torsten Marek <shlomme at debian.org> Sun, 12 Aug 2007 15:31:52 +0200
+
python-qt4 (4.3-3) unstable; urgency=low
* Include patch for build issues on ARM and Mips. (Closes: #434378)
Modified: packages/python-qt4/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt4/trunk/debian/patches/00list?rev=3148&op=diff
==============================================================================
--- packages/python-qt4/trunk/debian/patches/00list (original)
+++ packages/python-qt4/trunk/debian/patches/00list Fri Aug 31 20:46:56 2007
@@ -1,2 +1,3 @@
01_configure
02_htmllinks
+04_qreal_api_fixes
Added: packages/python-qt4/trunk/debian/patches/00list.armel
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt4/trunk/debian/patches/00list.armel?rev=3148&op=file
==============================================================================
--- packages/python-qt4/trunk/debian/patches/00list.armel (added)
+++ packages/python-qt4/trunk/debian/patches/00list.armel Fri Aug 31 20:46:56 2007
@@ -1,0 +1,1 @@
+03_qreal
Modified: packages/python-qt4/trunk/debian/patches/02_htmllinks.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt4/trunk/debian/patches/02_htmllinks.dpatch?rev=3148&op=diff
==============================================================================
--- packages/python-qt4/trunk/debian/patches/02_htmllinks.dpatch (original)
+++ packages/python-qt4/trunk/debian/patches/02_htmllinks.dpatch Fri Aug 31 20:46:56 2007
@@ -1,8 +1,7 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 02_htmllinks.dpatch by Torsten Marek <shlomme at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+
+## DP: Fix the links in the documentation HTML files.
@DPATCH@
diff -urNad python-qt4-4.1~/doc/pyqt4ref.html python-qt4-4.1/doc/pyqt4ref.html
Modified: packages/python-qt4/trunk/debian/patches/03_qreal.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt4/trunk/debian/patches/03_qreal.dpatch?rev=3148&op=diff
==============================================================================
--- packages/python-qt4/trunk/debian/patches/03_qreal.dpatch (original)
+++ packages/python-qt4/trunk/debian/patches/03_qreal.dpatch Fri Aug 31 20:46:56 2007
@@ -1,7 +1,7 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 03_qreal.dpatch by Torsten Marek <shlomme at debian.org>
##
-## DP: On ARM, Mips and Mipsel, qreal is a float, not a double.
+## DP: On ARM, ARMEL, Mips and Mipsel, qreal is a float, not a double.
@DPATCH@
diff -urNad python-qt4-4.3~/sip/QtCore/qglobal.sip python-qt4-4.3/sip/QtCore/qglobal.sip
Added: packages/python-qt4/trunk/debian/patches/04_qreal_api_fixes.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt4/trunk/debian/patches/04_qreal_api_fixes.dpatch?rev=3148&op=file
==============================================================================
--- packages/python-qt4/trunk/debian/patches/04_qreal_api_fixes.dpatch (added)
+++ packages/python-qt4/trunk/debian/patches/04_qreal_api_fixes.dpatch Fri Aug 31 20:46:56 2007
@@ -1,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_qreal_api_fixes.dpatch by Torsten Marek <shlomme at debian.org>
+##
+## DP: Exchanges double by qreal in some wrapped methods.
+
+ at DPATCH@
+diff -urNad python-qt4-4.3~/sip/QtGui/qtextoption.sip python-qt4-4.3/sip/QtGui/qtextoption.sip
+--- python-qt4-4.3~/sip/QtGui/qtextoption.sip 2007-07-30 18:11:44.000000000 +0200
++++ python-qt4-4.3/sip/QtGui/qtextoption.sip 2007-08-31 21:58:42.000000000 +0200
+@@ -62,8 +62,8 @@
+ typedef QFlags<QTextOption::Flag> Flags;
+ QFlags<QTextOption::Flag> flags() const;
+ qreal tabStop() const;
+- void setTabArray(QList<double> tabStops);
+- QList<double> tabArray() const;
++ void setTabArray(QList<qreal> tabStops);
++ QList<qreal> tabArray() const;
+ void setUseDesignMetrics(bool b);
+ bool useDesignMetrics() const;
+ void setAlignment(Qt::Alignment aalignment);
+diff -urNad python-qt4-4.3~/sip/QtCore/qlist.sip python-qt4-4.3/sip/QtCore/qlist.sip
+--- python-qt4-4.3~/sip/QtCore/qlist.sip 2007-07-30 18:11:45.000000000 +0200
++++ python-qt4-4.3/sip/QtCore/qlist.sip 2007-08-31 22:31:49.000000000 +0200
+@@ -524,8 +524,8 @@
+ return sipGetState(sipTransferObj);
+ %End
+ };
+-// QList<double> is implemented as a Python list of floats.
+-%MappedType QList<double>
++// QList<qreal> is implemented as a Python list of floats.
++%MappedType QList<qreal>
+ {
+ %TypeHeaderCode
+ #include <qlist.h>
+@@ -561,7 +561,7 @@
+ if (sipIsErr == NULL)
+ return PyList_Check(sipPy);
+
+- QList<double> *ql = new QList<double>;
++ QList<qreal> *ql = new QList<qreal>;
+
+ for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+ ql->append(PyFloat_AsDouble(PyList_GET_ITEM(sipPy, i)));
Modified: packages/python-qt4/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt4/trunk/debian/rules?rev=3148&op=diff
==============================================================================
--- packages/python-qt4/trunk/debian/rules (original)
+++ packages/python-qt4/trunk/debian/rules Fri Aug 31 20:46:56 2007
@@ -14,12 +14,6 @@
CXXFLAGS += -O2
endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-export CXXFLAGS
-
PYTHONS=$(shell pyversions -vr debian/control)
DEFAULT_PYTHON=$(shell pyversions -d|sed 's/python//')
@@ -28,6 +22,9 @@
configure-stamp: patch-stamp
dh_testdir
rm -f failed-stamp
+ # echo yes is needed because of the license question in configure.py
+ # LIBS_* is unset to avoid linking to too many libraries
+ # STRIP is unset to let stripping be handled by dh_strip
for version in ${PYTHONS};\
do\
if [ $$version != $(DEFAULT_PYTHON) ];\
@@ -38,7 +35,7 @@
echo yes | python$$version ../configure.py \
-q /usr/bin/qmake-qt4 -c \
-j 4 $$DISABLE_DESIGNER_PLUGIN LIBDIR_QT=/usr/lib LIBS_X11="" LIBS_THREAD="" \
- MOC=moc-qt4 || touch ../failed-stamp;\
+ MOC=moc-qt4 CXXFLAGS_RELEASE="${CXXFLAGS}" STRIP=""|| touch ../failed-stamp;\
cd ..;\
done
test ! -e failed-stamp && touch $@
More information about the Python-modules-commits
mailing list