Browse Source

Reorder end of mozilla queue and add media handler code to Windows installer

Frank-Rainer Grahl 3 weeks ago
parent
commit
2e9c95b036

+ 96 - 0
comm-release/patches/9999999-handler-25320.patch

@@ -0,0 +1,96 @@
+# HG changeset patch
+# User Frank-Rainer Grahl <frgrahl@gmx.net>
+# Date 1727713945 -7200
+# Parent  b12d9beb551c25fcc88a8e96d7fea1eb00ae0420
+Bug 9999999 - Register as handler for media types. r=IanN a=IanN
+
+Register as default svg and webp handler. Register other media types if no
+handler exists.
+
+For some basic understanding see:
+- Bug 1197191 "Add .pdf and media file types to OpenWithProgid".
+- Bug 1340568 "Not possible to select Firefox as default browser".
+- Bug 1570477 "Register as a webp handler".
+
+We are not using a hash id because there are no different SeaMonkey
+installation types (Nightly, dev, plonk and so on).
+
+diff --git a/suite/installer/windows/nsis/shared.nsh b/suite/installer/windows/nsis/shared.nsh
+--- a/suite/installer/windows/nsis/shared.nsh
++++ b/suite/installer/windows/nsis/shared.nsh
+@@ -286,16 +286,26 @@
+     ${If} "$AppUserModelID" != ""
+       ApplicationID::Set "$QUICKLAUNCH\${BrandFullName}.lnk" "$AppUserModelID"
+     ${EndIf}
+     ShellLink::SetShortCutWorkingDirectory "$QUICKLAUNCH\${BrandFullName}.lnk" "$INSTDIR"
+   ${EndUnless}
+ !macroend
+ !define ShowShortcuts "!insertmacro ShowShortcuts"
+ 
++!macro AddAssociationIfNoneExist FILE_TYPE KEY
++  ClearErrors
++  EnumRegKey $7 HKCR "${FILE_TYPE}" 0
++  ${If} ${Errors}
++    WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}"  "" ${KEY}
++  ${EndIf}
++  WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}\OpenWithProgids" ${KEY} ""
++!macroend
++!define AddAssociationIfNoneExist "!insertmacro AddAssociationIfNoneExist"
++
+ !macro SetHandlersBrowser
+   ${GetLongPath} "$INSTDIR\${FileMainEXE}" $8
+ 
+   StrCpy $0 "SOFTWARE\Classes"
+   StrCpy $1 "$\"$8$\" -requestPending -osint -url $\"%1$\""
+   StrCpy $2 "$\"$8$\" -url $\"%1$\""
+   StrCpy $3 "$\"%1$\",,0,0,,,,"
+ 
+@@ -334,21 +344,23 @@
+      WriteRegStr SHCTX "$0\.xht" "" "SeaMonkeyHTML"
+   ${EndIf}
+ 
+   ReadRegStr $6 HKCR ".xhtml" ""
+   ${If} "$6" != "SeaMonkeyHTML"
+     WriteRegStr SHCTX "$0\.xhtml" "" "SeaMonkeyHTML"
+   ${EndIf}
+ 
+-  ; Only add webm if it's not present
+-  ${CheckIfRegistryKeyExists} "$0" ".webm" $7
+-  ${If} $7 == "false"
+-    WriteRegStr SHCTX "$0\.webm"  "" "SeaMonkeyHTML"
+-  ${EndIf}
++  ${AddAssociationIfNoneExist} ".oga"  "SeaMonkeyHTML"
++  ${AddAssociationIfNoneExist} ".ogg"  "SeaMonkeyHTML"
++  ${AddAssociationIfNoneExist} ".ogv"  "SeaMonkeyHTML"
++  ${AddAssociationIfNoneExist} ".svg"  "SeaMonkeyHTML"
++  ${AddAssociationIfNoneExist} ".webm" "SeaMonkeyHTML"
++  ${AddAssociationIfNoneExist} ".webp" "SeaMonkeyHTML"
++
+ !macroend
+ !define SetHandlersBrowser "!insertmacro SetHandlersBrowser"
+ 
+ !macro SetHandlersMail
+   ${GetLongPath} "$INSTDIR\${FileMainEXE}" $8
+ 
+   StrCpy $0 "SOFTWARE\Classes"
+   StrCpy $1 "$\"$8$\" $\"%1$\""
+@@ -421,16 +433,19 @@
+   WriteRegStr HKLM "$0\Capabilities" "ApplicationName" "${BrandShortName}"
+ 
+   WriteRegStr HKLM "$0\Capabilities\FileAssociations" ".htm"   "SeaMonkeyHTML"
+   WriteRegStr HKLM "$0\Capabilities\FileAssociations" ".html"  "SeaMonkeyHTML"
+   WriteRegStr HKLM "$0\Capabilities\FileAssociations" ".shtml" "SeaMonkeyHTML"
+   WriteRegStr HKLM "$0\Capabilities\FileAssociations" ".xht"   "SeaMonkeyHTML"
+   WriteRegStr HKLM "$0\Capabilities\FileAssociations" ".xhtml" "SeaMonkeyHTML"
+ 
++  WriteRegStr HKLM "$0\Capabilities\FileAssociations" ".svg"   "SeaMonkeyHTML"
++  WriteRegStr HKLM "$0\Capabilities\FileAssociations" ".webp"  "SeaMonkeyHTML"
++
+   WriteRegStr HKLM "$0\Capabilities\StartMenu" "StartMenuInternet" "$R9"
+ 
+   WriteRegStr HKLM "$0\Capabilities\URLAssociations" "ftp"    "SeaMonkeyURL"
+   WriteRegStr HKLM "$0\Capabilities\URLAssociations" "http"   "SeaMonkeyURL"
+   WriteRegStr HKLM "$0\Capabilities\URLAssociations" "https"  "SeaMonkeyURL"
+ 
+   ; Vista Registered Application
+   WriteRegStr HKLM "Software\RegisteredApplications" "${AppRegName}" "$0\Capabilities"

