summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--newmoon/debian/changelog1
-rw-r--r--newmoon/debian/control3
-rw-r--r--newmoon/debian/mozconfig2
-rw-r--r--newmoon/debian/newmoon+devuan.dsc2
-rwxr-xr-xnewmoon/debian/rules16
5 files changed, 14 insertions, 10 deletions
diff --git a/newmoon/debian/changelog b/newmoon/debian/changelog
index 17da59e..725d65a 100644
--- a/newmoon/debian/changelog
+++ b/newmoon/debian/changelog
@@ -11,6 +11,7 @@ newmoon (29.4.2-1+devuan) obs; urgency=medium
* Fixed a script sandbox escape issue through XSLT. (CVE-2021-38503)
* Unified XUL Platform Mozilla Security Patch Summary: 3 fixed, 1
already applied, 4 DiD, 7 not applicable.
+ - Force using gcc-10
-- B. Stack <bgstack15@gmail.com> Tue, 11 Nov 2021 09:09:16 -0500
diff --git a/newmoon/debian/control b/newmoon/debian/control
index 0af5406..7d167fd 100644
--- a/newmoon/debian/control
+++ b/newmoon/debian/control
@@ -5,6 +5,8 @@ Maintainer: B Stack <bgstack15@gmail.com>
Bugs: mailto: <bgstack15@gmail.com>
Build-Depends: debhelper (>= 12),
autoconf2.13,
+ gcc (<< 11) | gcc-10,
+ g++ (<< 11) | g++-10,
libasound2-dev,
libdbus-glib-1-dev (>= 0.60),
libgconf2-dev (>= 1.2.1),
@@ -12,6 +14,7 @@ Build-Depends: debhelper (>= 12),
libssl-dev,
libx11-xcb-dev,
libxt-dev,
+ lsb-release,
mesa-common-dev,
pkg-config,
python2 (>= 2.7.18-2~) | python (>= 2.7),
diff --git a/newmoon/debian/mozconfig b/newmoon/debian/mozconfig
index 1b2bfed..47cd6ec 100644
--- a/newmoon/debian/mozconfig
+++ b/newmoon/debian/mozconfig
@@ -69,7 +69,7 @@ ac_add_options --disable-personas
ac_add_options --x-libraries=/usr/lib
# limit to 4 cpus to limit memory usage (approximately 0.75 GiB RAM/thread)
-# Debian Sid/Devuan Ceres is mildly broken as of 2020-07 and will fail to compile on anything higher than -j1
+# Debian Sid/Devuan Ceres; 2020-07 only -j1 works due to a bug.
mk_add_options MOZ_MAKE_FLAGS="-j1"
export MOZ_PKG_SPECIAL=gtk2
diff --git a/newmoon/debian/newmoon+devuan.dsc b/newmoon/debian/newmoon+devuan.dsc
index 31285c9..632df61 100644
--- a/newmoon/debian/newmoon+devuan.dsc
+++ b/newmoon/debian/newmoon+devuan.dsc
@@ -6,7 +6,7 @@ Version: 29.4.2-1+devuan
Maintainer: B. Stack <bgstack15@gmail.com>
Homepage: http://www.palemoon.org/
Standards-Version: 4.1.4
-Build-Depends: debhelper (>= 12), autoconf2.13, libasound2-dev, libdbus-glib-1-dev (>= 0.60), libgconf2-dev (>= 1.2.1), libgtk2.0-dev (>= 2.14), libssl-dev, libx11-xcb-dev, libxt-dev, mesa-common-dev, pkg-config, python2 (>= 2.7.18-2~) | python (>= 2.7), unzip, yasm (>= 1.1), zip
+Build-Depends: debhelper (>= 12), gcc (<< 11) | gcc-10, g++ (<< 11) | g++-10, autoconf2.13, libasound2-dev, libdbus-glib-1-dev (>= 0.60), libgconf2-dev (>= 1.2.1), libgtk2.0-dev (>= 2.14), libssl-dev, libx11-xcb-dev, libxt-dev, mesa-common-dev, pkg-config, python2 (>= 2.7.18-2~) | python (>= 2.7), unzip, yasm (>= 1.1), zip
Package-List:
newmoon deb web optional arch=any
Files:
diff --git a/newmoon/debian/rules b/newmoon/debian/rules
index f47e5cc..d93a6a0 100755
--- a/newmoon/debian/rules
+++ b/newmoon/debian/rules
@@ -3,15 +3,15 @@
export SHELL=/bin/bash
## borrowed from stevepusser's logic
-## Build with gcc-8 on Buster (beowulf/ceres)
+## Build with gcc-10 on releases where default gcc is 11
## If you enable this, then d/control needs lsb-release as a build dependency.
-#distrelease := $(shell lsb_release -cs)
-#ifeq ($(distrelease),$(filter $(distrelease),buster beowulf/ceres))
-#export CC=gcc-8
-#export CXX=g++-8
-#export CPP=cpp-8
-#export LD=gcc-8
-#endif
+distrelease := $(shell lsb_release -cs)
+ifeq ($(distrelease),$(filter $(distrelease),sid beowulf/ceres))
+export CC=gcc-10
+export CXX=g++-10
+export CPP=cpp-10
+export LD=gcc-10
+endif
export MCFILE=debian/mozconfig
bgstack15