[PyQt4] upstream doItemsLayout patch

Rex Dieter rdieter at fedoraproject.org
Mon Jan 9 14:17:21 UTC 2012


commit 1c15280b9e5fc9b91f85e1ddcbda87953bbbd045
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Jan 9 08:17:22 2012 -0600

    upstream doItemsLayout patch

 PyQt-x11-gpl-4.9-doItemsLayout.patch |   44 ++++++++++++++++++++++++++++++++++
 PyQt4.spec                           |    8 ++++-
 2 files changed, 50 insertions(+), 2 deletions(-)
---
diff --git a/PyQt-x11-gpl-4.9-doItemsLayout.patch b/PyQt-x11-gpl-4.9-doItemsLayout.patch
new file mode 100644
index 0000000..fcde69d
--- /dev/null
+++ b/PyQt-x11-gpl-4.9-doItemsLayout.patch
@@ -0,0 +1,44 @@
+diff -up PyQt-x11-gpl-4.9/sip/QtGui/qabstractitemview.sip.doItemsLayout PyQt-x11-gpl-4.9/sip/QtGui/qabstractitemview.sip
+--- PyQt-x11-gpl-4.9/sip/QtGui/qabstractitemview.sip.doItemsLayout	2011-12-22 03:22:56.000000000 -0600
++++ PyQt-x11-gpl-4.9/sip/QtGui/qabstractitemview.sip	2012-01-09 08:14:27.766433278 -0600
+@@ -160,7 +160,6 @@ public:
+ public slots:
+     virtual void reset();
+     virtual void setRootIndex(const QModelIndex &index);
+-    virtual void doItemsLayout();
+     virtual void selectAll();
+     void edit(const QModelIndex &index);
+     void clearSelection();
+diff -up PyQt-x11-gpl-4.9/sip/QtGui/qheaderview.sip.doItemsLayout PyQt-x11-gpl-4.9/sip/QtGui/qheaderview.sip
+--- PyQt-x11-gpl-4.9/sip/QtGui/qheaderview.sip.doItemsLayout	2011-12-22 03:22:56.000000000 -0600
++++ PyQt-x11-gpl-4.9/sip/QtGui/qheaderview.sip	2012-01-09 08:14:36.467324502 -0600
+@@ -82,7 +82,6 @@ public:
+     Qt::SortOrder sortIndicatorOrder() const;
+     bool stretchLastSection() const;
+     void setStretchLastSection(bool stretch);
+-    virtual void doItemsLayout();
+     bool sectionsMoved() const;
+ 
+ public slots:
+diff -up PyQt-x11-gpl-4.9/sip/QtGui/qlistview.sip.doItemsLayout PyQt-x11-gpl-4.9/sip/QtGui/qlistview.sip
+--- PyQt-x11-gpl-4.9/sip/QtGui/qlistview.sip.doItemsLayout	2011-12-22 03:22:56.000000000 -0600
++++ PyQt-x11-gpl-4.9/sip/QtGui/qlistview.sip	2012-01-09 08:12:34.066854718 -0600
+@@ -91,7 +91,6 @@ public:
+     virtual QRect visualRect(const QModelIndex &index) const;
+     virtual void scrollTo(const QModelIndex &index, QAbstractItemView::ScrollHint hint = QAbstractItemView::EnsureVisible);
+     virtual QModelIndex indexAt(const QPoint &p) const;
+-    virtual void doItemsLayout();
+     virtual void reset();
+     virtual void setRootIndex(const QModelIndex &index);
+ 
+diff -up PyQt-x11-gpl-4.9/sip/QtGui/qtreeview.sip.doItemsLayout PyQt-x11-gpl-4.9/sip/QtGui/qtreeview.sip
+--- PyQt-x11-gpl-4.9/sip/QtGui/qtreeview.sip.doItemsLayout	2011-12-22 03:22:57.000000000 -0600
++++ PyQt-x11-gpl-4.9/sip/QtGui/qtreeview.sip	2012-01-09 08:14:43.661234565 -0600
+@@ -62,7 +62,6 @@ public:
+     virtual QModelIndex indexAt(const QPoint &p) const;
+     QModelIndex indexAbove(const QModelIndex &index) const;
+     QModelIndex indexBelow(const QModelIndex &index) const;
+-    virtual void doItemsLayout();
+     virtual void reset();
+ 
+ signals:
diff --git a/PyQt4.spec b/PyQt4.spec
index fd4db84..38ae886 100644
--- a/PyQt4.spec
+++ b/PyQt4.spec
@@ -4,7 +4,7 @@
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
 Version: 4.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions
@@ -19,8 +19,8 @@ Patch4:  PyQt-x11-gpl-4.8.3-pyuic_shbang.patch
 # fix multilib conflict because of timestamp
 Patch50:  PyQt-x11-gpl-4.6.2-timestamp-multilib.patch
 ## upstream patches
+Patch100: PyQt-x11-gpl-4.9-doItemsLayout.patch
 
-BuildRequires: chrpath
 BuildRequires: findutils
 BuildRequires: pkgconfig(dbus-1) pkgconfig(dbus-python)
 BuildRequires: pkgconfig(phonon)
@@ -100,6 +100,7 @@ from any of the Qt4 classes (e.g. KDE or your own).
 
 %patch4 -p1
 %patch50 -p1 -b .timestamp
+%patch100 -p1 -b .doItemsLayout
 
 ## permissions
 # mark examples non-executable
@@ -257,6 +258,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jan 09 2012 Rex Dieter <rdieter at fedoraproject.org> 4.9-2
+- upstream doItemsLayout patch
+
 * Fri Dec 23 2011 Rex Dieter <rdieter at fedoraproject.org> 4.9-1
 - 4.9
 


More information about the scm-commits mailing list