Help
Sign In
thereisonlyxul
/
smpatches-wip
mirror of https://gitlab.com/frg/seamonkey-wip.git
2
0
Fork 0
Files
Browse Source

sync with 2.53

Frank-Rainer Grahl 1 month ago
parent
62a1284f9a
commit
457289a2d5
10 changed files with 87 additions and 35 deletions
Split View Show Diff Stats
  1. 0 0
      frg/work-js/comm-release/patches/1470307-1-PARTIAL-BACKOUT-25319.patch
  2. 2 2
      frg/work-js/comm-release/patches/1478168-63a1.patch
  3. 0 0
      frg/work-js/comm-release/patches/1897801-1-about-seamonkey-25319.patch
  4. 51 0
      frg/work-js/comm-release/patches/1897801-2-about-seamonkey-25320.patch
  5. 0 0
      frg/work-js/comm-release/patches/1909858-venkman-25319.patch
  6. 0 0
      frg/work-js/comm-release/patches/1909864-1-SeekCell-25319.patch
  7. 0 0
      frg/work-js/comm-release/patches/1909864-2-PickNextCell-25319.patch
  8. 4 4
      frg/work-js/comm-release/patches/PPPPPPP-tbbranding-253.patch
  9. 15 15
      frg/work-js/comm-release/patches/series
  10. 15 14
      frg/work-js/comm-release/patches/series-test

+ 0 - 0
frg/work-js/comm-release/patches/1470307-1-PARTIAL-BACKOUT-25320.patch → frg/work-js/comm-release/patches/1470307-1-PARTIAL-BACKOUT-25319.patch
View File


+ 2 - 2
frg/work-js/comm-release/patches/1478168-63a1.patch
View File 

@@ -2,7 +2,7 @@
 
 # User Jorg K <jorgk@jorgk.com>
 
 # Date 1532473048 -7200
 
 # Node ID 3d1872a693cf87538d50c35eda62183497e18e26
 
-# Parent  c8be28fbe8108a16be336e58cbf044d2a763c4ac
 
+# Parent  9973c4d96832751fcbaf1e2e1d908115a6765e80
 
 Bug 1478168 - Port 1476333: Replace use of pref browser.chromeURL. rs=bustage-fix, f=bgrins DONTBUILD
 
 
 diff --git a/mail/app/profile/all-thunderbird.js b/mail/app/profile/all-thunderbird.js
 
@@ -62,7 +62,7 @@ diff --git a/mail/confvars.sh b/mail/confvars.sh
 
  
 +BROWSER_CHROME_URL=chrome://messenger/content/messengercompose/messengercompose.xul
 
 +
 
- MOZ_BRANDING_DIRECTORY=$commreltopsrcdir/mail/branding/thunderbird
 
+ MOZ_BRANDING_DIRECTORY=$commreltopsrcdir/mail/branding/nightly
 
  MOZ_OFFICIAL_BRANDING_DIRECTORY=$commreltopsrcdir/mail/branding/thunderbird
 
  
  MOZ_APP_ID={3550f703-e582-4d05-9a08-453d09bdfdc6}

+ 0 - 0
frg/work-js/comm-release/patches/1897801-about-seamonkey-25319.patch → frg/work-js/comm-release/patches/1897801-1-about-seamonkey-25319.patch
View File


+ 51 - 0
frg/work-js/comm-release/patches/1897801-2-about-seamonkey-25320.patch
View File 

@@ -0,0 +1,51 @@
 
+# HG changeset patch
 
+# User Bill Gianopoulos <wgianopoulos@gmail.com>
 
+# Date 1723372087 0
 
+# Parent  1dd0a737fadf63bb3a886b9d73929a2bfc222800
 
+Bug 1897901 - Followup - Fix about:seamonkey page title. r=frg a=frg
 
+
 
+diff --git a/suite/base/content/aboutSeaMonkey.xhtml b/suite/base/content/aboutSeaMonkey.xhtml
 
+--- a/suite/base/content/aboutSeaMonkey.xhtml
 
++++ b/suite/base/content/aboutSeaMonkey.xhtml
 
+@@ -8,17 +8,17 @@
 
+ 
+ <!-- This Source Code Form is subject to the terms of the Mozilla Public
 
+    - License, v. 2.0. If a copy of the MPL was not distributed with this
 
+    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
+ 
+ <html xmlns="http://www.w3.org/1999/xhtml">
 
+   <head>
 
+     <meta charset='utf-8' />
 
+-    <title>&seamonkey.title.1.30;</title>
 
++    <title>&seamonkey.title.1.30a;</title>
 
+ 
+ <style>
 
