Accepting request 1076437 from mozilla:Factory

OBS-URL: https://build.opensuse.org/request/show/1076437
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/seamonkey?expand=0&rev=22

mozilla-language.patch

@@ -1,44 +0,0 @@
-# HG changeset patch
-# User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent 5a29924228527f8882c83cf62d470963ea1ce62e
-# Parent  4f39ed617c2f151a3a15903c7ae4471b66774e9e
-Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE
-
-diff -ruN seamonkey/mozilla/intl/locale/nsLocaleService.cpp seamonkey.new/mozilla/intl/locale/nsLocaleService.cpp
---- seamonkey/mozilla/intl/locale/nsLocaleService.cpp	2020-02-18 00:37:52.000000000 +0100
-+++ seamonkey.new/mozilla/intl/locale/nsLocaleService.cpp	2020-03-02 12:50:24.804429601 +0100
-@@ -121,6 +121,7 @@
- 
-     // Get system configuration
-     const char* lang = getenv("LANG");
-+    const char* language = getenv("LANGUAGE");
- 
-     nsAutoString xpLocale, platformLocale;
-     nsAutoString category, category_platform;
-@@ -156,6 +157,26 @@
-         if (NS_FAILED(result)) {
-             return;
-         }
-+        // LANGUAGE is overriding LC_MESSAGES
-+        // it can be a colon separated list of preferred languages
-+        // as we do not recognize here if a language is available
-+        // we actually only consider the first entry unless GetXPLocale
-+        // fails completely
-+        if (i == LC_MESSAGES && language && *language) {
-+#define LANGUAGE_SEP ":"
-+          nsAutoString xpLocale_temp;
-+          char* rawBuffer = (char*) language;
-+          char* token = nsCRT::strtok(rawBuffer, LANGUAGE_SEP, &rawBuffer);
-+          for (; token;
-+              token = nsCRT::strtok(rawBuffer, LANGUAGE_SEP, &rawBuffer)) {
-+            result = nsPosixLocale::GetXPLocale(token, xpLocale_temp);
-+            if (NS_SUCCEEDED(result)) {
-+              CopyASCIItoUTF16(token, platformLocale);
-+              xpLocale = xpLocale_temp;
-+              break;
-+            }
-+          }
-+        }
-         resultLocale->AddCategory(category, xpLocale);
-         resultLocale->AddCategory(category_platform, platformLocale);
-     }

seamonkey-2.53.15.source-l10n.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:be0bbf299da751515a17885d9a4c7f9d6e5b6b22e5320494e58463861b758ac5
-size 13657060

seamonkey-2.53.15.source.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:04a9dcd57217b1c630815b10d07e1865db14339b04930ec09d521733d6e8ec3f
-size 260787300

seamonkey-2.53.16.source-l10n.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7e452a91c1a7371c1e4f31aa2ab3d85d326acc9cce66b1c75954e0d9d0d888d1
+size 13641752

seamonkey-2.53.16.source.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1b7c82fb8cd795ae9c78c57c0dde0f24d61432bdcaf93f28715f1ea4d51c0edc
+size 265946284

seamonkey-GNUmakefile

@@ -143,37 +143,27 @@ stage := $(OBJDIR)/dist/xpi-stage/locale
 $(stage)-%:
 	$(MAKE) -C $(OBJDIR)/comm/suite/locales langpack-$*
 
-#  Combine extensions data with the main localization stuff and leave only one manifest file
+#  Cleanup of old manifest files
-	for manifest in `find $@/extensions -name "*.manifest" -print` ; \
+	find $@ -name "*.manifest" -print | xargs rm -f
-	do \
-	    while read keyword name lang path rest ; \
-	    do \
-	        [ "$$keyword" = locale ] || continue ; \
-	        [ "$$lang" = "$*" ] || continue ; \
-	        [ "$${path%/*/}/$$name/" = "$$path" ] || continue ; \
-	        tar -C $${manifest%/*}/$${path%/*/} -chf - $$name | tar -C $@/chrome/$*/locale/$* -xf - ; \
-	        echo "locale $$name $* $*/locale/$*/$$name/$${rest:+ $$rest}" >> $@/chrome/$*.manifest ; \
-	    done < $$manifest ; \
-	done
 
-	sed 's,$*/locale/$*,chrome/&,' $@/chrome/$*.manifest | sort > $@/chrome.manifest
+	find $@ -name ".mkdir.done" -print | xargs rm -f
-	rm -f $@/chrome/$*.manifest
+	find $@/extensions -name "defaults" -type d -print | xargs rm -rf
 
 #  Spanish locales other than es-ES are from Latam, where the es-AR langpack is most preferred
