17 Dec
2007
17 Dec
'07
11:00
Hello community, here is the log from the commit of package python-qt checked in at Mon Dec 17 12:00:39 CET 2007. -------- --- KDE/python-qt/python-qt.changes 2007-09-04 01:43:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-qt/python-qt.changes 2007-12-14 19:42:35.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Dec 14 19:42:21 CET 2007 - dmueller@suse.de + +- update to 3.17.4: + * fix build against newest SIP version + +------------------------------------------------------------------- Old: ---- PyQt-x11-gpl-3.17.3.tar.bz2 New: ---- PyQt-x11-gpl-3.17.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-qt.spec ++++++ --- /var/tmp/diff_new_pack.i10565/_old 2007-12-17 11:57:20.000000000 +0100 +++ /var/tmp/diff_new_pack.i10565/_new 2007-12-17 11:57:20.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package python-qt (Version 3.17.3) +# spec file for package python-qt (Version 3.17.4) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,11 +12,11 @@ Name: python-qt BuildRequires: python-devel python-sip qt3-devel -License: LGPL v2 or later +License: LGPL v2.1 or later Group: Development/Libraries/Python Summary: Python Bindings for Qt -Version: 3.17.3 -Release: 9 +Version: 3.17.4 +Release: 1 Provides: PyQt = %{version} Requires: python-sip >= %( echo `rpm -q --queryformat '%{VERSION}' python-sip`) Url: http://www.riverbankcomputing.co.uk/pyqt/ @@ -76,6 +76,9 @@ %endif %changelog +* Fri Dec 14 2007 - dmueller@suse.de +- update to 3.17.4: + * fix build against newest SIP version * Tue Sep 04 2007 - dmueller@suse.de - fix buildcycle * Wed Aug 15 2007 - dmueller@suse.de ++++++ PyQt-x11-gpl-3.17.3.tar.bz2 -> PyQt-x11-gpl-3.17.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/PyQt-x11-gpl-3.17.3/build.py new/PyQt-x11-gpl-3.17.4/build.py --- old/PyQt-x11-gpl-3.17.3/build.py 2007-07-30 17:51:21.000000000 +0200 +++ new/PyQt-x11-gpl-3.17.4/build.py 2007-12-06 15:28:06.000000000 +0100 @@ -41,7 +41,7 @@ print "SIP v3.9 or later installed." sys.exit(1) -config = sipconfig.SIPConfig("PyQt 3.17.3") +config = sipconfig.SIPConfig("PyQt 3.17.4") # Initialise the globals. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/PyQt-x11-gpl-3.17.3/ChangeLog new/PyQt-x11-gpl-3.17.4/ChangeLog --- old/PyQt-x11-gpl-3.17.3/ChangeLog 2007-07-30 17:51:21.000000000 +0200 +++ new/PyQt-x11-gpl-3.17.4/ChangeLog 2007-12-06 15:28:06.000000000 +0100 @@ -1,3 +1,8 @@ +2007/12/06 14:27:50 phil +Operator related changes needed for SIP v4.7.2 and later. +Released as v3.17.4. + + 2007/07/30 16:51:02 phil Released as v3.17.3. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/PyQt-x11-gpl-3.17.3/configure.py new/PyQt-x11-gpl-3.17.4/configure.py --- old/PyQt-x11-gpl-3.17.3/configure.py 2007-07-30 17:51:21.000000000 +0200 +++ new/PyQt-x11-gpl-3.17.4/configure.py 2007-12-06 15:28:06.000000000 +0100 @@ -32,8 +32,8 @@ # Initialise the globals. -pyqt_version = 0x031103 -pyqt_version_str = "3.17.3" +pyqt_version = 0x031104 +pyqt_version_str = "3.17.4" sip_min_version = 0x040600 @@ -779,6 +779,9 @@ flags.extend(string.split(line)) line = ff.readline() + if sipcfg.sip_version >= 0x040702: + flags.extend(['-x', 'Qt_SIP_PRE_4_7_2']) + return flags diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/PyQt-x11-gpl-3.17.3/doc/PyQt.html new/PyQt-x11-gpl-3.17.4/doc/PyQt.html --- old/PyQt-x11-gpl-3.17.3/doc/PyQt.html 2007-07-30 17:51:22.000000000 +0200 +++ new/PyQt-x11-gpl-3.17.4/doc/PyQt.html 2007-12-06 15:28:07.000000000 +0100 @@ -2,7 +2,7 @@ <HTML ><HEAD ><TITLE ->Python Bindings for Qt (3.17.3)</TITLE +>Python Bindings for Qt (3.17.4)</TITLE ><META NAME="GENERATOR" CONTENT="Modular DocBook HTML Stylesheet Version 1.79"></HEAD @@ -16,7 +16,7 @@ CLASS="TITLE" ><A NAME="AEN2" ->Python Bindings for Qt (3.17.3)</A +>Python Bindings for Qt (3.17.4)</A ></H1 ><H3 CLASS="AUTHOR" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/PyQt-x11-gpl-3.17.3/doc/PyQt.sgml new/PyQt-x11-gpl-3.17.4/doc/PyQt.sgml --- old/PyQt-x11-gpl-3.17.3/doc/PyQt.sgml 2007-07-30 17:51:22.000000000 +0200 +++ new/PyQt-x11-gpl-3.17.4/doc/PyQt.sgml 2007-12-06 15:28:07.000000000 +0100 @@ -1,7 +1,7 @@ <!DOCTYPE Article PUBLIC "-//OASIS//DTD DocBook V3.1//EN"> <Article> <ArtHeader> - <Title>Python Bindings for Qt (3.17.3)</Title> + <Title>Python Bindings for Qt (3.17.4)</Title> <Author> <FirstName>Phil</FirstName> <Surname>Thompson</Surname> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/PyQt-x11-gpl-3.17.3/doc/qtdocs.sip new/PyQt-x11-gpl-3.17.4/doc/qtdocs.sip --- old/PyQt-x11-gpl-3.17.3/doc/qtdocs.sip 2007-07-30 17:51:22.000000000 +0200 +++ new/PyQt-x11-gpl-3.17.4/doc/qtdocs.sip 2007-12-06 15:28:06.000000000 +0100 @@ -30,7 +30,7 @@ <!DOCTYPE Article PUBLIC "-//OASIS//DTD DocBook V3.1//EN"> <Article> <ArtHeader> - <Title>Python Bindings for Qt (3.17.3)</Title> + <Title>Python Bindings for Qt (3.17.4)</Title> <Author> <FirstName>Phil</FirstName> <Surname>Thompson</Surname> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/PyQt-x11-gpl-3.17.3/NEWS new/PyQt-x11-gpl-3.17.4/NEWS --- old/PyQt-x11-gpl-3.17.3/NEWS 2007-07-30 17:51:21.000000000 +0200 +++ new/PyQt-x11-gpl-3.17.4/NEWS 2007-12-06 15:28:06.000000000 +0100 @@ -1,3 +1,6 @@ +v3.17.4 6th December 2007 + - Changes to be able to be built by SIP v4.7.2 and later. + v3.17.3 30th July 2007 - A minor bug fix release. - Changes to be able to be built by SIP v4.7. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/PyQt-x11-gpl-3.17.3/pyuic2/uic.h new/PyQt-x11-gpl-3.17.4/pyuic2/uic.h --- old/PyQt-x11-gpl-3.17.3/pyuic2/uic.h 2007-07-30 17:51:22.000000000 +0200 +++ new/PyQt-x11-gpl-3.17.4/pyuic2/uic.h 2007-12-06 15:28:06.000000000 +0100 @@ -28,7 +28,7 @@ #include <qcolor.h> -#define PYQT_VERSION "3.17.3" +#define PYQT_VERSION "3.17.4" class Uic : public Qt diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/PyQt-x11-gpl-3.17.3/pyuic3/uic.h new/PyQt-x11-gpl-3.17.4/pyuic3/uic.h --- old/PyQt-x11-gpl-3.17.3/pyuic3/uic.h 2007-07-30 17:51:22.000000000 +0200 +++ new/PyQt-x11-gpl-3.17.4/pyuic3/uic.h 2007-12-06 15:28:06.000000000 +0100 @@ -30,7 +30,7 @@ #include <qvariant.h> -#define PYQT_VERSION "3.17.3" +#define PYQT_VERSION "3.17.4" class PyIndent diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/PyQt-x11-gpl-3.17.3/sip/qt/qpoint.sip new/PyQt-x11-gpl-3.17.4/sip/qt/qpoint.sip --- old/PyQt-x11-gpl-3.17.3/sip/qt/qpoint.sip 2007-07-30 17:51:23.000000000 +0200 +++ new/PyQt-x11-gpl-3.17.4/sip/qt/qpoint.sip 2007-12-06 15:28:07.000000000 +0100 @@ -84,20 +84,17 @@ sipRes = !sipCpp -> isNull(); %End - // Qt defines the remaining operators as global, rather than part of - // the class, but SIP doesn't support global operators. - bool operator==(const QPoint &); - bool operator!=(const QPoint &); - const QPoint operator+(const QPoint &); - const QPoint operator-(const QPoint &); - const QPoint operator*(int /Constrained/); - const QPoint operator*(double); - const QPoint __neg__(); %MethodCode sipRes = new QPoint(-(*sipCpp)); %End - - const QPoint operator/(int /Constrained/); - const QPoint operator/(double); }; + +bool operator==(const QPoint &,const QPoint &); +bool operator!=(const QPoint &,const QPoint &); +const QPoint operator+(const QPoint &,const QPoint &); +const QPoint operator-(const QPoint &,const QPoint &); +const QPoint operator*(const QPoint &,int /Constrained/); +const QPoint operator*(const QPoint &,double); +const QPoint operator/(const QPoint &,int /Constrained/); +const QPoint operator/(const QPoint &,double); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/PyQt-x11-gpl-3.17.3/sip/qt/qrect.sip new/PyQt-x11-gpl-3.17.4/sip/qt/qrect.sip --- old/PyQt-x11-gpl-3.17.3/sip/qt/qrect.sip 2007-07-30 17:51:23.000000000 +0200 +++ new/PyQt-x11-gpl-3.17.4/sip/qt/qrect.sip 2007-12-06 15:28:07.000000000 +0100 @@ -201,9 +201,7 @@ QRect unite(const QRect &) const; QRect intersect(const QRect &) const; bool intersects(const QRect &) const; - - // Qt defines the remaining operators as global, rather than part of - // the class, but SIP doesn't support global operators. - bool operator==(const QRect &) const; - bool operator!=(const QRect &) const; }; + +bool operator==(const QRect &,const QRect &); +bool operator!=(const QRect &,const QRect &); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/PyQt-x11-gpl-3.17.3/sip/qt/qsize.sip new/PyQt-x11-gpl-3.17.4/sip/qt/qsize.sip --- old/PyQt-x11-gpl-3.17.3/sip/qt/qsize.sip 2007-07-30 17:51:23.000000000 +0200 +++ new/PyQt-x11-gpl-3.17.4/sip/qt/qsize.sip 2007-12-06 15:28:07.000000000 +0100 @@ -100,15 +100,13 @@ %MethodCode sipRes = sipCpp -> isValid(); %End - - // Qt defines the remaining operators as global, rather than part of - // the class, but SIP doesn't support global operators. - bool operator==(const QSize &) const; - bool operator!=(const QSize &) const; - const QSize operator+(const QSize &) const; - const QSize operator-(const QSize &) const; - const QSize operator*(int /Constrained/) const; - const QSize operator*(double) const; - const QSize operator/(int /Constrained/) const; - const QSize operator/(double) const; }; + +bool operator==(const QSize &,const QSize &); +bool operator!=(const QSize &,const QSize &); +const QSize operator+(const QSize &,const QSize &); +const QSize operator-(const QSize &,const QSize &); +const QSize operator*(const QSize &,int /Constrained/); +const QSize operator*(const QSize &,double); +const QSize operator/(const QSize &,int /Constrained/); +const QSize operator/(const QSize &,double); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/PyQt-x11-gpl-3.17.3/sip/qt/qstring.sip new/PyQt-x11-gpl-3.17.4/sip/qt/qstring.sip --- old/PyQt-x11-gpl-3.17.3/sip/qt/qstring.sip 2007-07-30 17:51:23.000000000 +0200 +++ new/PyQt-x11-gpl-3.17.4/sip/qt/qstring.sip 2007-12-06 15:28:07.000000000 +0100 @@ -427,21 +427,21 @@ %End static bool networkOrdered(); - - bool operator==(char); - bool operator==(QChar); - bool operator!=(QChar); - bool operator!=(char); - bool operator<=(char); - bool operator<=(QChar); - bool operator>=(char); - bool operator>=(QChar); - bool operator<(char); - bool operator<(QChar); - bool operator>(char); - bool operator>(QChar); }; +bool operator==(QChar,char); +bool operator==(QChar,QChar); +bool operator!=(QChar,QChar); +bool operator!=(QChar,char); +bool operator<=(QChar,char); +bool operator<=(QChar,QChar); +bool operator>=(QChar,char); +bool operator>=(QChar,QChar); +bool operator<(QChar,char); +bool operator<(QChar,QChar); +bool operator>(QChar,char); +bool operator>(QChar,QChar); + class QString { @@ -740,13 +740,6 @@ bool isRightToLeft() const; %End - bool operator==(const QString &) const; - bool operator!=(const QString &) const; - bool operator<(const QString &) const; - bool operator<=(const QString &) const; - bool operator>(const QString &) const; - bool operator>=(const QString &) const; - // Force the numeric interpretation so that str + QString gets handled // as we want. const QString operator+(const QString &) /Numeric/; @@ -970,6 +963,13 @@ %End }; +bool operator==(const QString &,const QString &); +bool operator!=(const QString &,const QString &); +bool operator<(const QString &,const QString &); +bool operator<=(const QString &,const QString &); +bool operator>(const QString &,const QString &); +bool operator>=(const QString &,const QString &); + %End diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/PyQt-x11-gpl-3.17.3/sip/qt/qtmod.sip new/PyQt-x11-gpl-3.17.4/sip/qt/qtmod.sip --- old/PyQt-x11-gpl-3.17.3/sip/qt/qtmod.sip 2007-07-30 17:51:23.000000000 +0200 +++ new/PyQt-x11-gpl-3.17.4/sip/qt/qtmod.sip 2007-12-06 15:28:07.000000000 +0100 @@ -30,8 +30,8 @@ const char *PYQT_VERSION_STR; %ModuleCode -static unsigned PYQT_VERSION = 0x031103; -static const char *PYQT_VERSION_STR = "3.17.3"; +static unsigned PYQT_VERSION = 0x031104; +static const char *PYQT_VERSION_STR = "3.17.4"; %End diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/PyQt-x11-gpl-3.17.3/sip/qt/qurl.sip new/PyQt-x11-gpl-3.17.4/sip/qt/qurl.sip --- old/PyQt-x11-gpl-3.17.3/sip/qt/qurl.sip 2007-07-30 17:51:23.000000000 +0200 +++ new/PyQt-x11-gpl-3.17.4/sip/qt/qurl.sip 2007-12-06 15:28:07.000000000 +0100 @@ -92,10 +92,12 @@ bool operator==(const QUrl &) const; bool operator==(const QString &) const; - // Qt doesn't implement these, but Python doesn't support C++'s - // default handling of != when == is implemented. +%If (Qt_SIP_PRE_4_7_2) + // Qt doesn't implement these, but SIP doesn't support C++'s default + // handling of != when == is implemented. bool operator!=(const QUrl &) const; bool operator!=(const QString &) const; +%End static void decode(QString &); static void encode(QString &); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/PyQt-x11-gpl-3.17.3/sip/qt/versions.sip new/PyQt-x11-gpl-3.17.4/sip/qt/versions.sip --- old/PyQt-x11-gpl-3.17.3/sip/qt/versions.sip 2007-07-30 17:51:22.000000000 +0200 +++ new/PyQt-x11-gpl-3.17.4/sip/qt/versions.sip 2007-12-06 15:28:07.000000000 +0100 @@ -86,3 +86,7 @@ // On Windows64 Q_LONG is defined as __int64 (which SIP doesn't handle) so // this feature is disabled. %Feature Qt_Q_LONG_IS_long + +// SIP v4.7.3 and later support automatic generation of missing complementary +// comparison operators. This fixes a problem with v4.7.2. +%Feature Qt_SIP_PRE_4_7_2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org