summaryrefslogtreecommitdiff
path: root/source/xap
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2021-12-13 20:10:04 +0000
committerEric Hameleers <alien@slackware.com>2021-12-14 08:59:53 +0100
commitb88e2bb09498e9b75508b99af4e497cdf3dd4416 (patch)
treede2b5ca79f57d6a505661bb3471c9ed998b78da9 /source/xap
parentd17e0f6ea08590e21d572a2f9fab8d3785ce348a (diff)
downloadcurrent-b88e2bb09498e9b75508b99af4e497cdf3dd4416.tar.gz
Mon Dec 13 20:10:04 UTC 202120211213201004
ap/slackpkg-15.0.9-noarch-1.txz: Upgraded. files/mirrors-x86*: Remove bad mirrors from list (Emmet Ford) Automatically rebuild package lists if missing (Piter PUNK) xap/seamonkey-2.53.10.1-x86_64-1.txz: Upgraded. This update contains security fixes and improvements. For more information, see: https://www.seamonkey-project.org/releases/seamonkey2.53.10.1 (* Security fix *) xap/xsnow-3.4.0-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/xap')
-rw-r--r--source/xap/FTBFSlog5
-rw-r--r--source/xap/mozilla-firefox/d30c921928a12fccd5085888011f899ff1c788cd.patch30
-rwxr-xr-xsource/xap/mozilla-firefox/mozilla-firefox.SlackBuild3
-rw-r--r--source/xap/mozilla-thunderbird/d30c921928a12fccd5085888011f899ff1c788cd.patch30
-rwxr-xr-xsource/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild3
5 files changed, 71 insertions, 0 deletions
diff --git a/source/xap/FTBFSlog b/source/xap/FTBFSlog
index 5fad56ed..85224879 100644
--- a/source/xap/FTBFSlog
+++ b/source/xap/FTBFSlog
@@ -1,3 +1,8 @@
+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 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.
diff --git a/source/xap/mozilla-firefox/d30c921928a12fccd5085888011f899ff1c788cd.patch b/source/xap/mozilla-firefox/d30c921928a12fccd5085888011f899ff1c788cd.patch
new file mode 100644
index 00000000..79d365d8
--- /dev/null
+++ b/source/xap/mozilla-firefox/d30c921928a12fccd5085888011f899ff1c788cd.patch
@@ -0,0 +1,30 @@
+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 6d0682fb..09dc38de 100755
--- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
+++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
@@ -208,6 +208,9 @@ 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
diff --git a/source/xap/mozilla-thunderbird/d30c921928a12fccd5085888011f899ff1c788cd.patch b/source/xap/mozilla-thunderbird/d30c921928a12fccd5085888011f899ff1c788cd.patch
new file mode 100644
index 00000000..79d365d8
--- /dev/null
+++ b/source/xap/mozilla-thunderbird/d30c921928a12fccd5085888011f899ff1c788cd.patch
@@ -0,0 +1,30 @@
+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 7762dd91..3ce9be2b 100755
--- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
+++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
@@ -172,6 +172,9 @@ 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"