-	[ $* = es-AR ] && sed -i '/^locale/ s/ es-AR / es /' $@/chrome.manifest || :
+	[ $* = es-AR ] && sed -i '/"es-AR": {/ s/es-AR/es/' $@/manifest.json || :
 
 
 locale-%: REL_NAME = extensions/langpack-$*@seamonkey.mozilla.org.xpi
 locale-%: DEST_NAME = $(OBJDIR)/dist/bin/$(REL_NAME)
 locale-%: manifest_entry = @RESPATH@/$(REL_NAME)
 
-#  To avoid performance issues in multi-locale installs, put the manifest files
+#  To avoid performance issues in multi-locale installs, put manifest.json file
 #  into the beginning of the archive, and do not compress them.
 
 locale-%: $(stage)-%  $(PACKAGE_MANIFEST)
 	rm -f $(DEST_NAME)
-	cd $<; zip -0 -D -X $(DEST_NAME) chrome.manifest install.rdf
+	cd $<; zip -0 -D -X $(DEST_NAME) manifest.json
-	cd $<; zip -g -r -9 -D -X $(DEST_NAME) chrome/$*
+	cd $<; zip -g -r -9 -D -X $(DEST_NAME) chrome extensions
 	fgrep $(manifest_entry) $(PACKAGE_MANIFEST) || echo $(manifest_entry) >>$(PACKAGE_MANIFEST)
 
 

seamonkey-spellcheck.patch

@@ -1,12 +0,0 @@
-diff -ruN seamonkey-2.53.14.old/dom/ipc/ContentChild.cpp seamonkey-2.53.14/dom/ipc/ContentChild.cpp
---- seamonkey-2.53.14.old/dom/ipc/ContentChild.cpp	2022-08-24 21:55:11.000000000 +0200
-+++ seamonkey-2.53.14/dom/ipc/ContentChild.cpp	2022-09-29 15:01:51.098163074 +0200
-@@ -210,7 +210,7 @@
- #include "mozilla/ipc/CrashReporterClient.h"
- #include "mozilla/net/NeckoMessageUtils.h"
- #include "mozilla/widget/PuppetBidiKeyboard.h"
--#include "mozilla/RemoteSpellCheckEngineChild.h"
-+#include "mozilla/mozSpellChecker.h"
- #include "GMPServiceChild.h"
- #include "GfxInfoBase.h"
- #include "gfxPlatform.h"

seamonkey.changes

@@ -1,3 +1,41 @@
+-------------------------------------------------------------------
+Wed Mar 31 07:22:42 UTC 2023 - Tristan Miller <psychonaut@nothingisreal.com>
+
+- update to SeaMonkey 2.53.16
+  * No throbber in plaintext editor bug 85498.
+  * Remove unused gridlines class from EdAdvancedEdit bug 1806632.
+  * Remove ESR 91 links from debugQA bug 1804534.
+  * Rename devtools/shim to devtools/startup bug 1812367.
+  * Remove unused seltype=text|cell css bug 1806653.
+  * Implement new shared tree styling bug 1807802.
+  * Use `win.focus()` in macWindowMenu.js bug 1807817.
+  * Remove WCAP provider bug 1579020.
+  * Remove ftp/file tree view support bug 1239239.
+  * Change calendar list tree to a list bug 1561530.
+  * Various other updates to the calendar code.
+  * Continue the switch from Python 2 to Python 3 in the build system.
+  * Verified compatibility with Rust 1.66.1.
+  * SeaMonkey 2.53.16 uses the same backend as Firefox and contains
+    the relevant Firefox 60.8 security fixes.
+  * SeaMonkey 2.53.16 shares most parts of the mail and news code with
+    Thunderbird. Please read the Thunderbird 60.8.0 release notes for
+    specific security fixes in this release.
+  * Additional important security fixes up to Current Firefox 102.9
+    and Thunderbird 102.9 ESR plus many enhancements have been
+    backported. We will continue to enhance SeaMonkey security in
+    subsequent 2.53.x beta and release versions as fast as we are able
+    to.
+- update seamonkey-GNUmakefile patch per
+  https://bugzilla.mozilla.org/show_bug.cgi?id=1692516#c11 to reflect
+  changes in the new way of packing langpacks
+- remove obsolete patch mozilla-language.patch
+- remove obsolete patch seamonkey-spellcheck.patch
+- remove --enable-system-hunspell from .mozconfig per
+  https://bugzilla.mozilla.org/show_bug.cgi?id=1820413
+- add build dependency on clang
+- request inclusion in Leap 15.4:
+  https://bugzilla.opensuse.org/show_bug.cgi?id=1209994
+
 -------------------------------------------------------------------
 Fri Jan 20 10:12:30 UTC 2023 - Tristan Miller <psychonaut@nothingisreal.com>
 
