Browse Source

bug 1448543 and bug 1477559

Bill Gianopoulos 3 years ago
parent
commit
8d9fe86cd7

+ 30 - 0
bug1240930-253/comm/1448543-257.patch

@@ -0,0 +1,30 @@
+# HG changeset patch
+# User Bill Gianopoulos <wgianopoulos@gmail.com>
+# Date 1521647885 14400
+# Node ID f61075a4b4d0a926562b60e47c23fcefc7963852
+# Parent  76aa0354eec22939af768ed44438ec3d0ad63da0
+Bug 1448543 - Copy SeaMonkey binaries directly from dist target. r=ewong a=frg
+Port Bug 1255485 [Build binaries directly in their FINAL_TARGET location] to SeaMonkey.
+
+diff --git a/suite/app/Makefile.in b/suite/app/Makefile.in
+--- a/suite/app/Makefile.in
++++ b/suite/app/Makefile.in
+@@ -54,17 +54,17 @@ ifeq ($(OS_ARCH),WINNT)
+ else
+ 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/
+ endif
+ 
+ ifneq ($(OS_ARCH),WINNT)
+ 
+ ifdef COMPILE_ENVIRONMENT
+ libs:: 
+-	cp -p $(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
++	cp -p $(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
+ endif
+ 
+ endif
+ 
+ ifneq (,$(filter-out WINNT Darwin,$(OS_ARCH)))
+ $(MOZ_APP_NAME).1: seamonkey.man.in $(GLOBAL_DEPS) $(DEPTH)/config/autoconf.mk
+ 	@sed -e "s|\@bindir\@|$(bindir)|g" -e "s|\@mozappdir\@|$(mozappdir)|g" \
+ 		-e "s|\@MOZ_APP_DISPLAYNAME\@|$(MOZ_APP_DISPLAYNAME)|g" \

+ 31 - 0
bug1240930-253/comm/1477559-257.patch

@@ -0,0 +1,31 @@
+# HG changeset patch
+# User Ian Neal <iann_cvs@blueyonder.co.uk>
+# Date 1532288199 -3600
+# Node ID 8c44e9dc156da90f2b8e683bf8b232727e57dc85
+# Parent  c8bd381e7e00f62e2d9d11a0f76aa48fe2b340eb
+Bug 1477559 - Port | Bug 1255485 - Remove NSDISTMODE=copy from Makefiles| to SeaMonkey. r=frg a=frg
+
+diff --git a/suite/app/Makefile.in b/suite/app/Makefile.in
+--- a/suite/app/Makefile.in
++++ b/suite/app/Makefile.in
+@@ -13,20 +13,16 @@ LICENSE_TXT_FILE = $(topsrcdir)/comm/sui
+ ifndef MOZ_WINCONSOLE
+ ifdef MOZ_DEBUG
+ MOZ_WINCONSOLE = 1
+ else
+ MOZ_WINCONSOLE = 0
+ endif
+ endif
+ 
+-# This switches $(INSTALL) to copy mode, like $(SYSINSTALL), so things that
+-# shouldn't get 755 perms need $(IFLAGS1) for either way of calling nsinstall.
+-NSDISTMODE = copy
+-
+ include $(topsrcdir)/config/config.mk
+ 
+ # If we are trying to show an error dialog about the lack of SSE2 support,
+ # make sure that code itself doesn't use SSE2.
+ ifdef MOZ_LINUX_32_SSE2_STARTUP_ERROR
+ CXX := $(filter-out -march=% -msse -msse2 -mfpmath=sse,$(CXX))
+ CXX += -march=pentiumpro
+ endif

+ 2 - 0
bug1240930-253/comm/series-append

@@ -1,3 +1,5 @@
+1448543-257.patch
+1477559-257.patch
 1468240-port-1437942-mail-62a1.patch
 1468240-port-1437942-mail-62a1.patch
 1639866-1-port-1437942-suite-277.patch
 1639866-1-port-1437942-suite-277.patch
 1240930-mail-80a1.patch
 1240930-mail-80a1.patch