Bug 1496047 1499472

comm-esr52/patches/1492154-sessionstore-249.patch

@@ -1,7 +1,7 @@
 # HG changeset patch
 # User Frank-Rainer Grahl <frgrahl@gmx.net>
 # Parent  433b6567d3f7ce8829436010ad73333f11676dc8
-Bug 1492154 - Account for invalid origin in principal and fix misspelled principal uri and url in sessionstore.
+Bug 1492154 - Allow for invalid origin in principal and fix misspelled principal uri and url in sessionstore.
 
 diff --git a/suite/common/src/nsSessionStore.js b/suite/common/src/nsSessionStore.js
 --- a/suite/common/src/nsSessionStore.js

comm-esr52/patches/1496047-mangle-249.patch

@@ -0,0 +1,27 @@
+# HG changeset patch
+# User Frank-Rainer Grahl <frgrahl@gmx.net>
+# Parent  6b4a44972c3b4276a6adcfcce3732ef6247d5ce9
+Bug 1496047 - Remove obsolete mangle and shlibsign macOS copy step from SeaMonkey make.
+See Bug 726975 [Tidy up browser/app/Makefile.in and skip a shell execution] item 5.
+
+diff --git a/suite/app/Makefile.in b/suite/app/Makefile.in
+--- a/suite/app/Makefile.in
++++ b/suite/app/Makefile.in
+@@ -128,17 +128,15 @@ tools:: $(PROGRAM)
+ 	mkdir -p $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS
+ 	rsync -a --exclude CVS --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/$(MOZ_MACBUNDLE_NAME) --exclude English.lproj
+ 	mkdir -p $(DIST)/$(MOZ_MACBUNDLE_NAME)/$(LPROJ)
+ 	rsync -a --exclude CVS --exclude "*.in" $(srcdir)/macbuild/Contents/Resources/English.lproj/ $(DIST)/$(MOZ_MACBUNDLE_NAME)/$(LPROJ)
+ 	sed -e "s/\@MOZ_APP_NAME\@/$(MOZ_APP_NAME)/" -e "s/\@MAC_APP_NAME\@/$(MAC_APP_NAME)/" -e "s/\@MOZ_APP_DISPLAYNAME\@/$(MOZ_APP_DISPLAYNAME)/" -e "s/\@MOZ_APP_VERSION\@/$(MOZ_APP_VERSION)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Info.plist
+ 	sed -e "s/\@MOZ_APP_NAME\@/$(MOZ_APP_NAME)/" -e "s/\@MAC_APP_NAME\@/$(MAC_APP_NAME)/" -e "s/\@MOZ_APP_DISPLAYNAME\@/$(MOZ_APP_DISPLAYNAME)/" -e "s/\@MOZ_APP_VERSION\@/$(MOZ_APP_VERSION)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > $(DIST)/$(MOZ_MACBUNDLE_NAME)/$(LPROJ)/InfoPlist.strings
+ 	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
+-	rm -f $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)/mangle $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)/shlibsign
+ 	rm -f $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(PROGRAM)
+ 	rsync -aL $(PROGRAM) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS
+-	-cp -L $(DIST)/bin/mangle $(DIST)/bin/shlibsign $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)
+ 	cp -RL $(DIST)/branding/icons/*.icns $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/
+ 	printf APPLMOZZ > $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/PkgInfo
+ #       remove CVS dirs from packaged app
+ 	find $(DIST)/$(MOZ_MACBUNDLE_NAME) -type d -name "CVS" -prune -exec rm -rf {} \;
+ endif

comm-esr52/patches/1499472-history.patch

@@ -0,0 +1,28 @@
+# HG changeset patch
+# User Frank-Rainer Grahl <frgrahl@gmx.net>
+# Parent  6b4a44972c3b4276a6adcfcce3732ef6247d5ce9
+Bug 1499472 - Search field in history panel is not visible under macOS.
+
+diff --git a/suite/common/history/history.xul b/suite/common/history/history.xul
+--- a/suite/common/history/history.xul
++++ b/suite/common/history/history.xul
+@@ -61,17 +61,18 @@
+   </keyset>
+ 
+   <popupset id="placesPopupset">
+     <menupopup id="placesContext"/>
+   </popupset>
+ 
+   <toolbox id="history-toolbox">
+     <toolbar id="placesToolbar"
+-             type="menubar">
++             class="chromeclass-toolbar"
++             align="center">
+       <menubar id="history-menu"
+                grippytooltiptext="&menuBar.tooltip;">
+ 
+         <menu id="menu_File">
+           <menupopup id="menu_FilePopup">
+             <menuitem id="menu_close"/>
+           </menupopup>
+         </menu>

comm-esr52/patches/series

@@ -1,2 +1,4 @@
 frg-249-5.patch
 1492154-sessionstore-249.patch
+1496047-mangle-249.patch
+1499472-history.patch