Ticket #40727: wxPython-2.9.5.0.diff

File wxPython-2.9.5.0.diff, 8.2 KB (added by mojca (Mojca Miklavec), 11 years ago)

upgrade wxPython-3.0 to 2.9.5.0

  • graphics/wxWidgets-3.0/Portfile

     
    1919    wxWidgets.use   wxWidgets-3.0
    2020} elseif {$subport == "wxPython-3.0"} {
    2121    wxWidgets.use   wxPython-3.0
    22     version         2.9.4
     22    revision        0
    2323} elseif {$subport == "wxgtk-3.0"} {
    2424    # with satisfactory Cocoa support there is no real need for GTK-based wxWidgets any more
    2525    # wxgtk-3.0 is here mainly for testing purposes
    … …  
    5252distfiles           ${distname}-${version}${extract.suffix}
    5353dist_subdir         ${distname}/${version}
    5454
    55 checksums           rmd160  f5c91099b2cf3e39eadbcf99df0dd9a97017d47f \
     55checksums           ${distname}-${version}${extract.suffix} \
     56                    rmd160  f5c91099b2cf3e39eadbcf99df0dd9a97017d47f \
    5657                    sha256  b74ba96ca537cc5d049d21ec9ab5eb2670406a4aa9f1ea4845ea84a9955a6e02
    5758
    5859depends_lib         port:jpeg \
    … …  
    9899                    --with-macosx-version-min=no
    99100
    100101if {$subport == "wxPython-3.0"} {
    101     set wxpythonsubset      wxPython-2.9.4.0-MacPorts-subset
     102    set wxpythonsubset      wxPython-2.9.5.0-MacPorts-subset
    102103    distfiles-append        ${wxpythonsubset}${extract.suffix}:trac
    103104
    104     # patch-src-osx-cocoa-window.mm.diff: http://trac.wxwidgets.org/changeset/72195 (only needed for 2.9.4)
    105     # patch-include-wx-math.h.diff:       http://trac.wxwidgets.org/changeset/74456 (only needed for 2.9.4)
    106     patchfiles-append       patch-src-osx-cocoa-window.mm.diff \
    107                             patch-include-wx-math.h.diff
    108 
    109105    description             wxWidgets ${branch} for the wxPython distribution
    110106    long_description        The port installs wxWidgets ${branch} for wxPython \
    111107                            to guarantee compatibility even when the upstream versions \
    112108                            of wxWidgets and wxPython differ.
    113109
    114     checksums               ${distname}-${version}${extract.suffix} \
    115                             rmd160  62301f8ce39a8aa96e65318f9d1e947c9dc09c50 \
    116                             sha256  6c530c35f40c3b1a5f9a4577c3ee8a9982e745081f23e3fbb9951d6d17514d12 \
    117                             ${wxpythonsubset}${extract.suffix} \
    118                             rmd160  7831cee8185c521d8b565b56555b3005dee1d53d \
    119                             sha256  971b644768d4010b38acf7232deb8cf3c91921ca8b09dec82c1616b93c751f4c
     110    checksums-append        ${wxpythonsubset}${extract.suffix} \
     111                            rmd160  936858d5856adde043d107164b1b53d3209eb76d \
     112                            sha256  c892f257b151726a70886c7cffda51554b48b8e9cc7cfcc962d6988c5fe81856
    120113
    121114    post-destroot {
    122115        # copy a subset of wxPython to wxWidgets to prevent a conflict
    … …  
    127120    livecheck.type          none
    128121} elseif {$subport == "wxgtk-3.0"} {
    129122    # both patches could be added to wxWidgets-3.0, but they are not needed for Cocoa
    130     # and might need changes for wxWidgets 2.9.4
    131123    #
    132124    # patch-sdl.diff: the patch allows using --wxth-sdl
    133125    # patch-upstream-psn.diff: http://trac.wxwidgets.org/changeset/74703

  • graphics/wxWidgets-3.0/files/patch-configure.diff

     
    11The first part is for GTK and makes sure that the port finds the right OpenGL library
    2 The second part makes sure that install_name_tool doesn't break library names and links (http://trac.wxwidgets.org/ticket/15452)
     2The second part is an upstream patch (see http://trac.wxwidgets.org/ticket/15452)
    33--- configure.orig
    44+++ configure
    55@@ -22038,48 +22038,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
    … …  
    5252 
    5353 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libraries directories" >&5
    5454 $as_echo_n "checking for libraries directories... " >&6; }
    55 @@ -29402,24 +29361,6 @@ rm -f core conftest.err conftest.$ac_objext \
    56        ;;
    57  
    58        *-*-darwin* )
    59 -        install_name_tool=`which ${HOST_PREFIX}install_name_tool`
    60 -        if test "$install_name_tool" -a -x "$install_name_tool"; then
    61 -            DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
    62 -            cat <<EOF >change-install-names
    63 -#!/bin/sh
     55@@ -29407,16 +29366,18 @@ rm -f core conftest.err conftest.$ac_objext \
     56             DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
     57             cat <<EOF >change-install-names
     58 #!/bin/sh
    6459-libnames=\`cd \${2} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\`
    65 -for i in \${libnames} ; do
     60+libnames=\`cd \${1} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\`
     61+changes=''
     62+for dep in \${libnames} ; do
     63+    changes="\${changes} -change \${4}/\${dep} \${3}/\${dep}"
     64+done
     65 for i in \${libnames} ; do
    6666-    ${HOST_PREFIX}install_name_tool -id \${3}/\${i} \${1}/\${i}
    6767-    for dep in \${libnames} ; do
    6868-        ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${3}/\${dep} \${1}/\${i}
    6969-    done
    70 -done
    71 -EOF
    72 -            chmod +x change-install-names
     70+    ${HOST_PREFIX}install_name_tool \${changes} -id \${3}/\${i} \${1}/\${i}
     71 done
     72+${HOST_PREFIX}install_name_tool \${changes} \${2}/wxrc-${WX_RELEASE}
     73 EOF
     74             chmod +x change-install-names
    7375-            DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \$(wx_top_builddir)/lib \${libdir}"
    74 -        fi
    75 -
    76 -                                        HEADER_PAD_OPTION="-headerpad_max_install_names"
    77        ;;
     76+            DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib"
     77         fi
    7878 
    79        *-*-cygwin* | *-*-mingw32* )
     79                                         HEADER_PAD_OPTION="-headerpad_max_install_names"

  • python/py-wxpython-3.0/Portfile

     
    66PortGroup           wxWidgets   1.0
    77
    88name                py-wxpython-3.0
    9 version             2.9.4.0
     9version             2.9.5.0
     10set wx_version      [join [lrange [split ${version} .] 0 2] .]
    1011set branch          [join [lrange [split ${version} .] 0 1] .]
    1112categories-append   graphics devel
    1213license             wxwidgets-3.1
    … …  
    2728distname            wxPython
    2829use_bzip2           yes
    2930
    30 checksums           rmd160  35e823d9161dc99083f3025383567000680e012f \
    31                     sha256  78c35c19e85a17cb9c730b86b49d6a479198d76d19e0b13e86db0b55707004be
     31checksums           rmd160  4d54edc5437fbe14e552bfc6feeeb4fb74d10cd0 \
     32                    sha256  1a5b7e771eff467538d0834136188e8a7506a4fe6e85d0a46c40158cdbd4c48c
    3233
    3334python.versions     27
    3435python.default_version 27
    3536
    3637distfiles           ${distname}-src-${version}${extract.suffix}
    37 dist_subdir         ${distname}/${version}
    3838worksrcdir          ${distname}-src-${version}/wxPython
     39dist_subdir         wxWidgets/${wx_version}
    3940
    4041# extract just the docs and wxPython subdir
    4142extract.post_args   "| tar -xf - ${worksrcdir} ${distname}-src-${version}/docs"
    … …  
    4243
    4344if {$subport != $name} {
    4445    conflicts           py${python.version}-wxpython-2.8
     46    # As long as wxPython and wxWidgets are at the same version,
     47    # this port could also depend on wxWidgets-3.0.
     48    # A separate port is there just because wxPython usually lags behind.
    4549    wxWidgets.use       wxPython-3.0
    4650    depends_lib-append  port:${wxWidgets.port}
    4751
    … …  
    5256    destroot.cmd    ${python.bin} setup.py WX_CONFIG="${wxWidgets.wxconfig}"
    5357
    5458    post-destroot {
    55         # this has already been added by wxWidgets
     59        # When a new release of wxPython comes out, the contents of
     60        # ${destroot}${wxWidgets.prefix}/Versions/wxPython/${branch}/include/wx-${branch}/wx/wxPython
     61        # should be stored separately into wxPython-${version}-MacPorts-subset.tar.bz2
     62        # to be extracted/installed by wxPython-3.0 rather than this port.
     63        # This allows parallel installation of several versions of py**-wxpython-3.0.
    5664        delete      ${destroot}${wxWidgets.prefix}
    5765    }
    5866