Commit Debian 3.0 (quilt) metadata

[dgit (11.5) quilt-fixup]

diff --git a/debian/patches/disable-conflicting-include.patch b/debian/patches/disable-conflicting-include.patch
new file mode 100644 (file)
index 0000000..369d544
--- /dev/null
+++ b/debian/patches/disable-conflicting-include.patch
@@ -0,0 +1,25 @@
+From: Peter Michael Green <plugwash@raspbian.org>
+Date: Thu, 14 Dec 2023 13:28:26 +0000
+X-Dgit-Generated: 115.3.0esr-1+rpi1 3fa90e359bf40c35d48faccfefd9a136fc0223ff
+Subject: disable conflicting include.
+
+
+---
+
+diff --git a/js/src/jit/shared/AtomicOperations-shared-jit.cpp b/js/src/jit/shared/AtomicOperations-shared-jit.cpp
+index df7c049dfac..d580387efdc 100644
+--- a/js/src/jit/shared/AtomicOperations-shared-jit.cpp
++++ b/js/src/jit/shared/AtomicOperations-shared-jit.cpp
+@@ -6,9 +6,9 @@
+ 
+ #include "jit/AtomicOperations.h"
+ 
+-#if defined(__arm__)
+-#  include "jit/arm/Architecture-arm.h"
+-#endif
++//#if defined(__arm__)
++//#  include "jit/arm/Architecture-arm.h"
++//#endif
+ 
+ #ifdef JS_HAVE_GENERATED_ATOMIC_OPS
+ 

diff --git a/debian/patches/series b/debian/patches/series
index ef706916a84c290d2e6cdeea28c6b4785c9d27e3..ac1f4bc30064e87192ecc58d89436f69dae50fd6 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,4 @@ disable-neon-in-qcms.patch
 use-a-define-instead-of-a-typedef-for-do.patch
 disable-more-armv7neon-stuff.patch
 disable-jit.patch
+disable-conflicting-include.patch