miniupnpc Portfile removed; new and improved macdeployqtplus #770

pull p2k wants to merge 1 commits into bitcoin:master from p2k:master changing 6 files +441 −94
  1. p2k commented at 8:48 PM on January 19, 2012: contributor
    • My patch for miniupnpc has made it into the latest MacPorts release: https://trac.macports.org/ticket/31354
    • Documentation has been changed appropriately
    • New pure-Python macdeployqt; leverages all problems with the stock macdeployqt

    Additional note: All has been tested and works for me.

  2. miniupnpc Porfile removed; new and improved macdeployqtplus
    * My patch for miniupnpc has made it into the latest MacPorts release: https://trac.macports.org/ticket/31354
    * Documentation has been changed appropriately
    * New pure-Python macdeployqt; leverages all problems with the stock macdeployqt
    5d0629c1c1
  3. gavinandresen commented at 5:26 PM on January 23, 2012: contributor

    Getting: subprocess.CalledProcessError: Command '['strip', '-x', 'dist/Bitcoin-Qt.app/Contents/Frameworks/libssl.1.0.0.dylib']' returned non-zero exit status 1

    ... because:

    bash $ ls -l dist/Bitcoin-Qt.app/Contents/Frameworks/libssl.1.0.0.dylib -r-xr-xr-x 1 gavin gavin 383K Jan 12 11:46 dist/Bitcoin-Qt.app/Contents/Frameworks/libssl.1.0.0.dylib*

    bash $ strip -x dist/Bitcoin-Qt.app/Contents/Frameworks/libssl.1.0.0.dylib strip: file: /Users/gavin/src/integration_btc/dist/Bitcoin-Qt.app/Contents/Frameworks/libssl.1.0.0.dylib is not writable (Permission denied)

    I'm not sure what the best solution is; either chmod it before (and after) stripping, or skip stripping non-writeable libraries (might be a good assumption that they're system libraries that have already been stripped).

  4. p2k commented at 11:38 PM on January 25, 2012: contributor

    tbh, I chmodded that file long ago in /opt/local/lib/libssl.1.0.0.dylib to get rid of that issue for good. Only a tiny amount of files with the .dylib extension don't have the executable flag set in /opt/local/lib and thus I considered this an error on the MacPorts side.

  5. gavinandresen commented at 10:18 PM on February 3, 2012: contributor

    Any objections to this patch to workaround the MacPorts bug? If not, I'll pull your changes and this patch:

    diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus
    index 914edb7..e159f9b 100755
    --- a/contrib/macdeploy/macdeployqtplus
    +++ b/contrib/macdeploy/macdeployqtplus
    @@ -17,7 +17,7 @@
     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #
    
    -import subprocess, sys, re, os, shutil, os.path
    +import subprocess, sys, re, os, shutil, stat, os.path
     from time import sleep
     from argparse import ArgumentParser
    
    @@ -256,7 +256,11 @@ def copyFramework(framework, path, verbose):
         if verbose >= 3:
             print "Copied:", fromPath
             print " to:", toPath
    -    
    +
    +    permissions = os.stat(toPath)
    +    if not permissions.st_mode & stat.S_IWRITE:
    +      os.chmod(toPath, permissions.st_mode | stat.S_IWRITE)
    +
         if not framework.isDylib(): # Copy resources for real frameworks
             fromResourcesDir = framework.sourceResourcesDirectory
             if os.path.exists(fromResourcesDir):
    
  6. p2k commented at 5:22 PM on February 5, 2012: contributor

    No objections, go ahead.

  7. gavinandresen commented at 3:35 PM on February 6, 2012: contributor

    Pulled

  8. gavinandresen closed this on Feb 6, 2012

  9. destenson referenced this in commit 8a03d1630d on Jun 26, 2016
  10. ptschip referenced this in commit 4447f2fbd6 on Dec 27, 2017
  11. DrahtBot locked this on Sep 8, 2021
Contributors

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2026-04-13 21:16 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me