Ticket #56746: sip_4.19.8_revert.diff

File sip_4.19.8_revert.diff, 2.3 KB (added by michaelld (Michael Dickens), 6 years ago)

  • python/py-sip/Portfile 

    diff --git a/python/py-sip/Portfile b/python/py-sip/Portfile
index 942a551efb..55e2f0cead 100644
    a b long_description \ 
    2020
    2121homepage            https://www.riverbankcomputing.com/software/sip/intro
    2222
    23 version             4.19.10
     23version             4.19.8
     24
     25# bumped the epoch to revert from 4.19.10 to 4.19.8. The former caused
     26# configuration errors in py*-qscitilla-qt5 and py*-pyqt4, and
     27# possibly others. See also: https://trac.macports.org/ticket/56746 .
     28epoch               1
    2429
    2530# from siplib/sip.h.in:
    2631#
    … … version 4.19.10 
    3136# removed or the order changed then the major number must be
    3237# incremented and the minor number set to 0.
    3338#
    34 # SIP 4.19.[8-9] provides SIP API 12.4
     39# SIP 4.19.[8-10] provides SIP API 12.4
    3540# SIP 4.19.[4-7] provides SIP API 12.3
    3641# SIP 4.19.3 provides SIP API 12.2
    3742# SIP 4.19.[1-2] provides SIP API 12.1
    … … if {${name} ne ${subport}} { 
    6065        distname        sip-${version}
    6166    }
    6267
    63     revision            1
    64     checksums           rmd160 2c028d9a8220a4365084836975a08921b1df7ebc \
    65                         sha256 31ac7d48be8fd2df5f3bdb712f66a7d9a858cc1f6cb35fc95d829e0a69c3dd48 \
    66                         size 1032653
     68    checksums           rmd160 064948f2cd178191a00fd691f292a85b7360f2a5 \
     69                        sha256 7eaf7a2ea7d4d38a56dd6d2506574464bddf7cf284c960801679942377c297bc \
     70                        size 1024548
    6771
    6872    patchfiles          patch-siputils.py.diff \
    6973                        patch-specs_macx-g++.diff \
    7074                        patch-configure.py.diff \
    71                         patch-add_ppc64.diff \
    72                         patch-siplib_siplib.c.diff
     75                        patch-add_ppc64.diff
    7376
    7477    use_configure       yes
    7578    pre-configure {
    … … if {${name} ne ${subport}} { 
    9497                        --bindir=${prefix}/bin \
    9598                        --destdir=${python.pkgd} \
    9699                        --incdir=${python.include} \
    97                         --sipdir=${prefix}/share/${subport} \
    98                         --no-dist-info
     100                        --sipdir=${prefix}/share/${subport}
    99101
    100102    # always add some arch flags, since the user might have overridden
    101103    # the default arch build (e.g., ticket #44086).