From danny@ricin.com  Tue Sep 28 22:25:39 2004
Return-Path: <danny@ricin.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5856316A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 28 Sep 2004 22:25:39 +0000 (GMT)
Received: from smtpq2.home.nl (smtpq2.home.nl [213.51.128.197])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E0A2243D48
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 28 Sep 2004 22:25:38 +0000 (GMT)
	(envelope-from danny@ricin.com)
Received: from [213.51.128.134] (port=46233 helo=smtp3.home.nl)
	by smtpq2.home.nl with esmtp (Exim 4.30)
	id 1CCQPi-0005uL-7P; Wed, 29 Sep 2004 00:25:38 +0200
Received: from cp464173-a.dbsch1.nb.home.nl ([217.122.43.97]:49751)
	by smtp3.home.nl with smtp (Exim 4.30)
	id 1CCQPg-00045G-6j; Wed, 29 Sep 2004 00:25:36 +0200
Received: by cp464173-a.dbsch1.nb.home.nl (sSMTP sendmail emulation); Wed, 29 Sep 2004 00:23:32 +0200
Message-Id: <20040928222538.E0A2243D48@mx1.FreeBSD.org>
Date: Wed, 29 Sep 2004 00:23:32 +0200
From: danny@ricin.com
Reply-To: danny@ricin.com
To: FreeBSD-gnats-submit@freebsd.org
Cc: eugos@gmx.net
Subject: [patch] Update x11-toolkits/py-qt to 3.13 and fix unfetchable
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         72154
>Category:       ports
>Synopsis:       [patch] Update x11-toolkits/py-qt to 3.13 and fix unfetchable
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 28 22:30:28 GMT 2004
>Closed-Date:    Sun Nov 07 11:22:30 GMT 2004
>Last-Modified:  Sun Nov 07 11:22:30 GMT 2004
>Originator:     Danny Pansters
>Release:        FreeBSD 5.3-BETA4 i386
>Organization:
>Environment:
System: FreeBSD workstation.homenet 5.3-BETA4 FreeBSD 5.3-BETA4 #2: Fri Sep 17 04:04:10 CEST 2004 root@workstation.homenet:/usr/obj/usr/src/sys/WORKSTATION i386


	
>Description:
	Update to new 3.13 version. The former 3.12 is not fetchable from
master site anymore. Note lib dependency on qscintilla.5 and build dependency 
on sip, both of which need to be updated to be fetchable again also 
(ports/72152 and ports/72153 ). Maintainer cc'd.
>How-To-Repeat:
	
>Fix:
	Patch to be applied from within /usr/ports or a local ports tree
	

--- py-qt.diff begins here ---
diff -urN x11-toolkits/py-qt/Makefile x11-toolkits/py-qt.new/Makefile
--- x11-toolkits/py-qt/Makefile	Tue Sep 28 19:46:31 2004
+++ x11-toolkits/py-qt.new/Makefile	Tue Sep 28 19:47:22 2004
@@ -5,7 +5,7 @@
 # $FreeBSD: ports/x11-toolkits/py-qt/Makefile,v 1.24 2004/06/16 15:20:39 krion Exp $
 
 PORTNAME=	qt
-PORTVERSION=	3.12
+PORTVERSION=	3.13
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	http://www.river-bank.demon.co.uk/download/PyQt/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +14,7 @@
 MAINTAINER=	eugos@gmx.net
 COMMENT=	Python bindings for the Qt toolkit
 
-LIB_DEPENDS=	qscintilla.4:${PORTSDIR}/x11-toolkits/qscintilla
+LIB_DEPENDS=	qscintilla.5:${PORTSDIR}/x11-toolkits/qscintilla
 BUILD_DEPENDS=	${LOCALBASE}/bin/sip:${PORTSDIR}/devel/py-sip
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
@@ -34,5 +34,9 @@
 		-b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR} \
 		-n ${X11BASE}/include -o ${X11BASE}/lib \
 		-v ${PREFIX}/share/sip)
+
+post-install:
+	@${PYTHON_CMD} -c "import pyqtconfig"
+	@${PYTHON_CMD} -O -c "import pyqtconfig"
 
 .include <bsd.port.post.mk>
diff -urN x11-toolkits/py-qt/distinfo x11-toolkits/py-qt.new/distinfo
--- x11-toolkits/py-qt/distinfo	Tue Sep 28 19:46:31 2004
+++ x11-toolkits/py-qt.new/distinfo	Mon Sep 27 23:52:48 2004
@@ -1,2 +1,2 @@
-MD5 (PyQt-x11-gpl-3.12.tar.gz) = 0869e68c24ee6e46ae74d3244e7ec299
-SIZE (PyQt-x11-gpl-3.12.tar.gz) = 760165
+MD5 (PyQt-x11-gpl-3.13.tar.gz) = a4145b39742a4d9df9b6bf06495f75f5
+SIZE (PyQt-x11-gpl-3.13.tar.gz) = 763066
diff -urN x11-toolkits/py-qt/pkg-plist x11-toolkits/py-qt.new/pkg-plist
--- x11-toolkits/py-qt/pkg-plist	Tue Sep 28 19:46:31 2004
+++ x11-toolkits/py-qt.new/pkg-plist	Tue Sep 28 19:27:47 2004
@@ -1,6 +1,8 @@
 bin/pylupdate
 bin/pyuic
 %%PYTHON_SITELIBDIR%%/pyqtconfig.py
