[arch-commits] Commit in python2-qt/trunk (PKGBUILD)

2011-04-04 Thread Ray Rashif
Date: Monday, April 4, 2011 @ 02:29:24
  Author: schiv
Revision: 117483

add PyQt term to desc for easier searching

Modified:
  python2-qt/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-04-03 19:07:21 UTC (rev 117482)
+++ PKGBUILD2011-04-04 06:29:24 UTC (rev 117483)
@@ -6,7 +6,7 @@
 pkgname=python2-qt
 pkgver=4.8.3
 pkgrel=1
-pkgdesc=A set of Python 2 bindings for the Qt toolkit
+pkgdesc=PyQt: A set of Python 2 bindings for the Qt toolkit
 arch=('i686' 'x86_64')
 url=http://riverbankcomputing.co.uk/software/pyqt/intro;
 license=('GPL')



[arch-commits] Commit in python2-qt/trunk (PKGBUILD fix-stackedwidget-bug.patch)

2011-01-24 Thread Andrea Scarpino
Date: Monday, January 24, 2011 @ 12:30:13
  Author: andrea
Revision: 107404

prepare next release

Modified:
  python2-qt/trunk/PKGBUILD
Deleted:
  python2-qt/trunk/fix-stackedwidget-bug.patch

-+
 PKGBUILD|   13 -
 fix-stackedwidget-bug.patch |   11 ---
 2 files changed, 4 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-24 17:30:04 UTC (rev 107403)
+++ PKGBUILD2011-01-24 17:30:13 UTC (rev 107404)
@@ -4,8 +4,8 @@
 # Contributor: riai r...@bigfoot.com Ben b...@benmazer.net
 
 pkgname=python2-qt
-pkgver=4.8.2
-pkgrel=4
+pkgver=4.8.3
+pkgrel=1
 pkgdesc=A set of Python 2 bindings for the Qt toolkit
 arch=('i686' 'x86_64')
 url=http://riverbankcomputing.co.uk/software/pyqt/intro;
@@ -17,17 +17,12 @@
'qscintilla: QScintilla API'
'qt-assistant-compat: add PyQt online help in Qt Assistant')
 replaces=('pyqt')
