Attachment 169985 Details for Bug 209283 – Patch against ports r414596

[patch] Patch against ports r414596

py-qt4.patch (text/plain), 13.11 KB, created by groot on 2016-05-05 12:44:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: groot

Created: 2016-05-05 12:44:06 UTC

Size: 13.11 KB

patch

obsolete

>diff -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/databases/py-qt4-sql/Makefile /zbigone/src/area51/trunk/PYQT/databases/py-qt4-sql/Makefile
>--- /zbigone/src/ports-playground/databases/py-qt4-sql/Makefile	2016-04-01 20:03:50.453966200 +0200
>+++ /zbigone/src/area51/trunk/PYQT/databases/py-qt4-sql/Makefile	2016-04-20 09:25:12.341304000 +0200
>@@ -12,8 +12,9 @@
> PYQT_DIST=	yes
> 
> USES=		python pyqt:4
>-USE_PYQT=	sip_build gui_run
>-USE_QT4=	moc_build gui sql qmake_build
>+USE_PYQT=	sip_build core_run gui_run
>+USE_QT4=	corelib gui sql \
>+		moc_build qmake_build
> 
> OPTIONS_DEFINE=	API DEBUG
> OPTIONS_DEFAULT=API
>diff -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/devel/py-qt4-assistant/Makefile /zbigone/src/area51/trunk/PYQT/devel/py-qt4-assistant/Makefile
>--- /zbigone/src/ports-playground/devel/py-qt4-assistant/Makefile	2016-04-01 20:01:15.837976957 +0200
>+++ /zbigone/src/area51/trunk/PYQT/devel/py-qt4-assistant/Makefile	2016-04-20 09:25:12.262002000 +0200
>@@ -12,8 +12,9 @@
> PYQT_DIST=	yes
> 
> USES=		python pyqt:4
>-USE_PYQT=	sip_build gui_run network_run
>-USE_QT4=	assistantclient moc_build qmake_build
>+USE_PYQT=	sip_build core_run
>+USE_QT4=	assistantclient corelib gui network \
>+		moc_build qmake_build
> 
> OPTIONS_DEFINE=	API DEBUG
> OPTIONS_DEFAULT=API
>diff -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/devel/py-qt4-core/Makefile /zbigone/src/area51/trunk/PYQT/devel/py-qt4-core/Makefile
>--- /zbigone/src/ports-playground/devel/py-qt4-core/Makefile	2016-04-01 20:01:17.124976887 +0200
>+++ /zbigone/src/area51/trunk/PYQT/devel/py-qt4-core/Makefile	2016-04-20 09:25:12.189814000 +0200
>@@ -13,7 +13,7 @@
> 
> USES=			python pyqt:4
> USE_PYTHON=		py3kplist
>-USE_PYQT=		sip
>+USE_PYQT=		sip_build
> USE_QT4=		corelib qmake_build moc_build
> 
> OPTIONS_DEFINE=	API DEBUG
>diff -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/devel/py-qt4-dbus/Makefile /zbigone/src/area51/trunk/PYQT/devel/py-qt4-dbus/Makefile
>--- /zbigone/src/ports-playground/devel/py-qt4-dbus/Makefile	2016-04-01 20:01:15.702976911 +0200
>+++ /zbigone/src/area51/trunk/PYQT/devel/py-qt4-dbus/Makefile	2016-04-20 09:25:12.215971000 +0200
>@@ -13,7 +13,7 @@
> 
> USES=		python pyqt:4
> USE_PYQT=	sip_build core_run
>-USE_QT4=	dbus moc_build qmake_build
>+USE_QT4=	corelib dbus moc_build qmake_build
> 
> OPTIONS_DEFINE=	API DEBUG
> OPTIONS_DEFAULT=API
>diff -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/devel/py-qt4-declarative/Makefile /zbigone/src/area51/trunk/PYQT/devel/py-qt4-declarative/Makefile
>--- /zbigone/src/ports-playground/devel/py-qt4-declarative/Makefile	2016-04-01 20:01:15.839976781 +0200
>+++ /zbigone/src/area51/trunk/PYQT/devel/py-qt4-declarative/Makefile	2016-04-20 09:25:12.160435000 +0200
>@@ -10,8 +10,9 @@
> PYQT_DIST=	yes
> 
> USES=		python pyqt:4
>-USE_PYQT=	sip_build gui_run network_run
>-USE_QT4=	declarative qmake_build moc_build
>+USE_PYQT=	sip_build core_run gui_run network_run
>+USE_QT4=	corelib declarative gui network script sql svg xmlpatterns \
>+		qmake_build moc_build
> 
> OPTIONS_DEFINE=	API DEBUG
> OPTIONS_DEFAULT=API
>diff -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/devel/py-qt4-designer/Makefile /zbigone/src/area51/trunk/PYQT/devel/py-qt4-designer/Makefile
>--- /zbigone/src/ports-playground/devel/py-qt4-designer/Makefile	2016-04-01 20:01:17.127976650 +0200
>+++ /zbigone/src/area51/trunk/PYQT/devel/py-qt4-designer/Makefile	2016-04-20 09:25:12.237735000 +0200
>@@ -12,8 +12,8 @@
> PYQT_DIST=	yes
> 
> USES=		python pyqt:4
>-USE_PYQT=	sip_build gui_run script_run xml_run
>-USE_QT4=	gui xml designer moc_build qmake_build
>+USE_PYQT=	sip_build core_run gui_run
>+USE_QT4=	corelib designer gui moc_build qmake_build
> 
> OPTIONS_DEFINE=	API DEBUG
> OPTIONS_DEFAULT=API
>diff -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/devel/py-qt4-designerplugin/Makefile /zbigone/src/area51/trunk/PYQT/devel/py-qt4-designerplugin/Makefile
>--- /zbigone/src/ports-playground/devel/py-qt4-designerplugin/Makefile	2016-03-30 11:21:55.742034106 +0200
>+++ /zbigone/src/area51/trunk/PYQT/devel/py-qt4-designerplugin/Makefile	2016-02-21 11:07:51.694164554 +0100
>@@ -16,8 +16,8 @@
> PYQT_DIST=	yes
> 
> USES=		python pyqt:4
>-USE_PYQT=	sip_build designer_run
>-USE_QT4=	gui xml designer moc_build qmake_build
>+USE_PYQT=	sip_build
>+USE_QT4=	corelib designer gui script xml moc_build qmake_build
> 
> OPTIONS_DEFINE=		DEBUG
> DEBUG_CONFIGURE_ON=	--debug --trace
>diff -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/devel/py-qt4-help/Makefile /zbigone/src/area51/trunk/PYQT/devel/py-qt4-help/Makefile
>--- /zbigone/src/ports-playground/devel/py-qt4-help/Makefile	2016-04-01 20:01:15.788977019 +0200
>+++ /zbigone/src/area51/trunk/PYQT/devel/py-qt4-help/Makefile	2016-04-20 09:25:12.187832000 +0200
>@@ -10,8 +10,8 @@
> PYQT_DIST=	yes
> 
> USES=		python pyqt:4
>-USE_PYQT=	sip_build gui_run
>-USE_QT4=	help moc_build qmake_build
>+USE_PYQT=	sip_build core_run gui_run
>+USE_QT4=	corelib gui help network sql moc_build qmake_build
> 
> OPTIONS_DEFINE=	API DEBUG
> OPTIONS_DEFAULT=API
>diff -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/devel/py-qt4-qscintilla2/Makefile /zbigone/src/area51/trunk/PYQT/devel/py-qt4-qscintilla2/Makefile
>--- /zbigone/src/ports-playground/devel/py-qt4-qscintilla2/Makefile	2016-04-01 20:01:15.773976782 +0200
>+++ /zbigone/src/area51/trunk/PYQT/devel/py-qt4-qscintilla2/Makefile	2016-04-20 09:25:12.164711000 +0200
>@@ -22,7 +22,7 @@
> 
> USES=		python pyqt:4
> USE_PYQT=	sip core gui
>-USE_QT4=	gui moc_build qmake_build
>+USE_QT4=	corelib gui moc_build qmake_build
> 
> OPTIONS_DEFINE=		DEBUG
> DEBUG_CONFIGURE_ON=	--debug --trace
>diff -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/devel/py-qt4-script/Makefile /zbigone/src/area51/trunk/PYQT/devel/py-qt4-script/Makefile
>--- /zbigone/src/ports-playground/devel/py-qt4-script/Makefile	2016-04-01 20:01:15.841976918 +0200
>+++ /zbigone/src/area51/trunk/PYQT/devel/py-qt4-script/Makefile	2016-04-20 09:25:12.258190000 +0200
>@@ -13,7 +13,7 @@
> 
> USES=		python pyqt:4
> USE_PYQT=	sip_build core_run
>-USE_QT4=	moc_build script qmake_build
>+USE_QT4=	corelib script moc_build qmake_build
> 
> OPTIONS_DEFINE=	API DEBUG
> OPTIONS_DEFAULT=API
>diff -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/devel/py-qt4-scripttools/Makefile /zbigone/src/area51/trunk/PYQT/devel/py-qt4-scripttools/Makefile
>--- /zbigone/src/ports-playground/devel/py-qt4-scripttools/Makefile	2016-04-01 20:01:17.190977034 +0200
>+++ /zbigone/src/area51/trunk/PYQT/devel/py-qt4-scripttools/Makefile	2016-04-20 09:25:12.162534000 +0200
>@@ -11,8 +11,8 @@
> PYQT_DIST=	yes
> 
> USES=		python pyqt:4
>-USE_PYQT=	sip_build core_run
>-USE_QT4=	moc_build scripttools qmake_build
>+USE_PYQT=	sip_build core_run gui_run script_run
>+USE_QT4=	corelib gui script scripttools moc_build qmake_build
> 
> OPTIONS_DEFINE=	API DEBUG
> OPTIONS_DEFAULT=API
>diff -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/devel/py-qt4-test/Makefile /zbigone/src/area51/trunk/PYQT/devel/py-qt4-test/Makefile
>--- /zbigone/src/ports-playground/devel/py-qt4-test/Makefile	2016-04-01 20:01:15.798976946 +0200
>+++ /zbigone/src/area51/trunk/PYQT/devel/py-qt4-test/Makefile	2016-04-20 09:25:12.266150000 +0200
>@@ -12,8 +12,8 @@
> PYQT_DIST=	yes
> 
> USES=		python pyqt:4
>-USE_PYQT=	sip_build gui_run
>-USE_QT4=	moc_build gui qtestlib qmake_build
>+USE_PYQT=	sip_build core_run gui_run
>+USE_QT4=	corelib gui qtestlib moc_build qmake_build
> 
> OPTIONS_DEFINE=	API DEBUG
> OPTIONS_DEFAULT=API
>diff -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/graphics/py-qt4-svg/Makefile /zbigone/src/area51/trunk/PYQT/graphics/py-qt4-svg/Makefile
>--- /zbigone/src/ports-playground/graphics/py-qt4-svg/Makefile	2016-04-01 20:01:36.648975363 +0200
>+++ /zbigone/src/area51/trunk/PYQT/graphics/py-qt4-svg/Makefile	2016-04-20 09:25:12.296456000 +0200
>@@ -12,8 +12,8 @@
> PYQT_DIST=	yes
> 
> USES=		python pyqt:4
>-USE_PYQT=	sip_build gui_run
>-USE_QT4=	moc_build svg qmake_build
>+USE_PYQT=	sip_build core_run gui_run
>+USE_QT4=	corelib gui svg moc_build qmake_build
> 
> OPTIONS_DEFINE=	API DEBUG
> OPTIONS_DEFAULT=API
>diff -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/misc/py-qt4-demo/Makefile /zbigone/src/area51/trunk/PYQT/misc/py-qt4-demo/Makefile
>--- /zbigone/src/ports-playground/misc/py-qt4-demo/Makefile	2016-03-30 11:20:52.991277180 +0200
>+++ /zbigone/src/area51/trunk/PYQT/misc/py-qt4-demo/Makefile	2016-04-21 21:38:01.801056000 +0200
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	demo
> PORTVERSION=	${PYQT4_VERSION}
>-PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	misc devel python
> MASTER_SITES=	${MASTER_SITES_PYQT4}
>diff -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/multimedia/py-qt4-multimedia/Makefile /zbigone/src/area51/trunk/PYQT/multimedia/py-qt4-multimedia/Makefile
>--- /zbigone/src/ports-playground/multimedia/py-qt4-multimedia/Makefile	2016-04-01 20:03:08.363969170 +0200
>+++ /zbigone/src/area51/trunk/PYQT/multimedia/py-qt4-multimedia/Makefile	2016-04-20 09:25:12.378955000 +0200
>@@ -11,8 +11,8 @@
> PYQT_DIST=	yes
> 
> USES=		python pyqt:4
>-USE_PYQT=	sip_build gui_run
>-USE_QT4=	moc_build multimedia qmake_build
>+USE_PYQT=	sip_build core_run gui_run
>+USE_QT4=	corelib gui multimedia moc_build qmake_build
> 
> OPTIONS_DEFINE=	API DEBUG
> OPTIONS_DEFAULT=API
>diff -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/multimedia/py-qt4-phonon/Makefile /zbigone/src/area51/trunk/PYQT/multimedia/py-qt4-phonon/Makefile
>--- /zbigone/src/ports-playground/multimedia/py-qt4-phonon/Makefile	2016-04-01 20:03:08.845969420 +0200
>+++ /zbigone/src/area51/trunk/PYQT/multimedia/py-qt4-phonon/Makefile	2016-04-20 09:25:12.383072000 +0200
>@@ -10,8 +10,8 @@
> PYQT_DIST=	yes
> 
> USES=		python pyqt:4
>-USE_PYQT=	sip_build core_run
>-USE_QT4=	moc_build phonon qmake_build
>+USE_PYQT=	sip_build core_run gui_run
>+USE_QT4=	corelib gui phonon moc_build qmake_build
> 
> OPTIONS_DEFINE=	API DEBUG
> OPTIONS_DEFAULT=API
>diff -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/net/py-qt4-network/Makefile /zbigone/src/area51/trunk/PYQT/net/py-qt4-network/Makefile
>--- /zbigone/src/ports-playground/net/py-qt4-network/Makefile	2016-04-01 20:03:19.189968725 +0200
>+++ /zbigone/src/area51/trunk/PYQT/net/py-qt4-network/Makefile	2016-04-20 09:25:12.322114000 +0200
>@@ -13,7 +13,7 @@
> 
> USES=		python pyqt:4
> USE_PYQT=	sip_build core_run
>-USE_QT4=	moc_build network qmake_build
>+USE_QT4=	moc_build corelib network qmake_build
> 
> OPTIONS_DEFINE=	API DEBUG
> OPTIONS_DEFAULT=API
>diff -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/textproc/py-qt4-xml/Makefile /zbigone/src/area51/trunk/PYQT/textproc/py-qt4-xml/Makefile
>--- /zbigone/src/ports-playground/textproc/py-qt4-xml/Makefile	2016-04-01 20:01:50.580974934 +0200
>+++ /zbigone/src/area51/trunk/PYQT/textproc/py-qt4-xml/Makefile	2016-04-20 09:25:12.346229000 +0200
>@@ -13,7 +13,7 @@
> 
> USES=		python pyqt:4
> USE_PYQT=	sip_build core_run
>-USE_QT4=	xml qmake_build moc_build
>+USE_QT4=	corelib xml moc_build qmake_build
> 
> OPTIONS_DEFINE=	API DEBUG
> OPTIONS_DEFAULT=API
>diff -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/textproc/py-qt4-xmlpatterns/Makefile /zbigone/src/area51/trunk/PYQT/textproc/py-qt4-xmlpatterns/Makefile
>--- /zbigone/src/ports-playground/textproc/py-qt4-xmlpatterns/Makefile	2016-04-01 20:01:50.087975033 +0200
>+++ /zbigone/src/area51/trunk/PYQT/textproc/py-qt4-xmlpatterns/Makefile	2016-04-20 09:25:12.348117000 +0200
>@@ -11,8 +11,8 @@
> PYQT_DIST=	yes
> 
> USES=		python pyqt:4
>-USE_PYQT=	sip_build xml_run
>-USE_QT4=	moc_build xmlpatterns qmake_build
>+USE_PYQT=	sip_build core_run network_run
>+USE_QT4=	corelib network xmlpatterns moc_build qmake_build
> 
> OPTIONS_DEFINE=	API DEBUG
> OPTIONS_DEFAULT=API
>diff -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/www/py-qt4-webkit/Makefile /zbigone/src/area51/trunk/PYQT/www/py-qt4-webkit/Makefile
>--- /zbigone/src/ports-playground/www/py-qt4-webkit/Makefile	2016-04-01 20:02:11.594973044 +0200
>+++ /zbigone/src/area51/trunk/PYQT/www/py-qt4-webkit/Makefile	2016-04-20 09:25:12.315804000 +0200
>@@ -11,8 +11,9 @@
> PYQT_DIST=	yes
> 
> USES=		python pyqt:4
>-USE_PYQT=	sip_build gui_run
>-USE_QT4=	qmake_build gui moc_build network webkit
>+USE_PYQT=	sip_build core_run gui_run network_run
>+USE_QT4=	corelib gui network webkit \
>+		moc_build qmake_build
> 
> OPTIONS_DEFINE=	API DEBUG
> OPTIONS_DEFAULT=API
>diff -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/x11-toolkits/py-qt4-gui/Makefile /zbigone/src/area51/trunk/PYQT/x11-toolkits/py-qt4-gui/Makefile
>--- /zbigone/src/ports-playground/x11-toolkits/py-qt4-gui/Makefile	2016-04-01 20:02:45.123970715 +0200
>+++ /zbigone/src/area51/trunk/PYQT/x11-toolkits/py-qt4-gui/Makefile	2016-04-20 09:25:12.279930000 +0200
>@@ -13,8 +13,8 @@
> 
> USES=		python pyqt:4
> USE_PYQT=	sip_build core_run
>-USE_QT4=	gui imageformats_run inputmethods_run iconengines_run \
>-		qmake_build moc_build
>+USE_QT4=	corelib gui imageformats_run inputmethods_run iconengines_run \
>+		moc_build qmake_build
> 
> OPTIONS_DEFINE=	API DEBUG
> OPTIONS_DEFAULT=API
>diff -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/x11/py-qt4-opengl/Makefile /zbigone/src/area51/trunk/PYQT/x11/py-qt4-opengl/Makefile
>--- /zbigone/src/ports-playground/x11/py-qt4-opengl/Makefile	2016-04-01 20:02:39.039971487 +0200
>+++ /zbigone/src/area51/trunk/PYQT/x11/py-qt4-opengl/Makefile	2016-04-20 09:25:12.374649000 +0200
>@@ -12,8 +12,9 @@
> PYQT_DIST=	yes
> 
> USES=		python pyqt:4
>-USE_PYQT=	sip_build gui_run
>-USE_QT4=	moc_build opengl qmake_build
>+USE_GL=		gl
>+USE_PYQT=	sip_build core_run gui_run
>+USE_QT4=	corelib gui opengl moc_build qmake_build
> 
> OPTIONS_DEFINE=	API DEBUG
> OPTIONS_DEFAULT=API

Actions: View | Diff

Attachments on bug 209283: 169985