Merge lp:~mikemc/ubuntuone-windows-installer/byo-libjpeg into lp:ubuntuone-windows-installer
Status: | Merged |
---|---|
Approved by: | dobey |
Approved revision: | 142 |
Merged at revision: | 140 |
Proposed branch: | lp:~mikemc/ubuntuone-windows-installer/byo-libjpeg |
Merge into: | lp:ubuntuone-windows-installer |
Diff against target: |
37 lines (+10/-3) 1 file modified
scripts/setup-mac.py (+10/-3) |
To merge this branch: | bzr merge lp:~mikemc/ubuntuone-windows-installer/byo-libjpeg |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
dobey (community) | Approve | ||
Roberto Alsina (community) | Approve | ||
Review via email: mp+126538@code.launchpad.net |
Commit message
- Package libjpeg for PIL so we don't break when a user doesn't have it installed. (LP: #1050534)
Description of the change
- Package libjpeg for PIL so we don't break when a user doesn't have it installed. (LP: #1050534)
TO TEST, build the app and check that libjpeg.?.dylib is in UbuntuOne.
also try running SSO like this:
DYLD_PRINT_
you will see a ton of spam and in there should be something like these lines:
dyld: loaded: /Users/
dyld: loaded: /Users/
then you're good!
Prior to this branch, loading _imaging.so on a dev's machine would grab libjpeg from /usr/local/lib/, where brew installs it. but if it's on a machine without that, whoops!