+ 1 - 0
comm-release/patches/series

@@ -2195,3 +2195,4 @@ TOP-1906540-mozdevice-removal-comm-25320.patch
 1658682-1-81a1.patch
 1658682-1-81a1.patch
 1658682-2-81a1.patch
 1658682-2-81a1.patch
 1661940-82a1.patch
 1661940-82a1.patch
+9999999-handler-25320.patch

+ 3 - 1
mozilla-release/patches/9999999-removebinary-25320.patch

@@ -1,7 +1,9 @@
 # HG changeset patch
 # HG changeset patch
-# User <frgrahl@gmx.net>
+# User Frank-Rainer Grahl <frgrahl@gmx.net>
 # Date 1727650331 -7200
 # Date 1727650331 -7200
 # Parent  86173d21f2d52d8636bfe5aaf94ac0e38f3e7f53
 # Parent  86173d21f2d52d8636bfe5aaf94ac0e38f3e7f53
+Bug 99999999 - Remove defunct binary manifest remains. r=IanN a=IanN
+SeaMonkey release branch only.
 
 
 diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py
 diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py
 --- a/python/mozbuild/mozpack/chrome/manifest.py
 --- a/python/mozbuild/mozpack/chrome/manifest.py

+ 5 - 5
mozilla-release/patches/series

@@ -7638,9 +7638,8 @@ TOP-NOBUG-nsstyle-prefers-reduced-motion.patch
 TOP-1909714-NSS3904-11514.patch
 TOP-1909714-NSS3904-11514.patch
 TOP-NOBUG-blockquad0-25319.patch
 TOP-NOBUG-blockquad0-25319.patch
 TOP-NOBUG-fixnasmcheck-25320.patch
 TOP-NOBUG-fixnasmcheck-25320.patch
-1902935-seamonkey-credits-25320.patch
-1862395-incorrect-version-resistfingerprinting-v2-25320.patch
-1737436-use-mozilla-compat-version-define-25320.patch
+1479945-1no2-63a1.patch
+1479945-3no4-63a1.patch
 1564097-72a1.patch
 1564097-72a1.patch
 1563403-2-73a1.patch
 1563403-2-73a1.patch
 1601872-73a1.patch
 1601872-73a1.patch
@@ -7654,8 +7653,9 @@ TOP-NOBUG-fixnasmcheck-25320.patch
 1602259-2-VS2019-gyp-25320.patch
 1602259-2-VS2019-gyp-25320.patch
 1728988-2-VS2022-gyp-25320.patch
 1728988-2-VS2022-gyp-25320.patch
 1857492-120a1.patch
 1857492-120a1.patch
-1479945-1no2-63a1.patch
-1479945-3no4-63a1.patch
 1900355-129a1.patch
 1900355-129a1.patch
 1907053-131a1.patch
 1907053-131a1.patch
+1902935-seamonkey-credits-25320.patch
+1862395-incorrect-version-resistfingerprinting-v2-25320.patch
+1737436-use-mozilla-compat-version-define-25320.patch
 9999999-removebinary-25320.patch
 9999999-removebinary-25320.patch