Ticket #44281: python-pil-pillow-nomaintainer.diff

File python-pil-pillow-nomaintainer.diff, 4.0 KB (added by Ionic (Mihai Moldovan), 10 years ago)

Switch from py*-pil to path:-based dependency satisfiable by both py*-pil and py*-Pillow. Add Pillow compat patch to py-tesser.

  • python/py-mitmproxy/Portfile 

    diff --git a/python/py-mitmproxy/Portfile b/python/py-mitmproxy/Portfile
index a5a00ac..11ad40a 100644
    a b if {${name} ne ${subport}} { 
    3232    depends_lib         port:py${python.version}-openssl \
    3333                        port:py${python.version}-asn1 \
    3434                        port:py${python.version}-urwid \
    35                         port:py${python.version}-pil \
     35                        path:${python.pkgd}/PIL:py${python.version}-Pillow \
    3636                        port:py${python.version}-lxml
    3737}

  • python/py-tesser/Portfile 

    diff --git a/python/py-tesser/Portfile b/python/py-tesser/Portfile
index 841738e..8ba7339 100644
    a b PortGroup python 1.0 
    55
    66name                py-tesser
    77version             0.0.1
     8revision            1
    89license             Apache-2
    910platforms           darwin
    1011supported_archs     noarch
    … … checksums md5 54681d38db45332ad5fa38fdba7ddd79 \ 
    2122                    sha1    3eec1dced4d484dd34464e8a329b7b3c7b40d7b0 \
    2223                    rmd160  4aeb1cf41978671524bb1c4be4b11e25bda6c1ae
    2324
     25patchfiles          patch-pillow-compat.diff
     26
    2427python.versions     26
    2528
    2629if {${name} ne ${subport}} {
    27     depends_lib         port:py${python.version}-pil bin:tesseract:tesseract
     30    depends_lib         path:${python.pkgd}/PIL:py${python.version}-Pillow \
     31                        bin:tesseract:tesseract
     32
    2833    build               {}
    2934    destroot {
    3035        set instdir ${destroot}${python.pkgd}/tesseract

  • new file python/py-tesser/files/patch-pillow-compat.diff 

    diff --git a/python/py-tesser/files/patch-pillow-compat.diff b/python/py-tesser/files/patch-pillow-compat.diff
new file mode 100644
index 0000000..3e6e9d9
    - +  
     1--- pytesser.py.old     2014-07-10 21:44:41.000000000 +0200
     2+++ pytesser.py 2014-07-10 21:44:49.000000000 +0200
     3@@ -3,7 +3,7 @@
     4 by Michael J.T. O'Kelly
     5 V 0.0.1, 3/10/07"""
     6 
     7-import Image
     8+from PIL import Image
     9 import subprocess
     10 
     11 import util

  • zope/zope-cmfphoto/Portfile 

    diff --git a/zope/zope-cmfphoto/Portfile b/zope/zope-cmfphoto/Portfile
index 25b804e..b28c66c 100644
    a b checksums md5 460f13f2ecc18c80a13324dd4eaafabb 
    1616platforms               darwin freebsd
    1717supported_archs noarch
    1818
     19set python.version      26
     20set python.branch       "[string range ${python.version} 0 end-1].[string index ${python.version} end]"
     21
    1922depends_lib-append      port:zope-cmf \
    20                                         port:py26-pil
     23                                        path:${frameworks_dir}/Python.framework/Versions/${python.branch}/lib/python${python.branch}/site-packages/PIL:py${python.version}-Pillow
    2124depends_run                     bin:convert:ImageMagick

  • zope/zope-extfile/Portfile 

    diff --git a/zope/zope-extfile/Portfile b/zope/zope-extfile/Portfile
index 143e9bc..fa3ae21 100644
    a b checksums md5 4e13441da832a904cb75ad367388ae8b 
    2727platforms               darwin freebsd
    2828supported_archs noarch
    2929
    30 depends_lib-append              port:py26-pil
     30set python.version      26
     31set python.branch       "[string range ${python.version} 0 end-1].[string index ${python.version} end]"
     32
     33depends_lib-append              path:${frameworks_dir}/Python.framework/Versions/${python.branch}/lib/python${python.branch}/site-packages/PIL:py${python.version}-Pillow

  • zope/zope-zphotoslides/Portfile 

    diff --git a/zope/zope-zphotoslides/Portfile b/zope/zope-zphotoslides/Portfile
index 924808a..40675ca 100644
    a b checksums md5 c2be3084f144ecfe1a97b4b6439fe659 
    2222platforms               darwin freebsd
    2323supported_archs noarch
    2424
     25set python.version      26
     26set python.branch       "[string range ${python.version} 0 end-1].[string index ${python.version} end]"
     27
    2528depends_lib-append              port:zope-localizer \
    2629                                port:zope-stripogram \
    27                                 port:py26-pil
     30                                path:${frameworks_dir}/Python.framework/Versions/${python.branch}/lib/python${python.branch}/site-packages/PIL:py${python.version}-Pillow
    2831depends_run             bin:convert:ImageMagick
    2932
    3033patchfiles              patch-__init__.py