Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (beff6002619dceeff68bc76ca98de15bc1d937a5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (beff6002619dceeff68bc76ca98de15bc1d937a5)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (beff6002619dceeff68bc76ca98de15bc1d937a5)
  • Date: Wed, 22 Feb 2023 23:14:59 +0000
GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

http/firefox/HISTORY
| 3
http/firefox/patches/0001-Don-t-use-build-id.patch
| 38 ++++++----
http/firefox/patches/0003-bmo-847568-Support-system-harfbuzz.patch
| 14 +--

http/firefox/patches/0034-bmo-1810584-suppress-false-positive-errors-with-gcc.patch
| 35 +++++++++
4 files changed, 67 insertions(+), 23 deletions(-)

New commits:
commit beff6002619dceeff68bc76ca98de15bc1d937a5
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

http/firefox: updated patches for 110.0

diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 794d393..7ad9ab8 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2023-02-22 Pavel Vinogradov <public AT sourcemage.org>
+ * patches/*: updated
+
2023-02-21 Pavel Vinogradov <public AT sourcemage.org>
* DEPENDS: added Wayland building option

diff --git a/http/firefox/patches/0001-Don-t-use-build-id.patch
b/http/firefox/patches/0001-Don-t-use-build-id.patch
index 1b1cd40..7b98188 100644
--- a/http/firefox/patches/0001-Don-t-use-build-id.patch
+++ b/http/firefox/patches/0001-Don-t-use-build-id.patch
@@ -1,7 +1,7 @@
diff -Naur a/js/src/old-configure.in b/js/src/old-configure.in
---- a/js/src/old-configure.in 2022-12-13 07:48:54.317336755 +0200
-+++ b/js/src/old-configure.in 2022-12-13 07:49:43.722154247 +0200
-@@ -239,12 +239,7 @@ if test "$GNU_CC"; then
+--- a/js/src/old-configure.in 2023-02-20 09:44:55.284485086 +0200
++++ b/js/src/old-configure.in 2023-02-20 09:47:08.337905001 +0200
+@@ -239,19 +239,6 @@
AC_MSG_RESULT([no])
LDFLAGS=$_SAVE_LDFLAGS)

@@ -11,14 +11,20 @@ diff -Naur a/js/src/old-configure.in
b/js/src/old-configure.in
- else
- build_id=uuid
- fi
-+ build_id=uuid
- AC_MSG_CHECKING([for --build-id=$build_id option to ld])
- _SAVE_LDFLAGS=$LDFLAGS
- LDFLAGS="$LDFLAGS -Wl,--build-id=$build_id"
+- AC_MSG_CHECKING([for --build-id=$build_id option to ld])
+- _SAVE_LDFLAGS=$LDFLAGS
+- LDFLAGS="$LDFLAGS -Wl,--build-id=$build_id"
+- AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
+- AC_MSG_RESULT([no])
+- LDFLAGS=$_SAVE_LDFLAGS)
+-
+ _DEFINES_CFLAGS="-include $jsconfdefs -DMOZILLA_CLIENT"
+ fi
+
diff -Naur a/old-configure.in b/old-configure.in
---- a/old-configure.in 2022-12-13 07:48:54.169334306 +0200
-+++ b/old-configure.in 2022-12-13 07:50:01.182443153 +0200
-@@ -253,12 +253,7 @@ if test "$GNU_CC"; then
+--- a/old-configure.in 2023-02-20 09:44:50.341395195 +0200
++++ b/old-configure.in 2023-02-20 09:47:26.498236118 +0200
+@@ -253,19 +253,6 @@
AC_MSG_RESULT([no])
LDFLAGS=$_SAVE_LDFLAGS)

@@ -28,7 +34,13 @@ diff -Naur a/old-configure.in b/old-configure.in
- else
- build_id=uuid
- fi
-+ build_id=uuid
- AC_MSG_CHECKING([for --build-id=$build_id option to ld])
+- AC_MSG_CHECKING([for --build-id=$build_id option to ld])
+- _SAVE_LDFLAGS=$LDFLAGS
+- LDFLAGS="$LDFLAGS -Wl,--build-id=$build_id"
+- AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
+- AC_MSG_RESULT([no])
+- LDFLAGS=$_SAVE_LDFLAGS)
+-
+ AC_MSG_CHECKING([for --ignore-unresolved-symbol option to ld])
+ HAVE_LINKER_SUPPORT_IGNORE_UNRESOLVED=
_SAVE_LDFLAGS=$LDFLAGS
- LDFLAGS="$LDFLAGS -Wl,--build-id=$build_id"
diff --git
a/http/firefox/patches/0003-bmo-847568-Support-system-harfbuzz.patch
b/http/firefox/patches/0003-bmo-847568-Support-system-harfbuzz.patch
index af71aea..18fb36f 100644
--- a/http/firefox/patches/0003-bmo-847568-Support-system-harfbuzz.patch
+++ b/http/firefox/patches/0003-bmo-847568-Support-system-harfbuzz.patch
@@ -1,12 +1,6 @@
-From 61e8f03c526a40dda89b57aad6aec3f37d7125cd Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi AT gentoo.org>
-Date: Mon, 6 Apr 2020 19:32:39 +0200
-Subject: [PATCH 04/30] bmo#847568: Support system harfbuzz
-
Allow building against system-wide harfbuzz.

Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=847568
-Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
---
config/system-headers.mozbuild | 7 +++++++
dom/base/moz.build | 3 +++
@@ -106,15 +100,15 @@ diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
index baa6f090a9..c51c36e2b4 100644
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
-@@ -294,6 +294,9 @@ LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"]
-
+@@ -294,6 +294,9 @@
+
DEFINES["GRAPHITE2_STATIC"] = True
-
+
+if CONFIG["MOZ_SYSTEM_HARFBUZZ"]:
+ CXXFLAGS += CONFIG["MOZ_HARFBUZZ_CFLAGS"]
+
CXXFLAGS += ["-Werror=switch"]
-
+
include("/tools/fuzzing/libfuzzer-config.mozbuild")
diff --git a/intl/unicharutil/util/moz.build
b/intl/unicharutil/util/moz.build
index 301eb9a854..7cece5e06c 100644
diff --git
a/http/firefox/patches/0034-bmo-1810584-suppress-false-positive-errors-with-gcc.patch

b/http/firefox/patches/0034-bmo-1810584-suppress-false-positive-errors-with-gcc.patch
new file mode 100644
index 0000000..9da01c9
--- /dev/null
+++
b/http/firefox/patches/0034-bmo-1810584-suppress-false-positive-errors-with-gcc.patch
@@ -0,0 +1,35 @@
+
+# HG changeset patch
+# User Iain Ireland <iireland AT mozilla.com>
+# Date 1674084161 0
+# Node ID 0a20a4613cc423258696c2e6200dc7d34f934cb6
+# Parent 26cacd18b61e629c8c45ca45c36770d3bf3f15b8
+Bug 1810584: Suppress false positive error for gcc r=mgaudet
+
+Differential Revision: https://phabricator.services.mozilla.com/D167194
+
+diff --git a/js/src/irregexp/moz.build b/js/src/irregexp/moz.build
+--- a/js/src/irregexp/moz.build
++++ b/js/src/irregexp/moz.build
+@@ -9,16 +9,20 @@ FINAL_LIBRARY = "js"
+ # Includes should be relative to parent path
+ LOCAL_INCLUDES += ["!..", ".."]
+
+ include("../js-config.mozbuild")
+ include("../js-cxxflags.mozbuild")
+
+ CXXFLAGS += ["-Wno-error=type-limits", "-Wno-error=return-type"]
+
++# Suppress spurious warnings in third-party code. See bug 1810584.
++if CONFIG["CC_TYPE"] == "gcc":
++ CXXFLAGS += ["-Wno-error=nonnull"]
++
+ UNIFIED_SOURCES += [
+ "imported/regexp-bytecode-generator.cc",
+ "imported/regexp-bytecode-peephole.cc",
+ "imported/regexp-bytecodes.cc",
+ "imported/regexp-compiler-tonode.cc",
+ "imported/regexp-dotprinter.cc",
+ "imported/regexp-interpreter.cc",
+ "imported/regexp-macro-assembler-tracer.cc",
+


  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (beff6002619dceeff68bc76ca98de15bc1d937a5), Pavel Vinogradov, 02/22/2023

Archive powered by MHonArc 2.6.24.

Top of Page