Attachment 180237 Details for Bug 217305 – py-sip-4.19.1.patch

[patch] py-sip-4.19.1.patch

py-sip-4.19.1.patch (text/plain), 3.18 KB, created by takefu on 2017-02-23 01:10:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2017-02-23 01:10:18 UTC

Size: 3.18 KB

patch

obsolete

>diff -udprN /usr/ports/Mk/Uses/pyqt.mk.orig Mk/Uses/pyqt.mk
>--- /usr/ports/Mk/Uses/pyqt.mk.orig	2016-11-14 21:21:17.000000000 +0000
>+++ Mk/Uses/pyqt.mk	2017-02-23 00:50:01.884925000 +0000
>@@ -61,7 +61,7 @@ MASTER_SITES_PYQT5=	SF/pyqt/PyQt5/PyQt-$
> MASTER_SITES_QSCI2=	SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \
> 			GENTOO
> 
>-SIP_VERSION=		4.18
>+SIP_VERSION=		4.19.1
> QSCI2_VERSION=		2.9.1
> PYQT4_VERSION=		4.11.4
> PYQT5_VERSION=		5.6
>diff -udprN /usr/ports/devel/py-sip/distinfo devel/py-sip/distinfo
>--- /usr/ports/devel/py-sip/distinfo	2016-11-13 20:19:11.000000000 +0000
>+++ devel/py-sip/distinfo	2017-02-23 00:30:48.009740000 +0000
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1473848835
>-SHA256 (sip-4.18.tar.gz) = f1dc5c81c07a9ad97edcd4a0af964a41e420024ba7ca165afd2b351efd249cb6
>-SIZE (sip-4.18.tar.gz) = 991980
>+TIMESTAMP = 1487809848
>+SHA256 (sip-4.19.1.tar.gz) = 501852b8325349031b769d1c03d6eab04f7b9b97f790ec79f3d3d04bf065d83e
>+SIZE (sip-4.19.1.tar.gz) = 1000644
>diff -udprN /usr/ports/devel/py-sip/files/patch-siputils.py devel/py-sip/files/patch-siputils.py
>--- /usr/ports/devel/py-sip/files/patch-siputils.py	2015-03-04 23:20:47.000000000 +0000
>+++ devel/py-sip/files/patch-siputils.py	1970-01-01 00:00:00.000000000 +0000
>@@ -1,28 +0,0 @@
>-sip 4.16.5 has switched the Makefile lines that invoke the moc utility from
>-an invocation with an explicit source file name to "$<".
>-
>-This works with GNU make, but not make(1), where it $< evaluates to nothing
>-in this context.
>-
>-Switch back to the previous version to avoid having to depend on devel/gmake
>-(figuring out which ports need it is not trivial).
>---- siputils.py
>-+++ siputils.py
>-@@ -1683,7 +1683,7 @@
>-             cpp = "moc_" + root + ".cpp"
>- 
>-             mfile.write("\n%s: %s\n" % (cpp, mf))
>--            mfile.write("\t$(MOC) -o %s $<\n" % cpp)
>-+            mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf))
>- 
>-         mfile.write("\n$(TARGET): $(OFILES)\n")
>- 
>-@@ -1980,7 +1980,7 @@
>-                 mf = os.path.join(self._src_dir, mf)
>- 
>-             mfile.write("\n%s: %s\n" % (cpp, mf))
>--            mfile.write("\t$(MOC) -o %s $<\n" % cpp)
>-+            mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf))
>- 
>-         mfile.write("\n$(TARGET): $(OFILES)\n")
>- 
>diff -udprN /usr/ports/devel/py-sip/Makefile devel/py-sip/Makefile
>--- /usr/ports/devel/py-sip/Makefile	2015-12-13 12:45:25.000000000 +0000
>+++ devel/py-sip/Makefile	2017-02-23 00:47:42.088298000 +0000
>@@ -12,6 +12,11 @@ DISTNAME=	${SIP_DISTNAME}
> MAINTAINER=	kde@FreeBSD.org
> COMMENT=	Python to C and C++ bindings generator
> 
>+LICENSE=	Riverbank
>+LICENSE_NAME=	Riverbank Computing Limited
>+LICENSE_FILE=	${WRKSRC}/LICENSE
>+LICENSE_PERMS=	auto-accept
>+
> USES=		python pyqt:sip
> USE_PYTHON=	concurrent py3kplist
> USE_PYQT=	#
>@@ -27,9 +32,17 @@ PORTDOCS=	*
> OPTIONS_DEFINE=		DOCS DEBUG
> DEBUG_CONFIGURE_ON=	--debug
> 
>+pre-patch:
>+	${REINPLACE_CMD} 's|%s $$<\\n\" % cpp|%s %s\\n" % (cpp, mf)|'\
>+		${WRKSRC}/siputils.py
>+
> do-configure:
> 	cd ${WRKSRC} && ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS}
> 
>+pre-install:
>+	@${STRIP_CMD} ${WRKSRC}/sipgen/sip
>+	@${STRIP_CMD} ${WRKSRC}/siplib/sip.so
>+
> post-install:
> 	${MKDIR} ${STAGEDIR}${DOCSDIR} && cd ${WRKSRC}/doc/html && \
> 		${COPYTREE_SHARE} \. ${STAGEDIR}${DOCSDIR}

Actions: View | Diff

Attachments on bug 217305: 180237