+ html {
 
+   background-color: #33CC99;
 
+   color: white;
 
+   font-style: italic;
 
+   text-rendering: optimizeLegibility;
 
+   min-height: 100%;
 
+diff --git a/suite/locales/en-US/chrome/common/aboutSeaMonkey.dtd b/suite/locales/en-US/chrome/common/aboutSeaMonkey.dtd
 
+--- a/suite/locales/en-US/chrome/common/aboutSeaMonkey.dtd
 
++++ b/suite/locales/en-US/chrome/common/aboutSeaMonkey.dtd
 
+@@ -1,14 +1,15 @@
 
+ <!-- This Source Code Form is subject to the terms of the Mozilla Public
 
+    - License, v. 2.0. If a copy of the MPL was not distributed with this
 
+    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
+ 
+-<!ENTITY seamonkey.title.1.30
 
+-'The Book of Mozilla, 1.30'>
 
++<!-- SeaMonkey is a copyrighted name. Do not translate it. -->
 
++<!ENTITY seamonkey.title.1.30a
 
++'The Book of SeaMonkey, 1.30'>
 
+ 
+ <!ENTITY seamonkey.quote.1.30
 
+ 'And the meek shall be made <em>legion</em>, their numbers shall be increased.
 
+-<br/>The din of many keyboards like unto a great <em>storm</em> shall cover the earth and the
 
+-followers of the beast and Mammon shall <em>tremble</em>.'>
 
++<br/>The din of many keyboards like unto a great <em>storm</em> shall cover the
 
++earth and the followers of the beast and Mammon shall <em>tremble</em>.'>
 
+ 
+ <!ENTITY seamonkey.from.1.30
 
+ 'from <strong>The Book of SeaMonkey</strong>, 1:30'>

+ 0 - 0
frg/work-js/comm-release/patches/1909858-venkman-25320.patch → frg/work-js/comm-release/patches/1909858-venkman-25319.patch
View File


+ 0 - 0
frg/work-js/comm-release/patches/1909864-1-SeekCell-25320.patch → frg/work-js/comm-release/patches/1909864-1-SeekCell-25319.patch
View File


+ 0 - 0
frg/work-js/comm-release/patches/1909864-2-PickNextCell-25320.patch → frg/work-js/comm-release/patches/1909864-2-PickNextCell-25319.patch
View File


+ 4 - 4
frg/work-js/comm-release/patches/PPPPPPP-tbbranding-253.patch
View File 

@@ -1,22 +1,22 @@
 
 # HG changeset patch
 
 # User Frank-Rainer Grahl <frgrahl@gmx.net>
 
 # Date 1621294423 -7200
 
-# Parent  5cad5f37010eecf45038d07535cd2631539865d2
 
+# Parent  836bd763431961afdde07981ec9af8b89df3e890
 
 Bug PPPPPPP - frg 2.53 Use release branding for TB.
 
 Private patch not for any official SeaMonkey branch.
 
 
 diff --git a/mail/confvars.sh b/mail/confvars.sh
 
 --- a/mail/confvars.sh
 
 +++ b/mail/confvars.sh
 
-@@ -17,17 +17,17 @@ if test "$OS_ARCH" = "WINNT"; then
 
-   if ! test "$HAVE_64BIT_BUILD"; then
 
-     MOZ_VERIFY_MAR_SIGNATURE=1
 
+@@ -19,17 +19,17 @@ if test "$OS_ARCH" = "WINNT"; then
 
    fi
 
  fi
 
  
  MOZ_APP_VERSION=$THUNDERBIRD_VERSION
 
  MOZ_APP_VERSION_DISPLAY=$THUNDERBIRD_VERSION_DISPLAY
 
  
+ BROWSER_CHROME_URL=chrome://messenger/content/messengercompose/messengercompose.xul
 
+ 
 -MOZ_BRANDING_DIRECTORY=$commreltopsrcdir/mail/branding/nightly
 
 +MOZ_BRANDING_DIRECTORY=$commreltopsrcdir/mail/branding/thunderbird
 
  MOZ_OFFICIAL_BRANDING_DIRECTORY=$commreltopsrcdir/mail/branding/thunderbird

+ 15 - 15
frg/work-js/comm-release/patches/series
View File 

@@ -2138,10 +2138,23 @@ NOBUG-fixcalbackend-25318.patch
 
 1896292-offlineappcachehelper-25319.patch
 
 1877001-port1407891-25319.patch
 
 1879726-port1398229-25319.patch
 
-1897801-about-seamonkey-25319.patch
 
+1897801-1-about-seamonkey-25319.patch
 
 1437393-fontsasync-25319.patch
 
 1896174-checkbox-25319.patch
 
 1437393-fontsasync-format-25319.patch
 
+1861843-2-version-beta-cr-25319.patch
 
+1479449-602.patch
 
+1470307-1-PARTIAL-BACKOUT-25319.patch
 
+1909858-venkman-25319.patch
 
+1909864-1-SeekCell-25319.patch
 
+1909864-2-PickNextCell-25319.patch
 
+1902849-version-release-cr-25319.patch
 
+1902851-1-version-prebeta-cr-25320.patch
 
+1434951-60a1.patch
 
+1478168-63a1.patch
 
+1909853-removemsnicq-25320.patch
 
+1909855-debugqa-esr128-25320.patch
 
+1909743-suite-prefs-prefers-color-scheme-25320.patch
 
 PPPPPPP-tbbranding-253.patch
 
 PPPPPPP-privateprefs-253.patch
 
 TOP-1534155-PARTIAL-69a1.patch
 
@@ -2163,22 +2176,9 @@ WIP-1687385-mozconfigs-v2_0-253.patch
 
 WIP-1070492-composer-findbar-v3-25319.patch
 
 TOP-1378089-4-WIP-bookmarks-25319.patch
 
 TOP-1872623-cancelbookmark-25319.patch
 
-1861843-2-version-beta-cr-25319.patch
 
-1479449-602.patch
 
-1902849-version-release-cr-25319.patch
 
-1902851-1-version-prebeta-cr-25320.patch
 
 TOP-1906540-mozdevice-removal-comm-25320.patch
 
-1434951-60a1.patch
 
-1470307-1-PARTIAL-BACKOUT-25320.patch
 
-1909743-suite-prefs-prefers-color-scheme-25320.patch
 
-1909853-removemsnicq-25320.patch
 
-1909855-debugqa-esr128-25320.patch
 
-1909858-venkman-25320.patch
 
-1909864-1-SeekCell-25320.patch
 
-1909864-2-PickNextCell-25320.patch
 
 1911830-helpInfo-25320.patch
 
 1911841-browserChromeURL-25320.patch
 
-1478168-63a1.patch
 
 1911844-boxObject-utilityOverlay-25320.patch
 
 1911845-tabbrowser-dragOver-25320.patch
 
 1911847-tabbrowser-boxObject-25320.patch
 
@@ -2188,7 +2188,7 @@ TOP-1906540-mozdevice-removal-comm-25320.patch
 
 1913579-removed-files-25320.patch
 
 1564611-70a1.patch
 
 1913633-mar-channel-ids-25320.patch
 
-
 
+1897801-2-about-seamonkey-25320.patch
 
 
 
 253-release-top.patch

+ 15 - 14
frg/work-js/comm-release/patches/series-test
View File 

@@ -2138,10 +2138,23 @@ NOBUG-fixcalbackend-25318.patch
 
 1896292-offlineappcachehelper-25319.patch
 
 1877001-port1407891-25319.patch
 
 1879726-port1398229-25319.patch
 
-1897801-about-seamonkey-25319.patch
 
+1897801-1-about-seamonkey-25319.patch
 
 1437393-fontsasync-25319.patch
 
 1896174-checkbox-25319.patch
 
 1437393-fontsasync-format-25319.patch
 
+1861843-2-version-beta-cr-25319.patch
 
+1479449-602.patch
 
+1470307-1-PARTIAL-BACKOUT-25319.patch
 
+1909858-venkman-25319.patch
 
+1909864-1-SeekCell-25319.patch
 
+1909864-2-PickNextCell-25319.patch
 
+1902849-version-release-cr-25319.patch
 
+1902851-1-version-prebeta-cr-25320.patch
 
+1434951-60a1.patch
 
+1478168-63a1.patch
 
+1909853-removemsnicq-25320.patch
 
+1909855-debugqa-esr128-25320.patch
 
+1909743-suite-prefs-prefers-color-scheme-25320.patch
 
 PPPPPPP-tbbranding-253.patch
 
 PPPPPPP-privateprefs-253.patch
 
 TOP-1534155-PARTIAL-69a1.patch
 
@@ -2163,22 +2176,9 @@ WIP-1687385-mozconfigs-v2_0-253.patch
 
 WIP-1070492-composer-findbar-v3-25319.patch
 
 TOP-1378089-4-WIP-bookmarks-25319.patch
 
 TOP-1872623-cancelbookmark-25319.patch
 
-1861843-2-version-beta-cr-25319.patch
 
-1479449-602.patch
 
-1902849-version-release-cr-25319.patch
 
-1902851-1-version-prebeta-cr-25320.patch
 
 TOP-1906540-mozdevice-removal-comm-25320.patch
 
-1434951-60a1.patch
 
-1470307-1-PARTIAL-BACKOUT-25320.patch
 
-1909743-suite-prefs-prefers-color-scheme-25320.patch
 
-1909853-removemsnicq-25320.patch
 
-1909855-debugqa-esr128-25320.patch
 
-1909858-venkman-25320.patch
 
-1909864-1-SeekCell-25320.patch
 
-1909864-2-PickNextCell-25320.patch
 
 1911830-helpInfo-25320.patch
 
 1911841-browserChromeURL-25320.patch
 
-1478168-63a1.patch
 
 1911844-boxObject-utilityOverlay-25320.patch
 
 1911845-tabbrowser-dragOver-25320.patch
 
 1911847-tabbrowser-boxObject-25320.patch
 
@@ -2188,3 +2188,4 @@ TOP-1906540-mozdevice-removal-comm-25320.patch
 
 1913579-removed-files-25320.patch
 
 1564611-70a1.patch
 
 1913633-mar-channel-ids-25320.patch
 
+1897801-2-about-seamonkey-25320.patch