summaryrefslogtreecommitdiffstats
path: root/source/xap
diff options
context:
space:
mode:
Diffstat (limited to 'source/xap')
-rw-r--r--source/xap/FTBFSlog59
-rw-r--r--source/xap/mozilla-firefox/d30c921928a12fccd5085888011f899ff1c788cd.patch30
-rwxr-xr-xsource/xap/mozilla-firefox/mozilla-firefox.SlackBuild6
-rw-r--r--source/xap/mozilla-thunderbird/d30c921928a12fccd5085888011f899ff1c788cd.patch30
-rwxr-xr-xsource/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild3
5 files changed, 4 insertions, 124 deletions
diff --git a/source/xap/FTBFSlog b/source/xap/FTBFSlog
index 852248790..859555ed5 100644
--- a/source/xap/FTBFSlog
+++ b/source/xap/FTBFSlog
@@ -1,58 +1,3 @@
-Mon Dec 13 19:52:16 UTC 2021
- mozilla-firefox: Patched to build with wayland-1.20.0.
- mozilla-thunderbird: Patched to build with wayland-1.20.0.
- Thanks to ponce and nobodino.
+Mon Feb 7 20:57:55 UTC 2022
+ All packages tested and found to compile properly.
+--------------------------+
-Mon Oct 11 18:46:52 UTC 2021
- mozilla-firefox: Bump node version in build-deps for Python 3.10.
- mozilla-thunderbird: Bump node version in build-deps for Python 3.10.
-+--------------------------+
-Tue Apr 6 18:10:12 UTC 2021
- pan: Fix build with glib-2.68.0. Thanks to nobodino and ponce.
-+--------------------------+
-Tue Jan 19 01:20:27 UTC 2021
- seamonkey: patch to fix build with Rust 1.48.0.
- Thanks to USUARIONUEVO and nobodino.
-+--------------------------+
-Sat Jan 16 18:45:27 UTC 2021
- gnuchess: add -fcommon to CFLAGS. Thanks to nobodino.
- seyon: add -fcommon to CFLAGS. Thanks to nobodino.
-+--------------------------+
-Fri Jul 24 18:28:43 UTC 2020
- mozilla-firefox: Patch for rust-1.45.0 related build failure.
- mozilla-thunderbird: Patch for rust-1.45.0 related build failure.
- seamonkey: Patch for rust-1.45.0 related build failure.
-+--------------------------+
-Tue Nov 19 06:05:34 UTC 2019
- mozilla-firefox: Patch for rust-1.39.0 and node.js related build failure.
- mozilla-thunderbird: Patch for rust-1.39.0 and node.js related build failure.
-+--------------------------+
-Tue Sep 10 16:55:23 UTC 2019
- gftp: patch to fix breakage from removal of stropts.h in glibc-2.30.
- mozilla-firefox: Compile with gcc/g++ for glibc-2.30.
- mozilla-thunderbird: Fix for glibc-2.30's included gettid().
- seamonkey: Fix for glibc-2.30's included gettid().
-+--------------------------+
-Mon May 20 20:36:17 UTC 2019
- seamonkey: compile with:
- -Wformat -Wno-format-overflow -fno-delete-null-pointer-checks
-+--------------------------+
-Mon May 20 04:23:36 UTC 2019
- ddd: Add -fpermissive to CXXFLAGS. Thanks to Matteo Bernardini.
-+--------------------------+
-Tue Mar 26 23:03:23 UTC 2019
- mozilla-firefox: added unbreakdocs patch to fix build with latest Rust.
- Thanks to Stuart Winter.
- mozilla-thunderbird: added unbreakdocs patch to fix build with latest Rust.
- Thanks to Stuart Winter.
-+--------------------------+
-Sat Mar 10 21:02:18 UTC 2018
- mozilla-firefox: reduce Rust debug level to avoid memory issues during build.
-+--------------------------+
-Mon Feb 12 21:31:24 UTC 2018
- All XAP packages tested and found to build properly.
-+--------------------------+
-Sat Feb 3 04:34:13 UTC 2018
- Fix all packages that fail to build from source:
- gv: merge patches from Fedora
- seyon: change getline() function to seyon_getline()
diff --git a/source/xap/mozilla-firefox/d30c921928a12fccd5085888011f899ff1c788cd.patch b/source/xap/mozilla-firefox/d30c921928a12fccd5085888011f899ff1c788cd.patch
deleted file mode 100644
index 79d365d8e..000000000
--- a/source/xap/mozilla-firefox/d30c921928a12fccd5085888011f899ff1c788cd.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d30c921928a12fccd5085888011f899ff1c788cd Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Sun, 12 Dec 2021 02:16:02 +0100
-Subject: [PATCH 32/32] bmo#1745560: Fix building against >=wayland-1.20
-
-Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
----
- widget/gtk/mozwayland/mozwayland.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/widget/gtk/mozwayland/mozwayland.c b/widget/gtk/mozwayland/mozwayland.c
-index 7a448e6321..b997c59d78 100644
---- a/widget/gtk/mozwayland/mozwayland.c
-+++ b/widget/gtk/mozwayland/mozwayland.c
-@@ -40,6 +40,13 @@ MOZ_EXPORT void wl_event_queue_destroy(struct wl_event_queue* queue) {}
-
- MOZ_EXPORT void wl_proxy_marshal(struct wl_proxy* p, uint32_t opcode, ...) {}
-
-+MOZ_EXPORT struct wl_proxy* wl_proxy_marshal_flags(
-+ struct wl_proxy* proxy, uint32_t opcode,
-+ const struct wl_interface* interface, uint32_t version, uint32_t flags,
-+ ...) {
-+ return NULL;
-+}
-+
- MOZ_EXPORT void wl_proxy_marshal_array(struct wl_proxy* p, uint32_t opcode,
- union wl_argument* args) {}
-
---
-2.34.1
diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
index 09dc38dec..d827fec6c 100755
--- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
+++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2018, 2019, 2020, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2018, 2019, 2020, 2021, 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -208,9 +208,6 @@ zcat $CWD/ff.ui.scrollToClick.diff.gz | patch -p1 --verbose || exit 1
# Don't enable LTO for Rust unless the whole build uses it:
zcat $CWD/0027-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch.gz | patch -p1 --verbose || exit 1
-# Fix build with wayland >= 1.20.0:
-zcat $CWD/d30c921928a12fccd5085888011f899ff1c788cd.patch | patch -p1 --verbose || exit 1
-
# Fetch localization, if requested
# https://bugzilla.mozilla.org/show_bug.cgi?id=1256955
if [ ! -z $MOZLOCALIZE ]; then
@@ -240,6 +237,7 @@ OPTIONS="\
--with-system-nss \
--with-system-nspr \
--with-unsigned-addon-scopes=app,system \
+ --without-wasm-sandboxed-libraries \
--allow-addon-sideload \
--enable-alsa \
--enable-application=browser \
diff --git a/source/xap/mozilla-thunderbird/d30c921928a12fccd5085888011f899ff1c788cd.patch b/source/xap/mozilla-thunderbird/d30c921928a12fccd5085888011f899ff1c788cd.patch
deleted file mode 100644
index 79d365d8e..000000000
--- a/source/xap/mozilla-thunderbird/d30c921928a12fccd5085888011f899ff1c788cd.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d30c921928a12fccd5085888011f899ff1c788cd Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Sun, 12 Dec 2021 02:16:02 +0100
-Subject: [PATCH 32/32] bmo#1745560: Fix building against >=wayland-1.20
-
-Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
----
- widget/gtk/mozwayland/mozwayland.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/widget/gtk/mozwayland/mozwayland.c b/widget/gtk/mozwayland/mozwayland.c
-index 7a448e6321..b997c59d78 100644
---- a/widget/gtk/mozwayland/mozwayland.c
-+++ b/widget/gtk/mozwayland/mozwayland.c
-@@ -40,6 +40,13 @@ MOZ_EXPORT void wl_event_queue_destroy(struct wl_event_queue* queue) {}
-
- MOZ_EXPORT void wl_proxy_marshal(struct wl_proxy* p, uint32_t opcode, ...) {}
-
-+MOZ_EXPORT struct wl_proxy* wl_proxy_marshal_flags(
-+ struct wl_proxy* proxy, uint32_t opcode,
-+ const struct wl_interface* interface, uint32_t version, uint32_t flags,
-+ ...) {
-+ return NULL;
-+}
-+
- MOZ_EXPORT void wl_proxy_marshal_array(struct wl_proxy* p, uint32_t opcode,
- union wl_argument* args) {}
-
---
-2.34.1
diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
index 3ce9be2b3..7762dd91d 100755
--- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
+++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
@@ -172,9 +172,6 @@ zcat $CWD/tb.ui.scrollToClick.diff.gz | patch -p1 --verbose || exit 1
# Bypass a test that fails the build:
zcat $CWD/gkrust.a.no.networking.check.diff.gz | patch -p1 --verbose || exit 1
-# Fix build with wayland >= 1.20.0:
-zcat $CWD/d30c921928a12fccd5085888011f899ff1c788cd.patch | patch -p1 --verbose || exit 1
-
# Fetch localization, if requested:
if [ ! -z $MOZLOCALIZE ]; then
LOC_TAG="THUNDERBIRD_$( echo $VERSION | tr \. _ )_RELEASE"