diff options
Diffstat (limited to 'source/xap/mozilla-firefox')
| -rw-r--r-- | source/xap/mozilla-firefox/d30c921928a12fccd5085888011f899ff1c788cd.patch | 30 | ||||
| -rwxr-xr-x | source/xap/mozilla-firefox/mozilla-firefox.SlackBuild | 6 |
2 files changed, 2 insertions, 34 deletions
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 \ |