From e9f8b6a1e2c6a5a59458d7ef2054f6fbbc156804 Mon Sep 17 00:00:00 2001 From: Rosa Date: Mon, 10 Jun 2013 15:03:17 +0400 Subject: [PATCH] Automatic import for version 4.9.6-1.fc18 --- .abf.yml | 2 + PyQt-x11-gpl-4.9.1-opengl_types.patch | 38 ++ PyQt-x11-gpl-4.9.2-pyuic_shbang.patch | 8 + PyQt-x11-gpl-4.9.5-timestamp_multilib.patch | 13 + PyQt-x11-gpl-4.9.5-webkit.patch | 37 ++ PyQt4.spec | 631 ++++++++++++++++++++ qreal_float_support.diff | 248 ++++++++ 7 files changed, 977 insertions(+) create mode 100644 .abf.yml create mode 100644 PyQt-x11-gpl-4.9.1-opengl_types.patch create mode 100644 PyQt-x11-gpl-4.9.2-pyuic_shbang.patch create mode 100644 PyQt-x11-gpl-4.9.5-timestamp_multilib.patch create mode 100644 PyQt-x11-gpl-4.9.5-webkit.patch create mode 100644 PyQt4.spec create mode 100644 qreal_float_support.diff diff --git a/.abf.yml b/.abf.yml new file mode 100644 index 0000000..891372c --- /dev/null +++ b/.abf.yml @@ -0,0 +1,2 @@ +sources: + "PyQt-x11-gpl-4.9.6.tar.gz": 83e649a39643ffc96741bca70177e9c73789e54d diff --git a/PyQt-x11-gpl-4.9.1-opengl_types.patch b/PyQt-x11-gpl-4.9.1-opengl_types.patch new file mode 100644 index 0000000..67591c0 --- /dev/null +++ b/PyQt-x11-gpl-4.9.1-opengl_types.patch @@ -0,0 +1,38 @@ +diff -up PyQt-x11-gpl-4.9.1/configure.py.opengl_types PyQt-x11-gpl-4.9.1/configure.py +--- PyQt-x11-gpl-4.9.1/configure.py.opengl_types 2012-06-21 09:52:52.916412238 -0500 ++++ PyQt-x11-gpl-4.9.1/configure.py 2012-06-21 10:03:09.297706409 -0500 +@@ -1203,22 +1203,30 @@ int main(int, char **) + + QTextStream out(&outf); + +- if (sizeof (long) == sizeof (GLint)) ++ if (sizeof (int) == sizeof (GLint)) ++ out << "typedef int GLint;\\n"; ++ else if (sizeof (long) == sizeof (GLint)) + out << "typedef long GLint;\\n"; + else + out << "typedef int GLint;\\n"; + +- if (sizeof (unsigned long) == sizeof (GLuint)) ++ if (sizeof (unsigned) == sizeof (GLuint)) ++ out << "typedef unsigned GLuint;\\n"; ++ else if (sizeof (unsigned long) == sizeof (GLuint)) + out << "typedef unsigned long GLuint;\\n"; + else + out << "typedef unsigned GLuint;\\n"; + +- if (sizeof (unsigned long) == sizeof (GLenum)) ++ if (sizeof (unsigned) == sizeof (GLenum)) ++ out << "typedef unsigned GLenum;\\n"; ++ else if (sizeof (unsigned long) == sizeof (GLenum)) + out << "typedef unsigned long GLenum;\\n"; + else + out << "typedef unsigned GLenum;\\n"; + +- if (sizeof (unsigned long) == sizeof (GLbitfield)) ++ if (sizeof (unsigned) == sizeof (GLbitfield)) ++ out << "typedef unsigned GLbitfield;\\n"; ++ else if (sizeof (unsigned long) == sizeof (GLbitfield)) + out << "typedef unsigned long GLbitfield;\\n"; + else + out << "typedef unsigned GLbitfield;\\n"; diff --git a/PyQt-x11-gpl-4.9.2-pyuic_shbang.patch b/PyQt-x11-gpl-4.9.2-pyuic_shbang.patch new file mode 100644 index 0000000..bece5ae --- /dev/null +++ b/PyQt-x11-gpl-4.9.2-pyuic_shbang.patch @@ -0,0 +1,8 @@ +diff -up PyQt-x11-gpl-4.9.2/pyuic/uic/pyuic.py.orig PyQt-x11-gpl-4.9.2/pyuic/uic/pyuic.py +--- PyQt-x11-gpl-4.9.2/pyuic/uic/pyuic.py.orig 2012-06-20 13:18:31.000000000 -0500 ++++ PyQt-x11-gpl-4.9.2/pyuic/uic/pyuic.py 2012-06-22 07:05:43.719189884 -0500 +@@ -1,3 +1,4 @@ ++#!/usr/bin/python -tt + ############################################################################# + ## + ## Copyright (c) 2012 Riverbank Computing Limited diff --git a/PyQt-x11-gpl-4.9.5-timestamp_multilib.patch b/PyQt-x11-gpl-4.9.5-timestamp_multilib.patch new file mode 100644 index 0000000..4399c9b --- /dev/null +++ b/PyQt-x11-gpl-4.9.5-timestamp_multilib.patch @@ -0,0 +1,13 @@ +diff -up PyQt-x11-gpl-4.9.5/pyrcc/rcc.cpp.timestamp PyQt-x11-gpl-4.9.5/pyrcc/rcc.cpp +--- PyQt-x11-gpl-4.9.5/pyrcc/rcc.cpp.timestamp 2012-09-29 06:35:02.000000000 -0500 ++++ PyQt-x11-gpl-4.9.5/pyrcc/rcc.cpp 2012-10-01 08:22:03.197843077 -0500 +@@ -407,8 +407,7 @@ RCCResourceLibrary::writeHeader(FILE *ou + fprintf(out, "# -*- coding: utf-8 -*-\n\n"); + fprintf(out, "# Resource object code\n"); + fprintf(out, "#\n"); +- fprintf(out, "# Created: %s\n", QDateTime::currentDateTime().toString().toUtf8().constData()); +- fprintf(out, "# by: The Resource Compiler for PyQt (Qt v%s)\n", QT_VERSION_STR); ++ fprintf(out, "# Created by: The Resource Compiler for PyQt (Qt v%s)\n", QT_VERSION_STR); + fprintf(out, "#\n"); + fprintf(out, "# WARNING! All changes made in this file will be lost!\n"); + fprintf(out, "\n"); diff --git a/PyQt-x11-gpl-4.9.5-webkit.patch b/PyQt-x11-gpl-4.9.5-webkit.patch new file mode 100644 index 0000000..f42d4e5 --- /dev/null +++ b/PyQt-x11-gpl-4.9.5-webkit.patch @@ -0,0 +1,37 @@ +diff -up PyQt-x11-gpl-4.9.5/configure.py.webkit PyQt-x11-gpl-4.9.5/configure.py +--- PyQt-x11-gpl-4.9.5/configure.py.webkit 2012-10-11 14:37:49.000000000 +0200 ++++ PyQt-x11-gpl-4.9.5/configure.py 2012-10-11 14:39:58.130639820 +0200 +@@ -379,16 +379,6 @@ class ConfigurePyQt4: + check_module("QtSvg", "qsvgwidget.h", "new QSvgWidget()") + if qt_version < 0x050000: check_module("QtTest", "QtTest", "QTest::qSleep(0)") + +- # Qt v5-beta1 doesn't install the Headers directory for a framework +- # build of QtWebKit on OS/X. +- if qt_version >= 0x050000: +- webkit_inc_dirs = [os.path.join(qt_incdir, "QtWebKit")] +- else: +- webkit_inc_dirs = None +- +- check_module("QtWebKit", "qwebpage.h", "new QWebPage()", +- extra_include_dirs=webkit_inc_dirs) +- + check_module("QtXml", "qdom.h", "new QDomDocument()") + + # Qt v5-beta1 causes compiler error messages. Wait to see if it fixed +@@ -537,16 +527,6 @@ class ConfigurePyQt4: + if "QtTest" in pyqt_modules: + generate_code("QtTest") + +- if "QtWebKit" in pyqt_modules: +- # Qt v5-beta1 doesn't install the Headers directory for a framework +- # build of QtWebKit on OS/X. +- if qt_version >= 0x050000: +- webkit_inc_dirs = [os.path.join(qt_incdir, "QtWebKit")] +- else: +- webkit_inc_dirs = None +- +- generate_code("QtWebKit", extra_include_dirs=webkit_inc_dirs) +- + if "QtXml" in pyqt_modules: + generate_code("QtXml") + diff --git a/PyQt4.spec b/PyQt4.spec new file mode 100644 index 0000000..68b3982 --- /dev/null +++ b/PyQt4.spec @@ -0,0 +1,631 @@ + +%if 0%{?fedora} +%global with_python3 1 +%endif + +Summary: Python bindings for Qt4 +Name: PyQt4 +Version: 4.9.6 +Release: 1%{?dist} + +# GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) +License: GPLv3 or GPLv2 with exceptions +Group: Development/Languages +Url: http://www.riverbankcomputing.com/software/pyqt/ +Source0: http://downloads.sourceforge.net/pyqt/PyQt-x11-gpl%{?snap:-snapshot}-%{version}%{?snap:-%{snap}}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + + +## upstreamable patches +# fix multilib conflict because of timestamp +Patch50: PyQt-x11-gpl-4.9.5-timestamp_multilib.patch +# multilib-safe(r) opengl_types.sip (hopefully) +# simpler approach may be to not try to change these at buildime (only verify), +# if /usr/include/GL/gl.h ever changes these types, we have bigger problems +Patch51: PyQt-x11-gpl-4.9.1-opengl_types.patch +Patch52: PyQt-x11-gpl-4.9.2-pyuic_shbang.patch + +## upstream patches +# fix FTBFS on ARM +Patch60: qreal_float_support.diff + +# rhel patches +Patch300: PyQt-x11-gpl-4.9.5-webkit.patch + +BuildRequires: findutils +BuildRequires: pkgconfig(dbus-1) pkgconfig(dbus-python) +BuildRequires: pkgconfig(phonon) +BuildRequires: pkgconfig(python) +BuildRequires: pkgconfig(QtGui) pkgconfig(QtNetwork) +%if 0%{?fedora} +# beware of PyQt4/qscintilla bootstap issues +BuildRequires: qscintilla +BuildRequires: pkgconfig(QtWebKit) +%endif +BuildRequires: sip-devel >= 4.14.2 + +%if 0%{?with_python3} +BuildRequires: python3-devel +BuildRequires: python3-sip-devel >= 4.14.2 +%endif # with_python3 + +Requires: dbus-python +%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} +%{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}} + +%if 0%{?fedora} +# could theoretically enumerate all the modules built/packaged here, but this +# should be good start (to ease introduction of -webkit for epel-6+ for example) +Provides: %{name}-webkit = %{version}-%{release} +Provides: %{name}-webkit%{?_isa} = %{version}-%{release} +%endif + +Provides: python-qt4 = %{version}-%{release} +Provides: pyqt4 = %{version}-%{release} + +%description +These are Python bindings for Qt4. + +%package devel +Summary: Files needed to build other bindings based on Qt4 +Group: Development/Languages +%if 0%{?fedora} +Provides: %{name}-webkit-devel = %{version}-%{release} +Provides: %{name}-webkit-devel%{?_isa} = %{version}-%{release} +%endif +Provides: pyqt4-devel = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt4-devel +Requires: sip-devel + +%description devel +Files needed to build other bindings for C++ classes that inherit from any +of the Qt4 classes (e.g. KDE or your own). + +# The bindings are imported as "PyQt4", hence it's reasonable to name the +# Python 3 subpackage "python3-PyQt4", despite the apparent tautology +%package -n python3-%{name} +Summary: Python 3 bindings for Qt4 +Group: Development/Languages +# The dbus Python bindings have not yet been ported to Python 3: +# Requires: dbus-python +%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} +%{?_sip_api:Requires: python3-sip-api(%{_sip_api_major}) >= %{_sip_api}} +%if 0%{?fedora} +Provides: python3-%{name}-webkit = %{version}-%{release} +Provides: python3-%{name}-webkit%{?_isa} = %{version}-%{release} +%endif +Provides: python3-qt4 = %{version}-%{release} + +%description -n python3-%{name} +These are Python 3 bindings for Qt4. + +%package -n python3-%{name}-devel +Summary: Python 3 bindings for Qt4 +Group: Development/Languages +%if 0%{?fedora} +Provides: python3-%{name}-webkit-devel = %{version}-%{release} +Provides: python3-%{name}-webkit-devel%{?_isa} = %{version}-%{release} +%endif +Requires: python3-%{name}%{?_isa} = %{version}-%{release} +Requires: python3-sip-devel +%description -n python3-%{name}-devel +Files needed to build other Python 3 bindings for C++ classes that inherit +from any of the Qt4 classes (e.g. KDE or your own). + + +%prep +%setup -q -n PyQt-x11-gpl%{?snap:-snapshot}-%{version}%{?snap:-%{snap}} + +%patch50 -p1 -b .timestamp +%patch51 -p1 -b .opengl_types +%patch52 -p1 -b .pyuic_shbang +# save orig for comparison later +cp -a ./sip/QtOpenGL/opengl_types.sip ./sip/QtOpenGL/opengl_types.sip.orig +%patch60 -p1 -b .arm +%if 0%{?rhel} +%patch300 -p1 -b .webkit +%endif + +# permissions, mark examples non-executable +find examples/ -name "*.py" | xargs chmod a-x +chmod a+rx pyuic/uic/pyuic.py + +%if 0%{?with_python3} +rm -rf %{py3dir} +cp -a . %{py3dir} +%endif # with_python3 + + +%build + +QT4DIR=%{_qt4_prefix} +PATH=%{_qt4_bindir}:$PATH ; export PATH + +# Python 2 build: +%{__python} configure.py \ + --assume-shared \ + --confirm-license \ + --no-timestamp \ + --qmake=%{_qt4_qmake} \ + --verbose + +make %{?_smp_mflags} + +# Python 3 build: +%if 0%{?with_python3} +pushd %{py3dir} +%{__python3} configure.py \ + --assume-shared \ + --confirm-license \ + --qmake=%{_qt4_qmake} \ + --verbose + +make %{?_smp_mflags} +popd +%endif # with_python3 + + +%install +rm -rf %{buildroot} + +InstallPyQt4() { + PySiteArch=$1 + + make install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot} + + # fix/remove rpaths + chrpath --list %{buildroot}$PySiteArch/PyQt4/QtCore.so && \ + chrpath --delete %{buildroot}$PySiteArch/PyQt4/QtCore.so ||: + + chrpath --list %{buildroot}$PySiteArch/PyQt4/QtGui.so && \ + chrpath --delete %{buildroot}$PySiteArch/PyQt4/QtGui.so ||: + + chrpath --list %{buildroot}$PySiteArch/PyQt4/QtDeclarative.so && \ + chrpath --delete %{buildroot}$PySiteArch/PyQt4/QtDeclarative.so ||: + + chrpath --list %{buildroot}$PySiteArch/PyQt4/QtDesigner.so && \ + chrpath --delete %{buildroot}$PySiteArch/PyQt4/QtDesigner.so ||: + + chrpath --list %{buildroot}$PySiteArch/PyQt4/QtOpenGL.so && \ + chrpath --delete %{buildroot}$PySiteArch/PyQt4/QtOpenGL.so ||: +} + + +# Install Python 3 first, and move aside any executables, to avoid clobbering +# the Python 2 installation: +%if 0%{?with_python3} +pushd %{py3dir} +InstallPyQt4 %{python3_sitearch} +popd +%endif # with_python3 + +InstallPyQt4 %{python_sitearch} + +# DBus bindings only work for Python 2 so far: +chrpath --list %{buildroot}%{python_sitelib}/dbus/mainloop/qt.so && \ +chrpath --delete %{buildroot}%{python_sitelib}/dbus/mainloop/qt.so ||: + +# HACK: fix multilb conflict, http://bugzilla.redhat.com/509415 +rm -fv %{buildroot}%{_bindir}/pyuic4 +mv %{buildroot}%{python_sitearch}/PyQt4/uic/pyuic.py \ + %{buildroot}%{_bindir}/pyuic4 +ln -s %{_bindir}/pyuic4 \ + %{buildroot}%{python_sitearch}/PyQt4/uic/pyuic.py + +# remove Python 3 code from Python 2.6 directory, fixes FTBFS (#564633) +rm -rf %{buildroot}%{python_sitearch}/PyQt4/uic/port_v3/ + +# likewise, remove Python 2 code from the Python 3.1 directory: +rm -rf %{buildroot}%{python3_sitearch}/PyQt4/uic/port_v2/ + + +%check +# verify phonon built ok +test -f %{buildroot}%{python_sitearch}/PyQt4/phonon.so +test -d %{buildroot}%{_datadir}/sip/PyQt4/phonon + +%if 0%{?with_python3} +test -f %{buildroot}%{python3_sitearch}/PyQt4/phonon.so +test -d %{buildroot}%{_datadir}/python3-sip/PyQt4/phonon +%endif # with_python3 + +# verify opengl_types.sip sanity +diff -u ./sip/QtOpenGL/opengl_types.sip.orig \ + ./sip/QtOpenGL/opengl_types.sip ||: + + +%clean +rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%doc NEWS README +%doc OPENSOURCE-NOTICE.TXT +%doc LICENSE.GPL2 GPL_EXCEPTION*.TXT +%doc LICENSE.GPL3 +%{python_sitearch}/PyQt4/ +%exclude %{python_sitearch}/PyQt4/uic/pyuic.py* +# fixme? -> sitearch? -- Rex +%{python_sitelib}/dbus/mainloop/qt.so +%{_qt4_plugindir}/designer/* + +%files devel +%defattr(-,root,root,-) +%doc doc/* +%doc examples/ +%{_bindir}/pylupdate4 +%{_bindir}/pyrcc4 +%{_bindir}/pyuic4 +%{python_sitearch}/PyQt4/uic/pyuic.py* +%{_datadir}/sip/PyQt4/ +%if 0%{?fedora} +%{_qt4_prefix}/qsci/api/python/PyQt4.api +%endif + +%if 0%{?with_python3} +%files -n python3-%{name} +%defattr(-,root,root,-) +%doc NEWS README +%doc OPENSOURCE-NOTICE.TXT +%doc LICENSE.GPL2 GPL_EXCEPTION*.TXT +%doc LICENSE.GPL3 +%{python3_sitearch}/PyQt4/ +%exclude %{python3_sitearch}/PyQt4/uic/pyuic.py* + +%files -n python3-%{name}-devel +%defattr(-,root,root,-) +%doc doc/* +%doc examples/ +%{python3_sitearch}/PyQt4/uic/pyuic.py* +%{_datadir}/python3-sip/PyQt4/ +%if 0%{?fedora} +%{_qt4_prefix}/qsci/api/python/PyQt4.api +%endif +%endif + + +%changelog +* Sun Dec 09 2012 Rex Dieter 4.9.6-1 +- 4.9.6 + +* Sun Oct 28 2012 Rex Dieter 4.9.5-3 +- rebuild (sip) + +* Thu Oct 11 2012 Than Ngo - 4.9.5-2 +- update webkit patch + +* Mon Oct 01 2012 Rex Dieter 4.9.5-1 +- PyQt-4.9.5 + +* Sat Aug 04 2012 David Malcolm - 4.9.4-5 +- rebuild for https://fedoraproject.org/wiki/Features/Python_3.3 + +* Fri Aug 3 2012 David Malcolm - 4.9.4-4 +- make with_python3 be conditional on fedora + +* Mon Jul 30 2012 Than Ngo - 4.9.4-3 +- update webkit patch + +* Wed Jul 18 2012 Fedora Release Engineering - 4.9.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jun 28 2012 Rex Dieter 4.9.4-1 +- 4.9.4 + +* Sun Jun 24 2012 Rex Dieter 4.9.3-1 +- 4.9.3 + +* Fri Jun 22 2012 Rex Dieter 4.9.2-1 +- 4.9.2 + +* Thu Jun 21 2012 Rex Dieter 4.9.1-4 +- PyQt4 opengl-types.sip multilib conflict (#509415) + +* Fri May 04 2012 Than Ngo - 4.9.1-3 +- add rhel/fedora condition + +* Sun Mar 4 2012 Peter Robinson - 4.9.1-2 +- Add upstream patch (via Debian) to fix FTBFS on ARM + +* Sat Feb 11 2012 Rex Dieter 4.9.1-1 +- 4.9.1 + +* Thu Jan 12 2012 Fedora Release Engineering - 4.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Jan 09 2012 Rex Dieter 4.9-2 +- upstream doItemsLayout patch + +* Fri Dec 23 2011 Rex Dieter 4.9-1 +- 4.9 + +* Tue Dec 20 2011 Than Ngo - 4.8.6-4 +- Provides: pyqt4 + +* Wed Dec 14 2011 Rex Dieter 4.8.6-3 +- -devel: Provides: -webkit-devel + +* Fri Nov 18 2011 Rex Dieter 4.8.6-2 +- Provides: python(3)-qt4 + +* Wed Oct 26 2011 Rex Dieter 4.8.6-1 +- 4.8.6 + +* Mon Oct 17 2011 Rex Dieter 4.8.5-2 +- pkgconfig-style deps +- Provides: -webkit +- s/python3-PyQt4/python3-%%name/ + +* Wed Aug 10 2011 Rex Dieter 4.8.5-1 +- 4.8.5 + +* Sat Jul 23 2011 Rex Dieter 4.8.4-4 +- rebuild (qt48) + +* Thu Jun 16 2011 Rex Dieter 4.8.4-3 +- rebuild + +* Wed Jun 08 2011 Rex Dieter 4.8.4-2 +- squash more rpaths + +* Mon May 02 2011 Rex Dieter 4.8.4-1 +- 4.8.4 + +* Mon Feb 07 2011 Fedora Release Engineering - 4.8.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Jan 24 2011 Rex Dieter 4.8.3-1 +- PyQt4-x11-gpl-4.8.3 + +* Sat Jan 15 2011 Rex Dieter - 4.8.3-0.1.454d07a16153 +- 4.8.3 snapshot +- Little typo (#668289) + +* Fri Dec 24 2010 Rex Dieter - 4.8.2-1 +- PyQt4-x11-gpl-4.8.2 + +* Sat Oct 30 2010 Rex Dieter - 4.8.1-1 +- PyQt4-x11-gpl-4.8.1 + +* Wed Oct 27 2010 Rex Dieter - 4.8-3 +- fix pyuic_shbang.patch +- drop implicit-linking patch (no longer needed) + +* Sun Oct 24 2010 Rex Dieter - 4.8-2 +- drop BR: qt-assistant-adp-devel (these deprecated bindings are no longer included) + +* Sat Oct 23 2010 Rex Dieter - 4.8-1 +- PyQt-x11-gpl-4.8 + +* Sat Oct 02 2010 Rex Dieter - 4.7.7-3 +- backport patch to fix kdebindings/pykde ftbfs +- drop sip-devel min version a bit to match reality + +* Wed Sep 29 2010 jkeating - 4.7.7-2 +- Rebuilt for gcc bug 634757 + +* Wed Sep 22 2010 Rex Dieter - 4.7.7-1 +- PyQt-x11-gpl-4.7.7 + +* Mon Sep 13 2010 Rex Dieter - 4.7.6-2 +- backport pyuic fix for python2 + +* Thu Sep 09 2010 Rex Dieter - 4.7.6-1 +- PyQt-x11-gpl-4.7.6 + +* Wed Aug 25 2010 Thomas Spura - 4.7.4-3 +- rebuild with python3.2 + http://lists.fedoraproject.org/pipermail/devel/2010-August/141368.html + +* Wed Jul 21 2010 David Malcolm - 4.7.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Wed Jul 14 2010 Rex Dieter - 4.7.4-1 +- PyQt-x11-gpl-4.7.4 + +* Sat May 08 2010 Rex Dieter - 4.7.3-3 +- BR: qt4-webkit-devel + +* Mon Apr 26 2010 David Malcolm - 4.7.3-2 +- add python 3 subpackages (#586196) + +* Sat Apr 17 2010 Rex Dieter - 4.7.3-1 +- PyQt-x11-gpl-4.7.3 + +* Sun Mar 21 2010 Kevin Kofler - 4.7.2-2 +- rebuild against fixed qt to get QtMultimedia detected properly + +* Thu Mar 18 2010 Rex Dieter - 4.7.2-1 +- PyQt-x11-gpl-4.7.2 + +* Sun Mar 14 2010 Kevin Kofler - 4.7-5 +- fix implicit linking when checking for QtHelp and QtAssistant +- remove Python 3 code from Python 2.6 directory, fixes FTBFS (#564633) + +* Sat Mar 13 2010 Kevin Kofler - 4.7-4 +- BR qt-assistant-adp-devel + +* Tue Feb 23 2010 Than Ngo - 4.7-3 +- fix multilib conflict because of timestamp + +* Sun Feb 14 2010 Rex Dieter - 4.7-2 +- rebuild + +* Fri Jan 15 2010 Rex Dieter - 4.7-1 +- PyQt-x11-gpl-4.7 (final) + +* Thu Jan 07 2010 Rex Dieter - 4.7-0.1.20091231 +- PyQt-x11-gpl-4.7-snapshot-20091231 + +* Fri Nov 27 2009 Rex Dieter - 4.6.2-5 +- phonon bindings missing (#541685) + +* Wed Nov 25 2009 Than Ngo - 4.6.2-4 +- fix conditional for RHEL + +* Wed Nov 25 2009 Rex Dieter - 4.6.2-3 +- PyQt4-4.6.2 breaks QStringList in QVariant, rebuild with sip-4.9.3 (#541211) + +* Wed Nov 25 2009 Than Ngo - 4.6.2-2 +- fix conditional for RHEL + +* Fri Nov 20 2009 Rex Dieter - 4.6.2-1 +- PyQt4-4.6.2 + +* Thu Nov 19 2009 Rex Dieter - 4.6.1-2.1 +- rebuild (for qt-4.6.0-rc1, f13+) + +* Mon Nov 16 2009 Rex Dieter - 4.6.1-2 +- Requires: sip-api(%%_sip_api_major) >= %%_sip_api + +* Fri Oct 23 2009 Rex Dieter - 4.6.1-1 +- PyQt4-4.6.1 + +* Thu Oct 15 2009 Rex Dieter - 4.6.1-0.1.20091014 +- PyQt4-4.6.1-snapshot-20091014 (#529192) + +* Tue Jul 28 2009 Rex Dieter - 4.5.4-1 +- PyQt4-4.5.4 + +* Fri Jul 24 2009 Fedora Release Engineering - 4.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Jul 16 2009 Rex Dieter - 4.5.2-1 +- PyQt4-4.5.2 + +* Thu Jul 02 2009 Rex Dieter - 4.5.1-2 +- fix build with qt-4.5.2 +- PyQt4-devel multilib conflict (#509415) + +* Tue Jun 16 2009 Rex Dieter - 4.5.1-1 +- PyQt-4.5.1 + +* Fri Jun 05 2009 Rex Dieter - 4.5-1 +- PyQt-4.5 + +* Thu May 21 2009 Rex Dieter - 4.5-0.2.20090520 +- fix generation of sip_ver + +* Thu May 21 2009 Rex Dieter - 4.5-0.1.20090520 +- PyQt-4.5-snapshot-20090520 + +* Sun Apr 26 2009 Rex Dieter - 4.4.4-6 +- rebuild for phonon bindings (#497680) + +* Wed Mar 05 2009 Rex Dieter - 4.4.4-5 +- move designer plugins to main/runtime (#487622) + +* Mon Feb 23 2009 Fedora Release Engineering - 4.4.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Feb 13 2009 Than Ngo - 4.4.4-3 +- rebuild against qt-4.5rc1 + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 4.4.4-2 +- Rebuild for Python 2.6 + +* Mon Nov 10 2008 Rex Dieter 4.4.4-1 +- PyQt-4.4.4 + +* Tue Aug 26 2008 Rex Dieter 4.4.3-1 +- PyQt-4.4.3 + +* Sat Jun 14 2008 Rex Dieter 4.4.2-2 +- PyQt4 is built without QtWebKit support (#451490) + +* Wed May 21 2008 Rex Dieter 4.4.2-1 +- PyQt-4.4.2 + +* Wed May 14 2008 Rex Dieter 4.4-1 +- PyQt-4.4 +- License: GPLv3 or GPLv2 with exceptions + +* Mon Feb 11 2008 Rex Dieter 4.3.3-2 +- respin (gcc43) + +* Wed Dec 05 2007 Rex Dieter 4.3.3-1 +- PyQt-4.3.3 + +* Thu Nov 22 2007 Rex Dieter 4.3.1-3 +- dbus support (#395741) + +* Mon Nov 12 2007 Rex Dieter 4.3.1-1 +- PyQt-4.3.1 + +* Thu Oct 04 2007 Rex Dieter 4.2-8 +- drop ExcludeArch: ppc64 , qt4 bug is (hopefully) fixed. + +* Thu Oct 04 2007 Rex Dieter 4.2-7 +- fix QtDesigner plugin install + +* Wed Oct 03 2007 Rex Dieter 4.2-6 +- 64bit QtDesigner patch + +* Mon Aug 27 2007 Rex Dieter 4.2-5 +- -devel: Requires: qt4-devel + +* Sun Aug 26 2007 Rex Dieter 4.2-4 +- use %%python_sitearch +- License: GPLv2 + +* Thu Aug 02 2007 Rex Dieter 4.2-3 +- fix python_sitelib typo (wrt chrpath call) +- move %%_bindir stuff to -devel +- mark %%doc examples non-executable +- add shebang to %%_bindir/pyuic4 + +* Tue Jul 17 2007 Rex Dieter 4.2-2 +- remove rpath from QtDesigner.so +- BR: qt4-devel > 4.3.0-8 + +* Wed Apr 11 2007 Rex Dieter 4.2-1 +- PyQt4-4.2 + +* Wed Feb 28 2007 Rex Dieter 4.1.1-2 +- fix build against multilib'd qt4 + +* Mon Dec 11 2006 Rex Dieter 4.1.1-1 +- PyQt4-4.1.1 +- BR: sip-devel >= 4.5.1 + +* Mon Nov 06 2006 Rex Dieter 4.1-1 +- PyQt4-4.1 + +* Wed Oct 04 2006 Rex Dieter 4.0.1-4 +- don't own %%_datadir/sip (bug #206633) + +* Mon Aug 28 2006 Rex Dieter 4.0.1-3 +- BR: qt4-devel < 4.2 + +* Sat Jul 29 2006 Rex Dieter 4.0.1-2 +- fix reference(s) to qmake(4) + +* Sun Jul 16 2006 Rex Dieter 4.0.1-1 +- PyQt-4.0.1 + +* Mon Jun 12 2006 Rex Dieter 4.0-1 +- PyQt-4.0(final) +- BR: sip-devel >= 4.4.4 (see bug #199430) + +* Fri May 12 2006 Rex Dieter 4.0-0.6.beta1 +- drop BR: qt4-MySQL qt4-ODBC qt4-PostgreSQL +- drop usage of (undefined) %%sip_min + +* Fri Apr 28 2006 Rex Dieter 4.0-0.5.beta1 +- cleanup for Extras + +* Fri Apr 28 2006 Rex Dieter 4.0-0.4.beta1 +- 4.0beta1 + +* Thu Apr 27 2006 Rex Dieter 4.0-0.3.20060421 +- respin for sip-4.4.3 +- use sip-abi, sip-abi-min + +* Mon Apr 24 2006 Rex Dieter 4.0-0.2.20060421 +- 20060421 snapshot + +* Wed Apr 19 2006 Rex Dieter 0.0-0.1.20060417 +- first try, using 20060417 snapshot + diff --git a/qreal_float_support.diff b/qreal_float_support.diff new file mode 100644 index 0000000..af6c9cf --- /dev/null +++ b/qreal_float_support.diff @@ -0,0 +1,248 @@ +## 03_qreal_float_support.dpatch by Michael Casadevall +Index: python-qt4-4.9.1/configure.py +=================================================================== +--- python-qt4-4.9.1.orig/configure.py 2012-02-11 16:59:33.402554204 -0500 ++++ python-qt4-4.9.1/configure.py 2012-02-11 17:02:46.626548495 -0500 +@@ -2072,8 +2072,9 @@ + out << "PyQt_NoOpenGLES\\n"; + #endif + +- if (sizeof (qreal) != sizeof (double)) ++#if defined(QT_NO_FPU) || defined(QT_ARCH_ARM) || defined(QT_ARCH_WINDOWSCE) + out << "PyQt_qreal_double\\n"; ++#endif + + return 0; + } +Index: python-qt4-4.9.1/sip/QtCore/qlist.sip +=================================================================== +--- python-qt4-4.9.1.orig/sip/QtCore/qlist.sip 2012-02-11 16:59:33.422554203 -0500 ++++ python-qt4-4.9.1/sip/QtCore/qlist.sip 2012-02-11 17:05:31.546543622 -0500 +@@ -807,3 +807,227 @@ + return sipGetState(sipTransferObj); + %End + }; ++ ++// If we're on an architecture where qreal != double, then we need to also ++// explicately handle doubles. On architectures where qreal == double, they ++// will automaticially be cast upwards ++ ++%If (!PyQt_qreal_double) ++ ++%If (Qt_4_3_0 -) ++// QList > is implemented as a Python list of 2-element tuples. ++%MappedType QList > ++{ ++%TypeHeaderCode ++#include ++#include ++%End ++ ++%ConvertFromTypeCode ++ // Create the list. ++ PyObject *l; ++ ++ if ((l = PyList_New(sipCpp->size())) == NULL) ++ return NULL; ++ ++ // Set the list elements. ++ for (int i = 0; i < sipCpp->size(); ++i) ++ { ++ const QPair &p = sipCpp->at(i); ++ PyObject *pobj; ++ ++ if ((pobj = Py_BuildValue((char *)"dd", p.first, p.second)) == NULL) ++ { ++ Py_DECREF(l); ++ ++ return NULL; ++ } ++ ++ PyList_SET_ITEM(l, i, pobj); ++ } ++ ++ return l; ++%End ++ ++%ConvertToTypeCode ++ SIP_SSIZE_T len; ++ ++ // Check the type if that is all that is required. ++ if (sipIsErr == NULL) ++ { ++ if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy)) < 0) ++ return 0; ++ ++ for (SIP_SSIZE_T i = 0; i < len; ++i) ++ { ++ PyObject *tup = PySequence_ITEM(sipPy, i); ++ ++ if (!PySequence_Check(tup) || PySequence_Size(tup) != 2) ++ return 0; ++ } ++ ++ return 1; ++ } ++ ++ QList > *ql = new QList >; ++ len = PySequence_Size(sipPy); ++ ++ for (SIP_SSIZE_T i = 0; i < len; ++i) ++ { ++ PyObject *tup = PySequence_ITEM(sipPy, i); ++ ++ double first = PyFloat_AsDouble(PySequence_ITEM(tup, 0)); ++ double second = PyFloat_AsDouble(PySequence_ITEM(tup, 1)); ++ ++ ql->append(QPair(first, second)); ++ } ++ ++ *sipCppPtr = ql; ++ ++ return sipGetState(sipTransferObj); ++%End ++}; ++%End ++%If (Qt_4_3_0 -) ++// QList > is implemented as a Python list of 2-element tuples. ++template ++%MappedType QList > ++{ ++%TypeHeaderCode ++#include ++#include ++%End ++ ++%ConvertFromTypeCode ++ // Create the list. ++ PyObject *l; ++ ++ if ((l = PyList_New(sipCpp->size())) == NULL) ++ return NULL; ++ ++ // Set the list elements. ++ for (int i = 0; i < sipCpp->size(); ++i) ++ { ++ const QPair &p = sipCpp->at(i); ++ TYPE *t = new TYPE(p.second); ++ PyObject *pobj; ++ ++ if ((pobj = sipBuildResult(NULL, "(dB)", p.first, t, sipClass_TYPE, sipTransferObj)) == NULL) ++ { ++ Py_DECREF(l); ++ delete t; ++ ++ return NULL; ++ } ++ ++ PyList_SET_ITEM(l, i, pobj); ++ } ++ ++ return l; ++%End ++ ++%ConvertToTypeCode ++ SIP_SSIZE_T len; ++ ++ // Check the type if that is all that is required. ++ if (sipIsErr == NULL) ++ { ++ if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy)) < 0) ++ return 0; ++ ++ for (SIP_SSIZE_T i = 0; i < len; ++i) ++ { ++ PyObject *tup = PySequence_ITEM(sipPy, i); ++ ++ if (!PySequence_Check(tup) || PySequence_Size(tup) != 2) ++ return 0; ++ ++ if (!sipCanConvertToInstance(PySequence_ITEM(tup, 1), sipClass_TYPE, SIP_NOT_NONE)) ++ return 0; ++ } ++ ++ return 1; ++ } ++ ++ QList > *ql = new QList >; ++ len = PySequence_Size(sipPy); ++ ++ for (SIP_SSIZE_T i = 0; i < len; ++i) ++ { ++ PyObject *tup = PySequence_ITEM(sipPy, i); ++ double d; ++ int state; ++ ++ d = PyFloat_AsDouble(PySequence_ITEM(tup, 0)); ++ TYPE *t = reinterpret_cast(sipConvertToInstance(PySequence_ITEM(tup, 1), sipClass_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); ++ ++ if (*sipIsErr) ++ { ++ sipReleaseInstance(t, sipClass_TYPE, state); ++ ++ delete ql; ++ return 0; ++ } ++ ++ ql->append(QPair(d, *t)); ++ ++ sipReleaseInstance(t, sipClass_TYPE, state); ++ } ++ ++ *sipCppPtr = ql; ++ ++ return sipGetState(sipTransferObj); ++%End ++}; ++%End ++ ++// QList is implemented as a Python list of doubles. ++%MappedType QList ++{ ++%TypeHeaderCode ++#include ++%End ++ ++%ConvertFromTypeCode ++ // Create the list. ++ PyObject *l; ++ ++ if ((l = PyList_New(sipCpp->size())) == NULL) ++ return NULL; ++ ++ // Set the list elements. ++ for (int i = 0; i < sipCpp->size(); ++i) ++ { ++ PyObject *pobj; ++ ++ if ((pobj = PyFloat_FromDouble(sipCpp->value(i))) == NULL) ++ { ++ Py_DECREF(l); ++ ++ return NULL; ++ } ++ ++ PyList_SET_ITEM(l, i, pobj); ++ } ++ ++ return l; ++%End ++ ++%ConvertToTypeCode ++ // Check the type if that is all that is required. ++ if (sipIsErr == NULL) ++ return (PySequence_Check(sipPy) && PySequence_Size(sipPy) >= 0); ++ ++ QList *ql = new QList; ++ SIP_SSIZE_T len = PySequence_Size(sipPy); ++ ++ for (SIP_SSIZE_T i = 0; i < len; ++i) ++ ql->append(PyFloat_AsDouble(PySequence_ITEM(sipPy, i))); ++ ++ *sipCppPtr = ql; ++ ++ return sipGetState(sipTransferObj); ++%End ++}; ++ ++%End