@@ -61,7 +99,7 @@ Fri Jan 20 10:12:30 UTC 2023 - Tristan Miller <psychonaut@nothingisreal.com>
   obsolete stuff and fix handling of Latam Spanish
 - remove build dependency on obsolete rust-std-static
 - request inclusion in Leap 15.4:
-  https://bugzilla.opensuse.org/show_bug.cgi?id=
+  https://bugzilla.opensuse.org/show_bug.cgi?id=1207332
 
 -------------------------------------------------------------------
 Thu Sep 29 12:14:18 UTC 2022 - Tristan Miller <psychonaut@nothingisreal.com>

seamonkey.spec

@@ -17,6 +17,9 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
+# upstream default is clang (to use gcc for large parts set to 0)
+%define clang_build    0
+
 Name:           seamonkey
 BuildRequires:  Mesa-devel
 BuildRequires:  alsa-devel
@@ -61,11 +64,17 @@ BuildRequires:  rust >= 1.47
 BuildRequires:  rust-cbindgen
 BuildRequires:  git
 BuildRequires:  nasm >= 2.13
+#BuildRequires:  llvm-devel
+%if (0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000)
+BuildRequires:  clang6-devel
+%else
+BuildRequires:  clang-devel >= 5
+%endif
 Provides:       web_browser
 Provides:       browser(npapi)
-Version:        2.53.15
+Version:        2.53.16
 Release:        0
-%define releasedate 20230120000000
+%define releasedate 20230331000000
 Summary:        An integrated web browser, composer, mail/news client, and IRC client
 License:        MPL-2.0
 Group:          Productivity/Networking/Web/Browsers
@@ -80,11 +89,9 @@ Source7:        seamonkey-rpmlintrc
 Source11:       seamonkey-appdata.tar.bz2
 Source12:       seamonkey-GNUmakefile
 Patch1:         mozilla-nongnome-proxies.patch
-Patch2:         mozilla-language.patch
 Patch3:         mozilla-ntlm-full-path.patch
 Patch4:         seamonkey-lto.patch
 Patch5:         seamonkey-man-page.patch
-Patch6:         seamonkey-spellcheck.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         /bin/sh coreutils
 Provides:       seamonkey-mail = %{version}
@@ -213,15 +220,10 @@ cd mozilla
 cp %{SOURCE12} GNUmakefile
 
 %patch1 -p2
-%patch2 -p2
 %patch3 -p2
 %patch4 -p1
 %patch5 -p0
 
-if [ $(gcc -dumpversion | awk -F. '{print $1}') -ge 12 ]; then
-%patch6 -p1
-fi
-
 cat << EOF > .mozconfig
 mk_add_options MOZILLA_OFFICIAL=1
 mk_add_options BUILD_OFFICIAL=1
@@ -276,7 +278,6 @@ ac_add_options --with-system-icu
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
 ac_add_options --enable-startup-notification
-ac_add_options --enable-system-hunspell
 ac_add_options --enable-alsa
 %if %has_system_cairo
 ac_add_options --enable-system-cairo
@@ -317,7 +318,16 @@ export SUSE_ASNEEDED=0
 export MOZ_BUILD_DATE=%{releasedate}
 export MOZILLA_OFFICIAL=1
 export BUILD_OFFICIAL=1
+
 export CFLAGS="%{optflags} -fno-strict-aliasing"
+%if 0%{?clang_build} == 0
+export CC=gcc
+export CXX=g++
+%if 0%{?gcc_version:%{gcc_version}} >= 12
+export CFLAGS="$CFLAGS -fimplicit-constexpr"
+%endif
+%endif
+
 if [ $(gcc -dumpversion | awk -F. '{print $1}') -ge 6 ]; then
 export CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
 fi
@@ -329,8 +339,10 @@ export CFLAGS="${CFLAGS/-g / }"
 export LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
 %endif
 %ifarch ppc64 ppc64le
+%if 0%{?clang_build} == 0
 export CFLAGS="$CFLAGS -mminimal-toc"
 %endif
+%endif
 export CXXFLAGS="$CFLAGS"
 
 #