[pkgsrc/trunk]: pkgsrc/mail/thunderbird68 thunderbird68: fix build with cbind...

[gutteridge <gutteridge%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e60aaff0d464
branches:  trunk
changeset: 387680:e60aaff0d464
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Thu Nov 03 22:18:41 2022 +0000

description:
thunderbird68: fix build with cbindgen > 0.23

Tested on NetBSD 9.3/amd64.

While here, also update the DESCR to note this is a now unsupported
release.

diffstat:

 mail/thunderbird68/DESCR                                                  |   3 +
 mail/thunderbird68/Makefile                                               |   4 +-
 mail/thunderbird68/distinfo                                               |   3 +-
 mail/thunderbird68/mozilla-common.mk                                      |   4 +-
 mail/thunderbird68/patches/patch-gfx_webrender__bindings_webrender__ffi.h |  16 ++++++++++
 5 files changed, 25 insertions(+), 5 deletions(-)

diffs (78 lines):

diff -r e109f9b488a3 -r e60aaff0d464 mail/thunderbird68/DESCR
--- a/mail/thunderbird68/DESCR  Thu Nov 03 20:52:29 2022 +0000
+++ b/mail/thunderbird68/DESCR  Thu Nov 03 22:18:41 2022 +0000
@@ -1,2 +1,5 @@
 Thunderbird is a free email, news, and chat application with support for
 add-ons, derived from the Mozilla Firefox web browser.
+
+This package provides Thunderbird 68. It is now unsupported and is
+provided only for situations where upgrading is problematic.
diff -r e109f9b488a3 -r e60aaff0d464 mail/thunderbird68/Makefile
--- a/mail/thunderbird68/Makefile       Thu Nov 03 20:52:29 2022 +0000
+++ b/mail/thunderbird68/Makefile       Thu Nov 03 22:18:41 2022 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2022/09/27 20:58:25 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2022/11/03 22:18:41 gutteridge Exp $
 
 DISTNAME=      thunderbird-${TB_VER}.source
 PKGNAME=       thunderbird68-${TB_VER}
-PKGREVISION=   9
+PKGREVISION=   10
 TB_VER=                68.12.0
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/}
diff -r e109f9b488a3 -r e60aaff0d464 mail/thunderbird68/distinfo
--- a/mail/thunderbird68/distinfo       Thu Nov 03 20:52:29 2022 +0000
+++ b/mail/thunderbird68/distinfo       Thu Nov 03 22:18:41 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 10:54:32 nia Exp $
+$NetBSD: distinfo,v 1.4 2022/11/03 22:18:41 gutteridge Exp $
 
 BLAKE2s (thunderbird-68.12.0.source.tar.xz) = 42ad5dbe23984378254c6117a4783f7d33fd1793a86d176cddb47ea9baa9d725
 SHA512 (thunderbird-68.12.0.source.tar.xz) = e7559536a9e024747e3ac7c20e4ffde5adf57657d02109ea32c39bf736ad03707fc7a14a0d3f1c91fa6fd69ead3c38d6c32ce78bd468834d9ba7f77f728332c6
@@ -17,6 +17,7 @@
 SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 936ae039b758c5eaf48dd4661c896d186b340207
 SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = c30cb2ed98d4486fcc23b3a9b464df088a30134a
 SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = fcbe2f980557ff4eff8fcb6b4039a5c0eb956fa6
+SHA1 (patch-gfx_webrender__bindings_webrender__ffi.h) = cb42b30669b3b4d29a814e12f9fd3ae9180413d2
 SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 0475843fa07f38a3f6255cfb998e64863fd8b9c1
 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = aa71eee667e920b1c2364b90956a7332906c5d74
 SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc) = 2c03850559c733c37a749fdb86a3e4517878d56c
diff -r e109f9b488a3 -r e60aaff0d464 mail/thunderbird68/mozilla-common.mk
--- a/mail/thunderbird68/mozilla-common.mk      Thu Nov 03 20:52:29 2022 +0000
+++ b/mail/thunderbird68/mozilla-common.mk      Thu Nov 03 22:18:41 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.1 2022/08/05 08:44:30 nia Exp $
+# $NetBSD: mozilla-common.mk,v 1.2 2022/11/03 22:18:41 gutteridge Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -25,7 +25,7 @@
 USE_LANGUAGES+=                c99 gnu++14
 UNLIMIT_RESOURCES+=    datasize virtualsize
 
-TOOL_DEPENDS+=         cbindgen>=0.8.7:../../devel/cbindgen
+TOOL_DEPENDS+=         cbindgen>=0.24.0:../../devel/cbindgen
 .if ${MACHINE_ARCH} == "sparc64"
 CONFIGURE_ARGS+=       --disable-nodejs
 .else
diff -r e109f9b488a3 -r e60aaff0d464 mail/thunderbird68/patches/patch-gfx_webrender__bindings_webrender__ffi.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/thunderbird68/patches/patch-gfx_webrender__bindings_webrender__ffi.h Thu Nov 03 22:18:41 2022 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-gfx_webrender__bindings_webrender__ffi.h,v 1.1 2022/11/03 22:18:41 gutteridge Exp $
+
+Fix build with cbindgen > 0.23:
+https://bugzilla.mozilla.org/show_bug.cgi?id=1773259
+
+--- gfx/webrender_bindings/webrender_ffi.h.orig        2020-08-24 19:17:01.000000000 +0000
++++ gfx/webrender_bindings/webrender_ffi.h
+@@ -71,8 +71,6 @@ struct WrWindowId;
+ struct DocumentId;
+ struct WrPipelineInfo;
+ 
+-const uint64_t ROOT_CLIP_CHAIN = ~0;
+-
+ }  // namespace wr
+ }  // namespace mozilla
+