-source=(http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz;
-'fix-stackedwidget-bug.patch')
-md5sums=('142a32f126f205a2bd77f6a9910f5333'
-'42cfd44a8ec063cce3e328ddb9892565')
+source=(http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz;)
+md5sums=('d54fd1c37a74864faf42709c8102f254')
 
 build() {
   cd ${srcdir}/PyQt-x11-gpl-${pkgver}
 
-  # Already fixed upstream
-  patch -Np1 -i ${srcdir}/fix-stackedwidget-bug.patch
-
   python2 configure.py \
 --confirm-license \
 -v /usr/share/sip \

Deleted: fix-stackedwidget-bug.patch
===
--- fix-stackedwidget-bug.patch 2011-01-24 17:30:04 UTC (rev 107403)
+++ fix-stackedwidget-bug.patch 2011-01-24 17:30:13 UTC (rev 107404)
@@ -1,11 +0,0 @@
 PyQt-x11-gpl-4.8.2/pyuic/uic/uiparser.py~  2010-12-27 14:01:31.500057960 
-0800
-+++ PyQt-x11-gpl-4.8.2/pyuic/uic/uiparser.py   2010-12-27 14:01:44.460058033 
-0800
-@@ -158,7 +158,7 @@
- # Ignore the parent if it is a container.
- parent = self.stack.topwidget
- if isinstance(parent, (QtGui.QDockWidget, QtGui.QMdiArea,
--   QtGui.QScrollArea, QtGui.StackedWidget,
-+   QtGui.QScrollArea, QtGui.QStackedWidget,
-QtGui.QToolBox, QtGui.QTabWidget,
-QtGui.QWizard)):
- parent = None



[arch-commits] Commit in python2-qt/trunk (PKGBUILD)

2011-01-20 Thread Andrea Scarpino
Date: Thursday, January 20, 2011 @ 19:29:34
  Author: andrea
Revision: 107065

upgpkg: python2-qt 4.8.2-4
merge the pyqt package here to avoid python-qt dependence

Modified:
  python2-qt/trunk/PKGBUILD

--+
 PKGBUILD |   20 
 1 file changed, 8 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-21 00:28:53 UTC (rev 107064)
+++ PKGBUILD2011-01-21 00:29:34 UTC (rev 107065)
@@ -5,27 +5,28 @@
 
 pkgname=python2-qt
 pkgver=4.8.2
-pkgrel=3
+pkgrel=4
 pkgdesc=A set of Python 2 bindings for the Qt toolkit
 arch=('i686' 'x86_64')
 url=http://riverbankcomputing.co.uk/software/pyqt/intro;
 license=('GPL')
-depends=('pyqt' 'python2-sip' 'dbus-python')
+depends=('qt' 'python2-sip' 'dbus-python')
 makedepends=('phonon' 'python-opengl' 'qt-assistant-compat')
 optdepends=('phonon: enable audio and video in PyQt applications'
-   'python-opengl: enable OpenGL 3D graphics in PyQt applications'
-   'python2-qscintilla: QScintilla API'
+   'python-pengl: enable OpenGL 3D graphics in PyQt applications'
+   'qscintilla: QScintilla API'
'qt-assistant-compat: add PyQt online help in Qt Assistant')
+replaces=('pyqt')
 
source=(http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz;
 'fix-stackedwidget-bug.patch')
 md5sums=('142a32f126f205a2bd77f6a9910f5333'
 '42cfd44a8ec063cce3e328ddb9892565')
 
 build() {
-  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
 
   # Already fixed upstream
-  patch -Np1 -i ${srcdir}/fix-stackedwidget-bug.patch
+  patch -Np1 -i ${srcdir}/fix-stackedwidget-bug.patch
 
   python2 configure.py \
 --confirm-license \
@@ -39,12 +40,7 @@
 }
 
 package(){
-  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
   # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use 
DESTDIR
   make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install
-
-  # Provided by pyqt
-  rm ${pkgdir}/usr/bin/{pylupdate4,pyrcc4,pyuic4}
-  rm ${pkgdir}/usr/lib/qt/plugins/designer/libpythonplugin.so
-  rm ${pkgdir}/usr/share/qt/qsci/api/python/PyQt4.api
 }



[arch-commits] Commit in python2-qt/trunk (PKGBUILD)

2011-01-20 Thread Andrea Scarpino
Date: Thursday, January 20, 2011 @ 19:54:53
  Author: andrea
Revision: 107081

typo

Modified:
  python2-qt/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-21 00:49:04 UTC (rev 107080)
+++ PKGBUILD2011-01-21 00:54:53 UTC (rev 107081)
@@ -13,7 +13,7 @@
 depends=('qt' 'python2-sip' 'dbus-python')
 makedepends=('phonon' 'python-opengl' 'qt-assistant-compat')
 optdepends=('phonon: enable audio and video in PyQt applications'
-   'python-pengl: enable OpenGL 3D graphics in PyQt applications'
+   'python-opengl: enable OpenGL 3D graphics in PyQt applications'
'qscintilla: QScintilla API'
'qt-assistant-compat: add PyQt online help in Qt Assistant')
 replaces=('pyqt')



[arch-commits] Commit in python2-qt/trunk (PKGBUILD)

2011-01-19 Thread Andrea Scarpino
Date: Wednesday, January 19, 2011 @ 13:22:59
  Author: andrea
Revision: 106914

this have to depends on pyqt

Modified:
  python2-qt/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-19 18:15:37 UTC (rev 106913)
+++ PKGBUILD2011-01-19 18:22:59 UTC (rev 106914)
@@ -5,12 +5,12 @@
 
 pkgname=python2-qt
 pkgver=4.8.2
-pkgrel=2
+pkgrel=3
 pkgdesc=A set of Python 2 bindings for the Qt toolkit
 arch=('i686' 'x86_64')
 url=http://riverbankcomputing.co.uk/software/pyqt/intro;
 license=('GPL')
-depends=('python2-sip' 'qt' 'dbus-python')
+depends=('pyqt' 'python2-sip' 'qt' 'dbus-python')
 makedepends=('phonon' 'python-opengl' 'qt-assistant-compat')
 optdepends=('phonon: enable audio and video in PyQt applications'
'python-opengl: enable OpenGL 3D graphics in PyQt applications'



[arch-commits] Commit in python2-qt/trunk (PKGBUILD)

2011-01-18 Thread Andrea Scarpino
Date: Tuesday, January 18, 2011 @ 18:16:09
  Author: andrea
Revision: 106745

remove conflicts with python2-qt and add depends to pyqt

Modified:
  python2-qt/trunk/PKGBUILD

--+
 PKGBUILD |   14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-18 22:56:19 UTC (rev 106744)
+++ PKGBUILD2011-01-18 23:16:09 UTC (rev 106745)
@@ -5,8 +5,8 @@
 
 pkgname=python2-qt
 pkgver=4.8.2
-pkgrel=1
-pkgdesc=A set of Python bindings for the Qt toolkit
+pkgrel=2
+pkgdesc=A set of Python 2 bindings for the Qt toolkit
 arch=('i686' 'x86_64')
 url=http://riverbankcomputing.co.uk/software/pyqt/intro;
 license=('GPL')
@@ -14,11 +14,8 @@
 makedepends=('phonon' 'python-opengl' 'qt-assistant-compat')
 optdepends=('phonon: enable audio and video in PyQt applications'
'python-opengl: enable OpenGL 3D graphics in PyQt applications'
-   'qscintilla: QScintilla API'
+   'python2-qscintilla: QScintilla API'
'qt-assistant-compat: add PyQt online help in Qt Assistant')
-provides=('pyqt4' pyqt=${pkgver})
-replaces=('pyqt4' 'pyqt')
-conflicts=('pyqt4' 'pyqt')
 
source=(http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz;
 'fix-stackedwidget-bug.patch')
 md5sums=('142a32f126f205a2bd77f6a9910f5333'
@@ -45,4 +42,9 @@
   cd ${srcdir}/PyQt-x11-gpl-${pkgver}
   # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use 
DESTDIR
   make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install
+
+  # Provided by pyqt
+  rm ${pkgdir}/usr/bin/{pylupdate4,pyrcc4,pyuic4}
+  rm ${pkgdir}/usr/lib/qt/plugins/designer/libpythonplugin.so
+  rm ${pkgdir}/usr/share/qt/qsci/api/python/PyQt4.api
 }