+%%PYTHON_SITELIBDIR%%/pyqtconfig.pyc
+%%PYTHON_SITELIBDIR%%/pyqtconfig.pyo
 %%PYTHON_SITELIBDIR%%/qt.so
 %%PYTHON_SITELIBDIR%%/qtcanvas.so
 %%PYTHON_SITELIBDIR%%/qtext.so
@@ -86,6 +88,7 @@
 share/sip/qt/qmenubar.sip
 share/sip/qt/qmenudata.sip
 share/sip/qt/qmessagebox.sip
+share/sip/qt/qmetaobject.sip
 share/sip/qt/qmime.sip
 share/sip/qt/qmotifplusstyle.sip
 share/sip/qt/qmotifstyle.sip
@@ -168,6 +171,7 @@
 share/sip/qt/qurl.sip
 share/sip/qt/qurlinfo.sip
 share/sip/qt/qurloperator.sip
+share/sip/qt/quuid.sip
 share/sip/qt/qvalidator.sip
 share/sip/qt/qvaluelist.sip
 share/sip/qt/qvariant.sip
@@ -201,6 +205,7 @@
 share/sip/qtext/qextscintillacommandset.sip
 share/sip/qtext/qextscintilladocument.sip
 share/sip/qtext/qextscintillalexer.sip
+share/sip/qtext/qextscintillalexerbash.sip
 share/sip/qtext/qextscintillalexercpp.sip
 share/sip/qtext/qextscintillalexercsharp.sip
 share/sip/qtext/qextscintillalexerhtml.sip
--- py-qt.diff ends here ---


>Release-Note:
>Audit-Trail:

From: Eugene Ossintsev <eugos@gmx.net>
To: freebsd-gnats-submit@FreeBSD.org, danny@ricin.com
Cc:  
Subject: Re: ports/72154: [patch] Update x11-toolkits/py-qt to 3.13 and fix
 unfetchable
Date: Wed, 29 Sep 2004 01:37:52 +0200

 Hello,
 
 The patch looks quite correct. But unfortunately I don't have enough 
 time now to test it. Moreover, I'm no more interested to put my energy 
 to maintain this particular port. So, if you, Danny, could take the 
 maintainership of the port I would be very grateful.
 
 -- 
 Eugene Ossintsev

From: Danny Pansters <danny@ricin.com>
To: freebsd-gnats-submit@freebsd.org, danny@ricin.com
Cc:  
Subject: Re: ports/72154: [patch] Update x11-toolkits/py-qt to 3.13 and fix unfetchable
Date: Wed, 29 Sep 2004 02:32:58 +0200

 I will gladly take maintainership of py-qt and py-kde if I can also maintain 
 py-sip, otherwise I'll always be lagging behind with sip and I'm not going to 
 do that.
 
 That's the deal. Take it or leave it ;-)
 

From: Eugene Ossintsev <eugos@gmx.net>
To: freebsd-gnats-submit@FreeBSD.org, danny@ricin.com
Cc:  
Subject: Re: ports/72154: [patch] Update x11-toolkits/py-qt to 3.13 and fix
 unfetchable
Date: Wed, 29 Sep 2004 20:45:38 +0200

 py-kde is not maintaned by me but you may take sip, no problem. I agree 
 it would be easier to maintain all three by one person.
 
 -- 
 Eugene Ossintsev

From: Danny Pansters <danny@ricin.com>
To: freebsd-gnats-submit@freebsd.org, danny@ricin.com
Cc:  
Subject: Re: ports/72154: [patch] Update x11-toolkits/py-qt to 3.13 and fix unfetchable
Date: Thu, 30 Sep 2004 21:32:44 +0200

 I'd like to become maintainer for this port. Would the committer please 
 s/eugos@gmx.net/danny@ricin.com/ ? Thanks.
 
 See also ports/72153 (devel/py-sip)
 
 And thank you Eugene, for your quick replies and your understanding.
  
 
State-Changed-From-To: open->feedback 
State-Changed-By: linimon 
State-Changed-When: Sun Oct 17 06:44:38 GMT 2004 
State-Changed-Why:  
This doesn't build for me on 4.x.  Any ideas? 

sipqttableQTable.cpp: In method `enum sipQTable::sipEditMode sipQTable::sipProtect_editMode()': 
sipqttableQTable.cpp:4413: static_cast from `QTable::EditMode' to `sipQTable::sipEditMode' 
sipqttableQTable.cpp:4414: warning: control reaches end of non-void function `sipQTable::sipProtect_editMode()' 
*** Error code 1 

http://www.freebsd.org/cgi/query-pr.cgi?pr=72154 
State-Changed-From-To: feedback->closed 
State-Changed-By: lofi 
State-Changed-When: Sat Nov 6 16:04:25 GMT 2004 
State-Changed-Why:  
Superseded by ports/72156 


http://www.freebsd.org/cgi/query-pr.cgi?pr=72154 
State-Changed-From-To: closed->feedback 
State-Changed-By: lofi 
State-Changed-When: Sun Nov 7 03:20:18 GMT 2004 
State-Changed-Why:  
Reopen, I misread PR 72154. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=72154 
State-Changed-From-To: feedback->closed 
State-Changed-By: lofi 
State-Changed-When: Sun Nov 7 11:22:06 GMT 2004 
State-Changed-Why:  
Committed, thanks. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=72154 
>Unformatted:
