[arch-commits] Commit in bluegriffon/trunk (3 files)

[Evangelos Foutras]

    Date: Saturday, December 19, 2020 @ 15:50:01
  Author: foutrelis
Revision: 779986

Fix build with glibc 2.32 and GCC 10

Added:
  bluegriffon/trunk/glibc-2.32.patch
  bluegriffon/trunk/libstagefright-format-overflow.patch
Modified:
  bluegriffon/trunk/PKGBUILD

--------------------------------------+
 PKGBUILD                             |    8 ++++++++
 glibc-2.32.patch                     |   11 +++++++++++
 libstagefright-format-overflow.patch |   10 ++++++++++
 3 files changed, 29 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-19 15:31:44 UTC (rev 779985)
+++ PKGBUILD	2020-12-19 15:50:01 UTC (rev 779986)
@@ -22,6 +22,8 @@
         "bug_1427455-unused-variables.patch"::"https://hg.mozilla.org/mozilla-central/raw-rev/8e28a66b548b"
         "bug_445128_install-dir.patch"::"https://hg.mozilla.org/mozilla-central/raw-rev/8f74ddd39f61"
         "bug_1533969_glibc230.patch"
+        "glibc-2.32.patch"
+        "libstagefright-format-overflow.patch"
         "no-crmf.diff"
         "fix-rust-lifetime-issue.patch"
         "rust-explitcit-dyn.patch")
@@ -34,6 +36,8 @@
             '806cbe936720676ea8d82c5f2bb880ca632181b07b0cf24a47c064a3485b7c7f'
             '18fbcfda13dd7d30d3c1310da15a133f90bf9ce6b7cfa15de833928e7d9efe95'
             '35bd21633bfe1005ccb643d6863e5da32b1281594f92bdcbd2ed36ef3fc43dfd'
+            '4e986099c9817b70835457a229b5730e3968bb6ae097e43a188831ad01f6a61f'
+            '28949cfeb646e48eb41669b64971ee69fce28ece580be145a1cd9540b3fd2ab5'
             '02000d185e647aa20ca336e595b4004bb29cdae9d8f317f90078bdcc7a36e873'
             '6726dce0ceabbb0893f8776168f20c15777a27e108e8ca46b1e39d5945d2c008'
             '76d54fe6f5a5a50065b1d23f6a6bc4b057d4944bfab5d8ee3bb7faef4e30c334')
@@ -68,6 +72,10 @@
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1533969
   patch -Np1 -i ../bug_1533969_glibc230.patch
 
+  # glibc 2.32 + gcc10 fixes
+  patch -Np1 -i ../glibc-2.32.patch
+  patch -Np1 -i ../libstagefright-format-overflow.patch
+
   # Move files to their correct location
   cp -r "${srcdir}/${pkgbase}-${pkgver}" bluegriffon
   cp "${srcdir}/mozconfig" .mozconfig

Added: glibc-2.32.patch
===================================================================
--- glibc-2.32.patch	                        (rev 0)
+++ glibc-2.32.patch	2020-12-19 15:50:01 UTC (rev 779986)
@@ -0,0 +1,11 @@
+--- gecko-dev-042b84af6020b1f2d8029a0dc36ac5955b7f325f.orig/memory/mozjemalloc/jemalloc.c	2020-12-19 15:42:06.871151870 +0000
++++ gecko-dev-042b84af6020b1f2d8029a0dc36ac5955b7f325f/memory/mozjemalloc/jemalloc.c	2020-12-19 15:40:18.222595396 +0000
+@@ -332,7 +332,7 @@ __FBSDID("$FreeBSD: head/lib/libc/stdlib
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #if !defined(MOZ_MEMORY_SOLARIS) && !defined(MOZ_MEMORY_ANDROID)
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #endif
+ #include <sys/uio.h>
+ #ifndef MOZ_MEMORY

Added: libstagefright-format-overflow.patch
===================================================================
--- libstagefright-format-overflow.patch	                        (rev 0)
+++ libstagefright-format-overflow.patch	2020-12-19 15:50:01 UTC (rev 779986)
@@ -0,0 +1,10 @@
+--- gecko-dev-042b84af6020b1f2d8029a0dc36ac5955b7f325f.orig/media/libstagefright/moz.build	2020-12-19 15:42:48.971874785 +0000
++++ gecko-dev-042b84af6020b1f2d8029a0dc36ac5955b7f325f/media/libstagefright/moz.build	2020-12-19 15:33:40.415241186 +0000
+@@ -162,6 +162,7 @@ elif CONFIG['GNU_CXX']:
+     ]
+     CXXFLAGS += [
+         '-Werror=format',
++        '-Wno-error=format-overflow',
+         '-Wno-multichar',
+         '-Wno-sign-compare',
+         '-Wno-unused',