pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

librewolf: update to 141.0



Module Name:	pkgsrc-wip
Committed By:	Kevin Bloom <kevin.bloom%posteo.net@localhost>
Pushed By:	nuclearkev
Date:		Wed Jul 30 09:15:41 2025 +0000
Changeset:	e31a77955e53f2b556a264b7ddc5ac53ed0a2f4e

Modified Files:
	librewolf/Makefile
	librewolf/patches/patch-js_src_jit_FlushICache.cpp
	librewolf/patches/patch-third__party_libwebrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc
	librewolf/patches/patch-third__party_libwebrtc_modules_video__capture_linux_device__info__v4l2.cc
	librewolf/patches/patch-third__party_sqlite3_ext_moz.build
	librewolf/patches/patch-toolkit_mozapps_installer_packager.mk

Log Message:
librewolf: update to 141.0

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e31a77955e53f2b556a264b7ddc5ac53ed0a2f4e

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

diffstat:
 librewolf/Makefile                                 |  7 ++-
 librewolf/patches/patch-js_src_jit_FlushICache.cpp | 13 +++++-
 ...s_desktop__capture_linux_wayland_egl__dmabuf.cc |  8 ++--
 ...ules_video__capture_linux_device__info__v4l2.cc | 52 +++++++++++++++++++---
 .../patch-third__party_sqlite3_ext_moz.build       |  4 +-
 .../patch-toolkit_mozapps_installer_packager.mk    |  8 ++--
 6 files changed, 70 insertions(+), 22 deletions(-)

