CVS commit: pkgsrc/mail/thunderbird

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Fri Feb 10 10:04:55 UTC 2023

Modified Files:
        pkgsrc/mail/thunderbird: Makefile distinfo
        pkgsrc/mail/thunderbird/patches: patch-media_libcubeb_src_cubeb__sun.c
Added Files:
        pkgsrc/mail/thunderbird/patches: patch-widget_gtk_DMABufSurface.cpp

Log Message:
mail/thunderbird: Fix build on NetBSD 9


To generate a diff of this commit:
cvs rdiff -u -r1.291 -r1.292 pkgsrc/mail/thunderbird/Makefile
cvs rdiff -u -r1.254 -r1.255 pkgsrc/mail/thunderbird/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/mail/thunderbird/patches/patch-media_libcubeb_src_cubeb__sun.c
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/mail/thunderbird/patches/patch-widget_gtk_DMABufSurface.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/thunderbird/Makefile
diff -u pkgsrc/mail/thunderbird/Makefile:1.291 pkgsrc/mail/thunderbird/Makefile:1.292
--- pkgsrc/mail/thunderbird/Makefile:1.291      Sun Feb  5 09:05:28 2023
+++ pkgsrc/mail/thunderbird/Makefile    Fri Feb 10 10:04:54 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.291 2023/02/05 09:05:28 he Exp $
+# $NetBSD: Makefile,v 1.292 2023/02/10 10:04:54 pho Exp $
 
 DISTNAME=      thunderbird-${TB_VER}.source
 PKGNAME=       thunderbird-${TB_VER}
@@ -87,7 +87,7 @@ pre-configure:
 
 do-build:
 # XXX for some reason it doesn't work unless -j is explicitly specified
