Closed Bug 1585195 Opened 5 months ago Closed 5 months ago

Port Bug 1562684 "[10.15][Mac] PR_GetLibraryFilePathname is returning absolute paths in MacOS Catalina" to Thunderbird

Categories

(Thunderbird :: Build Config, task)

task
Not set

Tracking

(Not tracked)

RESOLVED FIXED
Thunderbird 71.0

People

(Reporter: darktrojan, Assigned: darktrojan)

Details

Attachments

(1 file)

+++ This bug was initially created as a clone of Bug #1584812 +++

See Bug 1562684 Comment 31
Local builds on 10.15 seem to fail now. Because it will be released soon we should port the Mozilla bug.

This is what Firefox did. I'm blindly copying it since I don't build for Mac OS.

Attachment #9097535 - Flags: review?(rob)
Comment on attachment 9097535 [details] [diff] [review]
1585195-macos-build-1.diff

Review of attachment 9097535 [details] [diff] [review]:
-----------------------------------------------------------------

Looks good to me.
Attachment #9097535 - Flags: review?(rob) → review+

I don't think pulsebot will clear that flag, so no point using it just yet.

Pushed by geoff@darktrojan.net:
https://hg.mozilla.org/comm-central/rev/4cf8a65eeb24
Port Bug 1562684 "[10.15][Mac] PR_GetLibraryFilePathname is returning absolute paths in MacOS Catalina" to Thunderbird; r=rjl

Status: ASSIGNED → RESOLVED
Closed: 5 months ago
Keywords: checkin-needed
Resolution: --- → FIXED
Target Milestone: --- → Thunderbird 71.0

Landing that was, apparently, a bad idea. Backed out.

Status: RESOLVED → REOPENED
Resolution: FIXED → ---
Comment on attachment 9097535 [details] [diff] [review]
1585195-macos-build-1.diff

> 	rsync -a --exclude-from='$(srcdir)/macbuild/Contents/MacOS-files.in' $(DIST)/bin/ '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources'
> 	rsync -a --include-from='$(srcdir)/macbuild/Contents/MacOS-files.in' --exclude '*' $(DIST)/bin/ '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS'
>+	# MacOS-files-copy.in is a list of files that should be copies rather
>+	# than symlinks and placed in .app/Contents/MacOS.
>+	rsync -aL --include-from='$(srcdir)/macbuild/Contents/MacOS-files-copy.in' --exclude '*' $(DIST)/bin/ '$(dist_dest)/Contents/MacOS'
You probably don't have dist_dest defined so this should be:
rsync -aL --include-from='$(srcdir)/macbuild/Contents/MacOS-files-copy.in' --exclude '*' $(DIST)/bin/ '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS'

Pushed by geoff@darktrojan.net:
https://hg.mozilla.org/comm-central/rev/fd9a5725f424
Port Bug 1562684 "[10.15][Mac] PR_GetLibraryFilePathname is returning absolute paths in MacOS Catalina" to Thunderbird; r=rjl

Status: REOPENED → RESOLVED
Closed: 5 months ago5 months ago
Resolution: --- → FIXED

Yeah, that's it Ian. I should've known that too from earlier fights with that ugly lump of code.

You need to log in before you can comment on or make changes to this bug.