Attachment 156206 Details for Bug 196862 – patch-Makefile and files x11-toolkits/py-wxPython28

[patch] patch-Makefile and files x11-toolkits/py-wxPython28

py-wxPython28.patch (text/plain), 2.74 KB, created by Andrey Fesenko on 2015-05-01 13:05:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrey Fesenko

Created: 2015-05-01 13:05:00 UTC

Size: 2.74 KB

patch

obsolete

>diff -r f3286618d899 -r 16db50998577 x11-toolkits/py-wxPython28/Makefile
>--- a/x11-toolkits/py-wxPython28/Makefile	Tue Apr 28 14:53:53 2015 +0300
>+++ b/x11-toolkits/py-wxPython28/Makefile	Fri May 01 15:30:49 2015 +0300
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	wxPython
> PORTVERSION=	2.8.12.1
>-PORTREVISION?=	5
>+PORTREVISION?=	6
> CATEGORIES=	x11-toolkits python
> MASTER_SITES=	SF/wxpython/wxPython/${PORTVERSION}
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -19,7 +19,7 @@
> 
> DIST_SUBDIR=	python
> USE_PYTHON=	distutils
>-USES=		gettext gmake pkgconfig python tar:bzip2
>+USES=		fortran gettext gmake pkgconfig python tar:bzip2
> 
> PYDISTUTILS_BUILDARGS=	\
> 			WX_CONFIG="${WX_CONFIG}" \
>@@ -122,7 +122,7 @@
> 	${INSTALL_DATA} ${WRKSRC}/include/wx/wxPython/*.h \
> 		${STAGEDIR}${PREFIX}/include/wx-${WX_VERSION}/wx/wxPython
> # scripts
>-	@${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${STAGEDIR}${PREFIX}/bin
> .endif # defined(WITH_COMMON_ONLY)
> 
> post-install:
>diff -r f3286618d899 -r 16db50998577 x11-toolkits/py-wxPython28/files/patch-config.py
>--- a/x11-toolkits/py-wxPython28/files/patch-config.py	Tue Apr 28 14:53:53 2015 +0300
>+++ b/x11-toolkits/py-wxPython28/files/patch-config.py	Fri May 01 15:30:49 2015 +0300
>@@ -1,6 +1,6 @@
>---- config.py.orig	2013-12-13 11:26:53.752427019 -0200
>-+++ config.py	2013-12-13 11:28:04.575423576 -0200
>-@@ -38,7 +38,7 @@
>+--- config.py.orig	2011-07-14 03:48:39 UTC
>++++ config.py
>+@@ -38,7 +38,7 @@ from distutils.dir_util  import mkpath
>  from distutils.dep_util  import newer
>  from distutils.spawn     import spawn
>  
>@@ -9,7 +9,7 @@
>  import distutils.command.install_data
>  import distutils.command.install_headers
>  import distutils.command.clean
>-@@ -480,7 +480,7 @@
>+@@ -480,7 +480,7 @@ class wx_extra_clean(distutils.command.c
>  # is used in our package build.  If we detect that the current
>  # distutils does not have it then make sure that it is removed from
>  # the command-line options, otherwise the build will fail.
>@@ -18,7 +18,7 @@
>      if item[0] == 'install-layout=':
>          break
>  else:
>-@@ -491,12 +491,12 @@
>+@@ -491,12 +491,12 @@ else:
>  
>  
>  
>diff -r f3286618d899 -r 16db50998577 x11-toolkits/py-wxPython28/files/patch-setup.py
>--- a/x11-toolkits/py-wxPython28/files/patch-setup.py	Tue Apr 28 14:53:53 2015 +0300
>+++ b/x11-toolkits/py-wxPython28/files/patch-setup.py	Fri May 01 15:30:49 2015 +0300
>@@ -1,10 +1,10 @@
>---- ./setup.py.orig	Mon Nov 26 19:05:40 2007
>-+++ ./setup.py	Thu Dec 20 21:05:46 2007
>-@@ -776,6 +776,7 @@
>+--- setup.py.orig	2011-07-14 01:38:21 UTC
>++++ setup.py
>+@@ -784,6 +784,7 @@ if BUILD_DLLWIDGET:
>  
>      wxpExtensions.append(ext)
>  
> +EXTRA_PATH = getExtraPath(addOpts=EP_ADD_OPTS)
>  
>  
>-     
>+ #----------------------------------------------------------------------

Actions: View | Diff

Attachments on bug 196862: 155565 | 155570 | 155687 | 156206 | 156207 | 156208