-       ${_ULIMIT_CMD} cd ${WRKSRC}/${OBJDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -j${MAKE_JOBS:U1}
+       ${_ULIMIT_CMD} cd ${WRKSRC}/${OBJDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -j${_MAKE_JOBS_N:U1}
 
 MOZILLA=       thunderbird
 MOZILLA_NAME=  ${PKGBASE}

Index: pkgsrc/mail/thunderbird/distinfo
diff -u pkgsrc/mail/thunderbird/distinfo:1.254 pkgsrc/mail/thunderbird/distinfo:1.255
--- pkgsrc/mail/thunderbird/distinfo:1.254      Sun Feb  5 09:05:28 2023
+++ pkgsrc/mail/thunderbird/distinfo    Fri Feb 10 10:04:54 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.254 2023/02/05 09:05:28 he Exp $
+$NetBSD: distinfo,v 1.255 2023/02/10 10:04:54 pho Exp $
 
 BLAKE2s (thunderbird-102.6.1.source.tar.xz) = a5a5e3a188e039669a404983d4ef55790a0882f8250cfc4557a3df3550260a51
 SHA512 (thunderbird-102.6.1.source.tar.xz) = 06ea2fce76c08609d638435869fddc1c4d7f4b748951ebfb2476b4dba9f1f76d3de2c11e5f62540f297a5d30bb0fc637852d8e57f4fadc2c905f299757949d83
@@ -20,7 +20,7 @@ SHA1 (patch-js_src_jsfriendapi.h) = e013
 SHA1 (patch-js_src_util_NativeStack.cpp) = 338fdf6aa34101f6a41d07b303d4a8426c483d5b
 SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = 5a7ad4d38165d49d44862ade846cb79de026867e
 SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 99e881e557430c1ef26060109f4b40c30d3b201c
-SHA1 (patch-media_libcubeb_src_cubeb__sun.c) = 3140751d6268faa03ded07cba8060f6a66687389
+SHA1 (patch-media_libcubeb_src_cubeb__sun.c) = 79f086c838efd57dec03ec6f289b3ac8d439c68c
 SHA1 (patch-media_libcubeb_src_moz.build) = bd3275f1acb6e439dee98b1673eeb65ec7797974
 SHA1 (patch-media_libpng_pngpriv.h) = 5c49119b0e555c9daca64799ff03f3fa8fa05ded
 SHA1 (patch-media_libtheora_lib_info.c) = 96f3d3824459186476102a4598d07cf6f6a704ef
@@ -33,4 +33,5 @@ SHA1 (patch-toolkit_components_terminato
 SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = d718759e59910228cc3729e359f328b47aff5eb4
 SHA1 (patch-toolkit_moz.configure) = b8907d57570bfd87708c5630e44c919710be0b9c
 SHA1 (patch-toolkit_mozapps_installer_packager.mk) = 407fe861dd9b82a88a6f5c0ed1e519a3c0e67251
+SHA1 (patch-widget_gtk_DMABufSurface.cpp) = aea8998364945f0a435ad63860ab50d56d5c0895
 SHA1 (patch-xpcom_base_nscore.h) = 6e6f2d564d8d6121c178c2567cce8ac2ebe8610b

Index: pkgsrc/mail/thunderbird/patches/patch-media_libcubeb_src_cubeb__sun.c
diff -u pkgsrc/mail/thunderbird/patches/patch-media_libcubeb_src_cubeb__sun.c:1.2 pkgsrc/mail/thunderbird/patches/patch-media_libcubeb_src_cubeb__sun.c:1.3
--- pkgsrc/mail/thunderbird/patches/patch-media_libcubeb_src_cubeb__sun.c:1.2   Sun Feb  5 09:05:29 2023
+++ pkgsrc/mail/thunderbird/patches/patch-media_libcubeb_src_cubeb__sun.c       Fri Feb 10 10:04:54 2023
@@ -1,6 +1,6 @@
-$NetBSD: patch-media_libcubeb_src_cubeb__sun.c,v 1.2 2023/02/05 09:05:29 he Exp $
+$NetBSD: patch-media_libcubeb_src_cubeb__sun.c,v 1.3 2023/02/10 10:04:54 pho Exp $
 
---- media/libcubeb/src/cubeb_sun.c.orig        2020-09-02 21:41:01.178547066 +0000
+--- media/libcubeb/src/cubeb_sun.c.orig        2023-02-10 01:03:24.076131575 +0000
 +++ media/libcubeb/src/cubeb_sun.c
 @@ -1,5 +1,5 @@
  /*
@@ -504,13 +504,17 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    return CUBEB_OK;
  }
  
-@@ -743,8 +721,8 @@ static struct cubeb_ops const sun_ops = 
- //  .stream_reset_default_device = NULL,
+@@ -740,11 +718,11 @@ static struct cubeb_ops const sun_ops = 
+   .stream_destroy = sun_stream_destroy,
+   .stream_start = sun_stream_start,
+   .stream_stop = sun_stream_stop,
+-  .stream_reset_default_device = NULL,
    .stream_get_position = sun_stream_get_position,
    .stream_get_latency = sun_stream_get_latency,
 +  .stream_get_input_latency = NULL,
    .stream_set_volume = sun_stream_set_volume,
 -  .stream_set_panning = NULL,
++  .stream_set_name = NULL,
    .stream_get_current_device = sun_get_current_device,
    .stream_device_destroy = sun_stream_device_destroy,
    .stream_register_device_changed_callback = NULL,

Added files:

Index: pkgsrc/mail/thunderbird/patches/patch-widget_gtk_DMABufSurface.cpp
diff -u /dev/null pkgsrc/mail/thunderbird/patches/patch-widget_gtk_DMABufSurface.cpp:1.1
--- /dev/null   Fri Feb 10 10:04:55 2023
+++ pkgsrc/mail/thunderbird/patches/patch-widget_gtk_DMABufSurface.cpp  Fri Feb 10 10:04:54 2023
@@ -0,0 +1,32 @@
+$NetBSD: patch-widget_gtk_DMABufSurface.cpp,v 1.1 2023/02/10 10:04:54 pho Exp $
+
+No eventfd on NetBSD 9 and older, fix build
+
+--- widget/gtk/DMABufSurface.cpp.orig  2021-04-08 21:20:12.000000000 +0000
++++ widget/gtk/DMABufSurface.cpp
+@@ -18,7 +18,9 @@
+ #include <sys/time.h>
+ #include <dlfcn.h>
+ #include <sys/mman.h>
++#ifndef __NetBSD__
+ #include <sys/eventfd.h>
++#endif
+ #include <poll.h>
+ #include <sys/ioctl.h>
+ 
+@@ -97,6 +99,7 @@ void DMABufSurface::GlobalRefAdd() {
+ }
+ 
+ void DMABufSurface::GlobalRefCountCreate() {
++#ifndef __NetBSD__
+   MOZ_ASSERT(!mGlobalRefCountFd);
+   mGlobalRefCountFd = eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK | EFD_SEMAPHORE);
+   if (mGlobalRefCountFd < 0) {
+@@ -106,6 +109,7 @@ void DMABufSurface::GlobalRefCountCreate
+     mGlobalRefCountFd = 0;
+     return;
+   }
++#endif
+ }
+ 
+ void DMABufSurface::GlobalRefCountImport(int aFd) {