Attachment 163995 Details for Bug 205143 – Patch v2

[patch] Patch v2

pyqt4-4.11.4-sip-4.17-qscintilla-2.9.1-v2.patch (text/plain), 7.91 KB, created by Raphael Kubo da Costa on 2015-12-08 17:44:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Raphael Kubo da Costa

Created: 2015-12-08 17:44:52 UTC

Size: 7.91 KB

patch

obsolete

>Index: Mk/Uses/pyqt.mk
>===================================================================
>--- Mk/Uses/pyqt.mk	(revision 403301)
>+++ Mk/Uses/pyqt.mk	(working copy)
>@@ -59,9 +59,9 @@
> MASTER_SITES_QSCI2=	SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \
> 			GENTOO
> 
>-SIP_VERSION=		4.16.5
>-QSCI2_VERSION=		2.8.4
>-PYQT4_VERSION=		4.11.3
>+SIP_VERSION=		4.17
>+QSCI2_VERSION=		2.9.1
>+PYQT4_VERSION=		4.11.4
> 
> SIP_DISTNAME=		sip-${SIP_VERSION}
> PYQT4_DISTNAME=		PyQt-x11-gpl-${PYQT4_VERSION}
>@@ -164,7 +164,7 @@
> py-xml_DESC=		Python bindings for QtXml module
> py-xmlpatterns_DESC=	Python bindings for QtXmlPatterns module
> 
>-SIPDIR_REL=	share/py-sip
>+SIPDIR_REL=	share/py-sip/PyQt${_PYQT_VERSION}
> SIPDIR=		${PREFIX}/${SIPDIR_REL}
> PLIST_SUB+=	PYQT_SIPDIR=${SIPDIR_REL}
> 
>Index: devel/py-qt4/distinfo
>===================================================================
>--- devel/py-qt4/distinfo	(revision 403301)
>+++ devel/py-qt4/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (PyQt-x11-gpl-4.11.3.tar.gz) = 853780dcdbe2e6ba785d703d059b096e1fc49369d3e8d41a060be874b8745686
>-SIZE (PyQt-x11-gpl-4.11.3.tar.gz) = 11120237
>+SHA256 (PyQt-x11-gpl-4.11.4.tar.gz) = fc1fe77495432ba3b0d74ff5cb164d375a97f5dddb728256330f615a7cdcf407
>+SIZE (PyQt-x11-gpl-4.11.4.tar.gz) = 11317088
>Index: devel/py-qt4-dbus/Makefile
>===================================================================
>--- devel/py-qt4-dbus/Makefile	(revision 403301)
>+++ devel/py-qt4-dbus/Makefile	(working copy)
>@@ -2,7 +2,6 @@
> # $FreeBSD$
> 
> PORTNAME=	dbus
>-PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	devel python
> 
>Index: devel/py-qt4-dbussupport/Makefile
>===================================================================
>--- devel/py-qt4-dbussupport/Makefile	(revision 403301)
>+++ devel/py-qt4-dbussupport/Makefile	(working copy)
>@@ -1,7 +1,6 @@
> # $FreeBSD$
> 
> PORTNAME=	dbussupport
>-PORTREVISION=	1
> CATEGORIES=	devel python
> 
> MAINTAINER=	kde@FreeBSD.org
>Index: devel/py-qt4-qscintilla2/pkg-plist
>===================================================================
>--- devel/py-qt4-qscintilla2/pkg-plist	(revision 403301)
>+++ devel/py-qt4-qscintilla2/pkg-plist	(working copy)
>@@ -43,14 +43,12 @@
> %%PYQT_SIPDIR%%/Qsci/qscilexerxml.sip
> %%PYQT_SIPDIR%%/Qsci/qscilexeryaml.sip
> %%PYQT_SIPDIR%%/Qsci/qscimacro.sip
>-%%PYQT_SIPDIR%%/Qsci/qscimod3.sip
> %%PYQT_SIPDIR%%/Qsci/qscimod4.sip
> %%PYQT_SIPDIR%%/Qsci/qscimod5.sip
> %%PYQT_SIPDIR%%/Qsci/qscimodcommon.sip
> %%PYQT_SIPDIR%%/Qsci/qsciprinter.sip
> %%PYQT_SIPDIR%%/Qsci/qsciscintilla.sip
>-%%PYQT_SIPDIR%%/Qsci/qsciscintillabase3.sip
>-%%PYQT_SIPDIR%%/Qsci/qsciscintillabase4.sip
>+%%PYQT_SIPDIR%%/Qsci/qsciscintillabase.sip
> %%PYQT_SIPDIR%%/Qsci/qscistyle.sip
> %%PYQT_SIPDIR%%/Qsci/qscistyledtext.sip
> share/qt4/qsci/api/python/QScintilla2.api
>Index: devel/py-sip/Makefile
>===================================================================
>--- devel/py-sip/Makefile	(revision 403301)
>+++ devel/py-sip/Makefile	(working copy)
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	sip
> PORTVERSION=	${SIP_VERSION}
>-PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	devel python
> MASTER_SITES=	${MASTER_SITES_SIP}
>Index: devel/py-sip/distinfo
>===================================================================
>--- devel/py-sip/distinfo	(revision 403301)
>+++ devel/py-sip/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (sip-4.16.5.tar.gz) = a00ba34c30bedc0f61916eb10bd12867b4754910a766647e3e58f88bd00f1e87
>-SIZE (sip-4.16.5.tar.gz) = 859672
>+SHA256 (sip-4.17.tar.gz) = 603026822adf8673fca6e0ea20b02c3c4a2dccb309647656f7269adc8de89060
>+SIZE (sip-4.17.tar.gz) = 959835
>Index: devel/qscintilla2/distinfo
>===================================================================
>--- devel/qscintilla2/distinfo	(revision 403301)
>+++ devel/qscintilla2/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (QScintilla-gpl-2.8.4.tar.gz) = 9b7b2d7440cc39736bbe937b853506b3bd218af3b79095d4f710cccb0fabe80f
>-SIZE (QScintilla-gpl-2.8.4.tar.gz) = 3031919
>+SHA256 (QScintilla-gpl-2.9.1.tar.gz) = 79e9c39d51549061d3d489387bcee86ff20c1f746d1b25ac173d5165426eabaf
>+SIZE (QScintilla-gpl-2.9.1.tar.gz) = 2490144
>Index: devel/qscintilla2/pkg-plist
>===================================================================
>--- devel/qscintilla2/pkg-plist	(revision 403301)
>+++ devel/qscintilla2/pkg-plist	(working copy)
>@@ -49,9 +49,9 @@
> %%QT_INCDIR%%/Qsci/qscistyle.h
> %%QT_INCDIR%%/Qsci/qscistyledtext.h
> %%QT_LIBDIR%%/libqscintilla2.so
>-%%QT_LIBDIR%%/libqscintilla2.so.11
>-%%QT_LIBDIR%%/libqscintilla2.so.11.3
>-%%QT_LIBDIR%%/libqscintilla2.so.11.3.0
>+%%QT_LIBDIR%%/libqscintilla2.so.12
>+%%QT_LIBDIR%%/libqscintilla2.so.12.0
>+%%QT_LIBDIR%%/libqscintilla2.so.12.0.1
> %%QT_MKSPECDIR%%/features/qscintilla2.prf
> share/qt4/qsci/api/python/Python-2.4.api
> share/qt4/qsci/api/python/Python-2.5.api
>@@ -61,6 +61,7 @@
> share/qt4/qsci/api/python/Python-3.2.api
> share/qt4/qsci/api/python/Python-3.3.api
> share/qt4/qsci/api/python/Python-3.4.api
>+share/qt4/qsci/api/python/Python-3.5.api
> %%NLS%%share/qt4/translations/qscintilla_cs.qm
> %%NLS%%share/qt4/translations/qscintilla_de.qm
> %%NLS%%share/qt4/translations/qscintilla_es.qm
>Index: graphics/seexpr/Makefile
>===================================================================
>--- graphics/seexpr/Makefile	(revision 403301)
>+++ graphics/seexpr/Makefile	(working copy)
>@@ -11,13 +11,12 @@
> 
> LICENSE=	APACHE20
> 
>-BUILD_DEPENDS=	${LOCALBASE}/share/py-sip/QtGui/QtGuimod.sip:${PORTSDIR}/x11-toolkits/py-qt4-gui
>-
> USE_GITHUB=	yes
> GH_ACCOUNT=	wdas
> GH_TAGNAME=	36ffb818b8
> 
>-USES=		bison cmake compiler:c++0x python
>+USES=		bison cmake compiler:c++0x pyqt:4 python
>+USE_PYQT=	gui_build
> USE_QT4=	moc_build qmake_build rcc_build uic_build gui opengl
> 
> WRKSRC=		${WRKDIR}/SeExpr-${GH_TAGNAME_EXTRACT}
>Index: misc/py-qt4-demo/Makefile
>===================================================================
>--- misc/py-qt4-demo/Makefile	(revision 403301)
>+++ misc/py-qt4-demo/Makefile	(working copy)
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	demo
> PORTVERSION=	${PYQT4_VERSION}
>-PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	misc devel python
> MASTER_SITES=	${MASTER_SITES_PYQT4}
>Index: misc/py-qt4-doc/Makefile
>===================================================================
>--- misc/py-qt4-doc/Makefile	(revision 403301)
>+++ misc/py-qt4-doc/Makefile	(working copy)
>@@ -23,10 +23,10 @@
> do-install:
> 	cd ${WRKSRC} &&\
> 		${MKDIR} ${STAGEDIR}${DOCSDIR} &&\
>-		${INSTALL_DATA} GPL_EXCEPTION.TXT\
>-				GPL_EXCEPTION_ADDENDUM.TXT NEWS\
>-				LICENSE.GPL2 LICENSE.GPL3\
>-				OPENSOURCE-NOTICE.TXT README THANKS\
>+		${INSTALL_DATA} LICENSE \
>+				NEWS \
>+				README \
>+				THANKS\
> 			${STAGEDIR}${DOCSDIR}
> 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}
> 
>Index: misc/py-qt4-doc/pkg-plist
>===================================================================
>--- misc/py-qt4-doc/pkg-plist	(revision 403301)
>+++ misc/py-qt4-doc/pkg-plist	(working copy)
>@@ -1,9 +1,5 @@
>-%%DOCSDIR%%/GPL_EXCEPTION.TXT
>-%%DOCSDIR%%/GPL_EXCEPTION_ADDENDUM.TXT
>-%%DOCSDIR%%/LICENSE.GPL2
>-%%DOCSDIR%%/LICENSE.GPL3
>+%%DOCSDIR%%/LICENSE
> %%DOCSDIR%%/NEWS
>-%%DOCSDIR%%/OPENSOURCE-NOTICE.TXT
> %%DOCSDIR%%/README
> %%DOCSDIR%%/THANKS
> %%DOCSDIR%%/html/_sources/buffer_interface.txt
>@@ -33,15 +29,16 @@
> %%DOCSDIR%%/html/_sources/webkit.txt
> %%DOCSDIR%%/html/_static/ajax-loader.gif
> %%DOCSDIR%%/html/_static/basic.css
>+%%DOCSDIR%%/html/_static/classic.css
> %%DOCSDIR%%/html/_static/comment-bright.png
> %%DOCSDIR%%/html/_static/comment-close.png
> %%DOCSDIR%%/html/_static/comment.png
>-%%DOCSDIR%%/html/_static/default.css
> %%DOCSDIR%%/html/_static/doctools.js
> %%DOCSDIR%%/html/_static/down-pressed.png
> %%DOCSDIR%%/html/_static/down.png
> %%DOCSDIR%%/html/_static/file.png
> %%DOCSDIR%%/html/_static/jquery.js
>+%%DOCSDIR%%/html/_static/jquery-1.11.1.js
> %%DOCSDIR%%/html/_static/logo.png
> %%DOCSDIR%%/html/_static/logo_tn.ico
> %%DOCSDIR%%/html/_static/minus.png
>@@ -50,6 +47,7 @@
> %%DOCSDIR%%/html/_static/searchtools.js
> %%DOCSDIR%%/html/_static/sidebar.js
> %%DOCSDIR%%/html/_static/underscore.js
>+%%DOCSDIR%%/html/_static/underscore-1.3.1.js
> %%DOCSDIR%%/html/_static/up-pressed.png
> %%DOCSDIR%%/html/_static/up.png
> %%DOCSDIR%%/html/_static/websupport.js

Actions: View | Diff

Attachments on bug 205143: 163994 | 163995