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

Status: RESOLVED FIXED

(Thunderbird :: Build Config, task)

Description

[Geoff Lankow (:darktrojan)]

+++ 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.

Comment 1

[Geoff Lankow (:darktrojan)]

Attachment: 1585195-macos-build-1.diff

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

Comment 2

[Rob Lemley [:rjl]]

Comment on attachment 9097535 [details] [diff] [review]
1585195-macos-build-1.diff

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

Looks good to me.

Comment 3

[Jorg K (CEST = GMT+2)]

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

Comment 4

[Pulsebot]

Pushed by [e-mail]:
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

Comment 5

[Geoff Lankow (:darktrojan)]

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

Comment 6

[Jorg K (CEST = GMT+2)]

Backout:
https://hg.mozilla.org/comm-central/rev/ff690144001a935394fae300e92359394b71759a

Comment 7

[Ian Neal]

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'

Comment 8

[Pulsebot]

Pushed by [e-mail]:
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

Comment 9

[Geoff Lankow (:darktrojan)]

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