FreeBSD Bugzilla – Attachment 147943 Details for
Bug 193957
graphics/py-pillow: CONFLICT on pilconvert.py in multiple Python version installations
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
pillow fix for different python version, USES=python, update to 2.6.0, _imagingtk fix
py-pillow.diff (text/plain), 1.90 KB, created by
Marcus von Appen
on 2014-10-03 20:24:54 UTC
(
hide
)
Description:
pillow fix for different python version, USES=python, update to 2.6.0, _imagingtk fix
Filename:
MIME Type:
Creator:
Marcus von Appen
Created:
2014-10-03 20:24:54 UTC
Size:
1.90 KB
patch
obsolete
>Index: graphics/py-pillow/Makefile >=================================================================== >--- graphics/py-pillow/Makefile (revision 369906) >+++ graphics/py-pillow/Makefile (working copy) >@@ -2,7 +2,7 @@ > # $FreeBSD$ > > PORTNAME= pillow >-PORTVERSION= 2.5.1 >+PORTVERSION= 2.6.0 > CATEGORIES= graphics python > PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} > DISTNAME= ${PORTNAME:C/p/P/}-${PORTVERSION} >@@ -29,15 +29,19 @@ > WEBP_LIB_DEPENDS= libwebp.so:${PORTSDIR}/graphics/webp > > USE_GITHUB= yes >-USE_PYTHON= yes >-USE_PYDISTUTILS= yes >+USES= python >+USE_PYTHON= distutils autoplist concurrent >+PYDISTUTILS_SETUP= ${PYSETUP} >+PYDISTUTILS_BUILD_TARGET= build build_py build_ext > >-PYDISTUTILS_AUTOPLIST= yes >-PYDISTUTILS_BUILD_TARGET= build_ext >+# we have to build and install everything in a single run, >+# otherwise pillow's build_ext extension tries to be clever >+# and messes up standard distutils behaviour... >+NO_BUILD= yes > > GH_ACCOUNT= python-pillow > GH_PROJECT= ${PORTNAME:C/p/P/} >-GH_COMMIT= 1ab78b8 >+GH_COMMIT= 9634e43 > > CONFLICTS_INSTALL= py*-imaging-* > >@@ -86,6 +90,11 @@ > PYDISTUTILS_BUILDARGS+= --disable-webp > .endif > >+do-install: >+ @(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \ >+ ${PYDISTUTILS_SETUP} ${PYDISTUTILS_BUILD_TARGET} ${PYDISTUTILS_BUILDARGS} \ >+ ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS}) >+ > regression-test: extract > @cd ${WRKSRC} && \ > ${PYTHON_CMD} ${PYSETUP} build_ext -i && \ >Index: graphics/py-pillow/distinfo >=================================================================== >--- graphics/py-pillow/distinfo (revision 369906) >+++ graphics/py-pillow/distinfo (working copy) >@@ -1,2 +1,2 @@ >-SHA256 (Pillow-2.5.1.tar.gz) = e7934f86705a7054e3c117ab1295d612b2aa34f4cfa4d61bd88e544e9a544a13 >-SIZE (Pillow-2.5.1.tar.gz) = 6528250 >+SHA256 (Pillow-2.6.0.tar.gz) = ffa1b214027acd5a62a38fd7851ade75a2a6d96957261f7aee932cf7f6f6db3b >+SIZE (Pillow-2.6.0.tar.gz) = 7235577
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 193957
: 147943