diffs:
diff --git a/librewolf/Makefile b/librewolf/Makefile
index 5a9ab9a043..9470d901d8 100644
--- a/librewolf/Makefile
+++ b/librewolf/Makefile
@@ -1,15 +1,15 @@
 # $NetBSD:$
 
 FIREFOX_VER=		${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH=		140.0
-MOZ_BRANCH_MINOR=	.2
+MOZ_BRANCH=		141.0
+MOZ_BRANCH_MINOR=	
 
 DISTNAME=	librewolf-${FIREFOX_VER}-1.source
 PKGNAME=	${DISTNAME:S/.source//:S/-1$//}
 CATEGORIES=	www
 MASTER_SITES=	https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/${FIREFOX_VER}-1/
 
-NODEJSKIT=		nodejs-output-138.0.1.tgz
+NODEJSKIT=		nodejs-output-140.0.tgz
 DISTFILES=		${DEFAULT_DISTFILES} ${NODEJSKIT}
 SITES.${NODEJSKIT}=	${MASTER_SITE_LOCAL}
 
@@ -112,7 +112,6 @@ MOZILLA_BRANDING=	unofficial
 .endif
 
 pre-configure:
-	${ECHO} "THE PKGNAME: ${PKGNAME}"
 # As of 106.0, .in template files are not patched.
 #	cd ${WRKSRC} && autoconf
 #	cd ${WRKSRC}/js/src && autoconf
diff --git a/librewolf/patches/patch-js_src_jit_FlushICache.cpp b/librewolf/patches/patch-js_src_jit_FlushICache.cpp
index 5983894c50..4d166e09cb 100644
--- a/librewolf/patches/patch-js_src_jit_FlushICache.cpp
+++ b/librewolf/patches/patch-js_src_jit_FlushICache.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-js_src_jit_FlushICache.cpp,v 1.2 2023/08/20 09:31:24 tnn Exp $
+$NetBSD: patch-js_src_jit_FlushICache.cpp,v 1.4 2025/07/26 14:12:54 ryoon Exp $
 
 NetBSD does not have the Linux-specific membarrier(2) syscall.
 
---- js/src/jit/FlushICache.cpp.orig	2023-08-15 20:31:19.000000000 +0000
+--- js/src/jit/FlushICache.cpp.orig	2025-06-13 17:08:49.000000000 +0000
 +++ js/src/jit/FlushICache.cpp
 @@ -31,12 +31,18 @@
  #    elif defined(__android__)
@@ -23,3 +23,12 @@ NetBSD does not have the Linux-specific membarrier(2) syscall.
  }
  
  // These definitions come from the Linux kernel source, for kernels before 4.16
+@@ -112,6 +118,8 @@ bool CanFlushExecutionContextForAllThrea
+   MOZ_ASSERT(state != MemBarrierAvailable::Unset);
+   return state == MemBarrierAvailable::Yes;
+ 
++#  elif defined(__NetBSD__)
++  return false;
+ #  else
+   // On other platforms, we assume that the syscall for flushing the icache
+   // will flush the execution context for other cores.
diff --git a/librewolf/patches/patch-third__party_libwebrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc b/librewolf/patches/patch-third__party_libwebrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc
index c1a71424c0..69f9f80def 100644
--- a/librewolf/patches/patch-third__party_libwebrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc
+++ b/librewolf/patches/patch-third__party_libwebrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc
@@ -1,11 +1,11 @@
-$NetBSD: patch-third__party_libwebrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc,v 1.2 2023/04/18 14:00:11 ryoon Exp $
+$NetBSD: patch-third__party_libwebrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc,v 1.3 2025/07/26 14:12:54 ryoon Exp $
 
---- third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc.orig	2023-03-30 21:16:09.000000000 +0000
+--- third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc.orig	2025-07-17 18:03:34.000000000 +0000
 +++ third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc
-@@ -10,12 +10,16 @@
- 
+@@ -11,12 +11,16 @@
  #include "modules/desktop_capture/linux/wayland/egl_dmabuf.h"
  
+ #include <EGL/eglext.h>
 +#if defined(__linux__)
  #include <asm/ioctl.h>
 +#endif
diff --git a/librewolf/patches/patch-third__party_libwebrtc_modules_video__capture_linux_device__info__v4l2.cc b/librewolf/patches/patch-third__party_libwebrtc_modules_video__capture_linux_device__info__v4l2.cc
index 4ee851b227..a796819dc7 100644
--- a/librewolf/patches/patch-third__party_libwebrtc_modules_video__capture_linux_device__info__v4l2.cc
+++ b/librewolf/patches/patch-third__party_libwebrtc_modules_video__capture_linux_device__info__v4l2.cc
@@ -1,10 +1,50 @@
-$NetBSD: patch-third__party_libwebrtc_modules_video__capture_linux_device__info__v4l2.cc,v 1.3 2023/10/15 07:40:10 ryoon Exp $
+$NetBSD: patch-third__party_libwebrtc_modules_video__capture_linux_device__info__v4l2.cc,v 1.4 2025/07/15 13:58:05 ryoon Exp $
 
 * Fix build under NetBSD 9 and older.
   The older NetBSD's sys/videoio.h does not have v4l2_capability.device_caps.
 
---- third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.cc.orig	2023-09-14 21:15:08.000000000 +0000
+--- third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.cc.orig	2025-05-17 19:55:48.000000000 +0000
 +++ third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.cc
+@@ -52,14 +52,14 @@
+ #define V4L2_PIX_FMT_RGBA32 v4l2_fourcc('A', 'B', '2', '4')
+ #endif
+ 
+-#ifdef WEBRTC_LINUX
++#ifdef WEBRTC_LINUX || WEBRTC_BSD
+ #define EVENT_SIZE  ( sizeof (struct inotify_event) )
+ #define BUF_LEN     ( 1024 * ( EVENT_SIZE + 16 ) )
+ #endif
+ 
+ namespace webrtc {
+ namespace videocapturemodule {
+-#ifdef WEBRTC_LINUX
++#ifdef WEBRTC_LINUX || WEBRTC_BSD
+ void DeviceInfoV4l2::HandleEvent(inotify_event* event, int fd)
+ {
+     if (event->mask & IN_CREATE) {
+@@ -175,11 +175,11 @@ void DeviceInfoV4l2::InotifyProcess()
+ #endif
+ 
+ DeviceInfoV4l2::DeviceInfoV4l2() : DeviceInfoImpl()
+-#ifdef WEBRTC_LINUX
++#ifdef WEBRTC_LINUX || WEBRTC_BSD
+     , _isShutdown(false)
+ #endif
+ {
+-#ifdef WEBRTC_LINUX
++#ifdef WEBRTC_LINUX || WEBRTC_BSD
+   _inotifyEventThread = rtc::PlatformThread::SpawnJoinable(
+       [this] {
+         InotifyProcess();
+@@ -192,7 +192,7 @@ int32_t DeviceInfoV4l2::Init() {
+ }
+ 
+ DeviceInfoV4l2::~DeviceInfoV4l2() {
+-#ifdef WEBRTC_LINUX
++#ifdef WEBRTC_LINUX || WEBRTC_BSD
+     _isShutdown = true;
+ 
+     if (!_inotifyEventThread.empty()) {
 @@ -211,11 +211,13 @@ uint32_t DeviceInfoV4l2::NumberOfDevices
    for (int n = 0; n < 64; n++) {
      snprintf(device, sizeof(device), "/dev/video%d", n);
@@ -19,7 +59,7 @@ $NetBSD: patch-third__party_libwebrtc_modules_video__capture_linux_device__info_
  
        close(fd);
        count++;
-@@ -242,11 +244,13 @@ int32_t DeviceInfoV4l2::GetDeviceName(ui
+@@ -243,11 +245,13 @@ int32_t DeviceInfoV4l2::GetDeviceName(ui
    for (int n = 0; n < 64; n++) {
      snprintf(device, sizeof(device), "/dev/video%d", n);
      if ((fd = open(device, O_RDONLY)) != -1) {
@@ -33,7 +73,7 @@ $NetBSD: patch-third__party_libwebrtc_modules_video__capture_linux_device__info_
        if (count == deviceNumber) {
          // Found the device
          found = true;
-@@ -317,6 +321,7 @@ int32_t DeviceInfoV4l2::CreateCapability
+@@ -318,6 +322,7 @@ int32_t DeviceInfoV4l2::CreateCapability
      if (fd == -1)
        continue;
  
@@ -41,7 +81,7 @@ $NetBSD: patch-third__party_libwebrtc_modules_video__capture_linux_device__info_
      // query device capabilities
      struct v4l2_capability cap;
      if (ioctl(fd, VIDIOC_QUERYCAP, &cap) == 0) {
-@@ -341,6 +346,7 @@ int32_t DeviceInfoV4l2::CreateCapability
+@@ -342,6 +347,7 @@ int32_t DeviceInfoV4l2::CreateCapability
          }
        }
      }
@@ -49,7 +89,7 @@ $NetBSD: patch-third__party_libwebrtc_modules_video__capture_linux_device__info_
      close(fd);  // close since this is not the matching device
    }
  
-@@ -386,11 +392,15 @@ bool DeviceInfoV4l2::IsDeviceNameMatches
+@@ -387,11 +393,15 @@ bool DeviceInfoV4l2::IsDeviceNameMatches
  
  bool DeviceInfoV4l2::IsVideoCaptureDevice(struct v4l2_capability* cap)
  {
diff --git a/librewolf/patches/patch-third__party_sqlite3_ext_moz.build b/librewolf/patches/patch-third__party_sqlite3_ext_moz.build
index 97e79e1a95..c1f2ffbe24 100644
--- a/librewolf/patches/patch-third__party_sqlite3_ext_moz.build
+++ b/librewolf/patches/patch-third__party_sqlite3_ext_moz.build
@@ -1,6 +1,6 @@
-$NetBSD: patch-third__party_sqlite3_ext_moz.build,v 1.1 2024/08/12 14:03:32 ryoon Exp $
+$NetBSD: patch-third__party_sqlite3_ext_moz.build,v 1.2 2025/07/15 13:58:05 ryoon Exp $
 
---- third_party/sqlite3/ext/moz.build.orig	2024-08-06 01:06:04.545236415 +0000
+--- third_party/sqlite3/ext/moz.build.orig	2025-05-20 17:57:17.576392093 +0000
 +++ third_party/sqlite3/ext/moz.build
 @@ -21,7 +21,7 @@ SOURCES += [
      "sqlite-vec/sqlite-vec.c",
diff --git a/librewolf/patches/patch-toolkit_mozapps_installer_packager.mk b/librewolf/patches/patch-toolkit_mozapps_installer_packager.mk
index 06a25f04c8..90f1b0221e 100644
--- a/librewolf/patches/patch-toolkit_mozapps_installer_packager.mk
+++ b/librewolf/patches/patch-toolkit_mozapps_installer_packager.mk
@@ -1,10 +1,10 @@
-$NetBSD: patch-toolkit_mozapps_installer_packager.mk,v 1.3 2020/02/12 16:36:50 ryoon Exp $
+$NetBSD: patch-toolkit_mozapps_installer_packager.mk,v 1.4 2025/07/26 14:12:54 ryoon Exp $
 
 * Symbolic link to lib/firefox/firefox causes 'Couldn't load XPCOM.' error.
 
---- toolkit/mozapps/installer/packager.mk.orig	2020-01-29 07:05:13.000000000 +0000
+--- toolkit/mozapps/installer/packager.mk.orig	2025-07-17 18:03:38.000000000 +0000
 +++ toolkit/mozapps/installer/packager.mk
-@@ -145,7 +145,7 @@ endif
+@@ -169,7 +169,7 @@ endif
  	  (cd $(DESTDIR)$(installdir) && tar -xf -)
  	$(NSINSTALL) -D $(DESTDIR)$(bindir)
  	$(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
@@ -12,4 +12,4 @@ $NetBSD: patch-toolkit_mozapps_installer_packager.mk,v 1.3 2020/02/12 16:36:50 r
 +	#ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
  
  upload:
- 	$(PYTHON3) -u $(MOZILLA_DIR)/build/upload.py --base-path $(DIST) $(UPLOAD_FILES)
+ 	$(PYTHON3) -u $(MOZILLA_DIR)/build/upload.py --base-path $(ABS_DIST) $(UPLOAD_FILES)


Home | Main Index | Thread Index | Old Index