chromium: fix packaging, remove unused dependencies, disable futex on NetBSD

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: chromium: fix packaging, remove unused dependencies, disable futex on NetBSD
From: kikadf (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Sun, 16 Mar 2025 17:33:19 +0000
Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Sun Mar 16 16:39:44 2025 +0100
Changeset:	59fa38405e1d9e09601d9afce7b75781ffde421d

Modified Files:
	chromium/Makefile
	chromium/distinfo
	chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h
	chromium/patches/patch-third__party_abseil-cpp_absl_base_config.h
	chromium/patches/patch-third__party_libc++abi_src_src_cxa__guard__impl.h

Log Message:
chromium: fix packaging, remove unused dependencies, disable futex on NetBSD

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

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

diffstat:
 chromium/Makefile                                           |  8 ++------
 chromium/distinfo                                           |  6 +++---
 ...llocator_src_partition__alloc_partition__alloc__config.h | 13 ++++++++++++-
 .../patch-third__party_abseil-cpp_absl_base_config.h        |  6 +++---
 .../patch-third__party_libc++abi_src_src_cxa__guard__impl.h | 12 +++++++-----
 5 files changed, 27 insertions(+), 18 deletions(-)

diffs:
diff --git a/chromium/Makefile b/chromium/Makefile
index 9e70fea9c2..2f92a5e850 100644
--- a/chromium/Makefile
+++ b/chromium/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=			chromium-${VERSION}
 VERSION=			131.0.6778.204
-PKGREVISION=			4
+PKGREVISION=			5
 CATEGORIES=			www
 MASTER_SITES=			https://commondatastorage.googleapis.com/chromium-browser-official/
 EXTRACT_SUFX_C=			.tar.xz
@@ -278,7 +278,6 @@ INSTALLATION_DIRS+=	${ICONS_DIR${i}}
 CHROMIUM_LIBS+=		libEGL.so
 CHROMIUM_LIBS+=		libGLESv2.so
 CHROMIUM_LIBS+=		libVkICD_mock_icd.so
-CHROMIUM_LIBS+=		libvulkan.so.1
 .if ${MACHINE_ARCH} != "aarch64"
 CHROMIUM_LIBS+=		libvk_swiftshader.so
 CHROMIUM_LIBS+=		vk_swiftshader_icd.json
@@ -292,6 +291,7 @@ do-install:
 .for i in ${CHROMIUM_LIBS}
 	${INSTALL_LIB} ${BUILDDIR}/${i} ${DESTDIR}${PREFIX}/lib/${CHROMIUM}
 .endfor
+	${INSTALL_LIB} ${BUILDDIR}/libvulkan.so.1 ${DESTDIR}${PREFIX}/lib/${CHROMIUM}/libvulkan.so
 	${INSTALL_DATA} ${WRKSRC}/chrome/app/resources/manpage.1.in \
 		 ${DESTDIR}/${PREFIX}/${PKGMANDIR}/man1/${CHROMIUM}.1
 	${INSTALL_DATA} ${BUILDDIR}/*.pak ${DESTDIR}${PREFIX}/lib/${CHROMIUM}
@@ -308,7 +308,6 @@ do-install:
 .endfor
 
 .include "../../archivers/bzip2/buildlink3.mk"
-.include "../../audio/flac/buildlink3.mk"
 .include "../../audio/libopus/buildlink3.mk"
 .include "../../audio/speech-dispatcher/buildlink3.mk"
 .include "../../audio/speex/buildlink3.mk"
@@ -318,9 +317,6 @@ do-install:
 .include "../../devel/libusb1/buildlink3.mk"
 .include "../../devel/nspr/buildlink3.mk"
 .include "../../devel/nss/buildlink3.mk"
-.include "../../devel/re2/buildlink3.mk"
-.include "../../devel/snappy/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../fonts/harfbuzz/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
diff --git a/chromium/distinfo b/chromium/distinfo
index 6f1a0d6a63..25aef74dbc 100644
--- a/chromium/distinfo
+++ b/chromium/distinfo
@@ -31,7 +31,7 @@ SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__
 SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h) = 75db3c38e4cb3d3af005407f1e50192b56fe1dd3
 SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h) = 4924be9a1fa15a1394781e3b87b5fd1ebc69984a
 SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc) = 9355b29fff060250457c28190cb1075f144baa3b
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h) = 86610960aff49e520a1998786d59b7932583a63e
+SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h) = c61edb60b17237a2285409fc5b89f22897c89eea
 SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h) = 5cff54cc485f1a3db991cc60a91bc1725c811a34
 SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h) = 22e5ba1e10da1196b20e1efb43cc0119413fa73a
 SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc) = 451d430041d33839a6d62151882e2da9e5cda9ad
@@ -1042,7 +1042,7 @@ SHA1 (patch-skia_ext_SkMemory__new__handler.cpp) = 183821354342ec2ae46d28177ae83
 SHA1 (patch-skia_ext_font__utils.cc) = 14570114e2be47050c46f04af12b4b28747f5c68
 SHA1 (patch-skia_ext_platform__canvas.h) = a9dc7aadaad0b35833d8b702947e8d1cff03c247
 SHA1 (patch-skia_ext_skcolorspace__trfn.cc) = 9fec70aeca78197f2bf7f373edd70a8f16f31f5d
-SHA1 (patch-third__party_abseil-cpp_absl_base_config.h) = 2a280e5bc8e5595e43d8439c32a13c038a37dc45
+SHA1 (patch-third__party_abseil-cpp_absl_base_config.h) = 5b55ea618bc6f7c612946ca9f073bd884ac0ed51
 SHA1 (patch-third__party_abseil-cpp_absl_base_internal_raw__logging.cc) = e8e6eff5ec3103f1bf2e8b5edaa3403f438645d8
 SHA1 (patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc) = d8200a7a81c22100b1d4a1471d8e53252749eb0d
 SHA1 (patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h) = f4c0be81186a77cef174611c71560c03a1e31f5d
@@ -1143,7 +1143,7 @@ SHA1 (patch-third__party_leveldatabase_env__chromium.cc) = ed91c43f9e27bdbb28235
 SHA1 (patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c) = 61f250abc166ca580fbdad4323f241212dfa4707
 SHA1 (patch-third__party_libc++_src_src_chrono.cpp) = 8373e7b1f4ebfbdfa046168334285bdf0ce2d56c
 SHA1 (patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp) = 78b365bad27430a8c2e18428d7069c5c1793d865
-SHA1 (patch-third__party_libc++abi_src_src_cxa__guard__impl.h) = b271f085c73f36c8802e14b35167560d010c152e
+SHA1 (patch-third__party_libc++abi_src_src_cxa__guard__impl.h) = 321b342e5a0af48b8b79dd881027dccb2d384382
 SHA1 (patch-third__party_libdrm_src_xf86drmMode.c) = 321a5843a11c1e7a4fd6dae929d0068c24cdf9ab
 SHA1 (patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h) = 72327457637882a39ecba6fdb526bcf42802273f
 SHA1 (patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h) = c0d12bf7bf01cb458c383da3f25beb14e737386d
diff --git a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h
index b36f27a412..91e81449d9 100644
--- a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h
+++ b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h
@@ -4,8 +4,19 @@ $NetBSD: patch-base_allocator_partition__allocator_src_partition__alloc_partitio
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig	2024-12-17 18:58:49.000000000 +0100
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h
+@@ -51,8 +51,8 @@ static_assert(sizeof(void*) != 8, "");
+ // POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific
+ // features such as futex(2).
+ #define PA_CONFIG_HAS_LINUX_KERNEL()                      \
+-  (PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || \
+-   PA_BUILDFLAG(IS_ANDROID))
++  ((PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || \
++   PA_BUILDFLAG(IS_ANDROID)) && !PA_BUILDFLAG(IS_NETBSD))
+ 
+ // If defined, enables zeroing memory on Free() with roughly 1% probability.
+ // This applies only to normal buckets, as direct-map allocations are always
 @@ -170,7 +170,7 @@ constexpr bool kUseLazyCommit = false;
  // This may be required on more platforms in the future.
  #define PA_CONFIG_HAS_ATFORK_HANDLER()                 \
diff --git a/chromium/patches/patch-third__party_abseil-cpp_absl_base_config.h b/chromium/patches/patch-third__party_abseil-cpp_absl_base_config.h
index 68a673d245..c1e4aa779d 100644
--- a/chromium/patches/patch-third__party_abseil-cpp_absl_base_config.h
+++ b/chromium/patches/patch-third__party_abseil-cpp_absl_base_config.h
@@ -4,14 +4,14 @@ $NetBSD: patch-third__party_abseil-cpp_absl_base_config.h,v 1.1 2025/02/06 09:58
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/abseil-cpp/absl/base/config.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/abseil-cpp/absl/base/config.h.orig	2024-12-17 18:58:49.000000000 +0100
 +++ third_party/abseil-cpp/absl/base/config.h
 @@ -412,7 +412,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMES
  #ifdef ABSL_HAVE_SCHED_YIELD
  #error ABSL_HAVE_SCHED_YIELD cannot be directly set
  #elif defined(__linux__) || defined(__ros__) || defined(__native_client__) || \
 -    defined(__VXWORKS__)
-+    defined(__VXWORKS__) || defined(__OpenBSD__) || defined(__FreeBSD__)
++    defined(__VXWORKS__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
  #define ABSL_HAVE_SCHED_YIELD 1
  #endif
  
@@ -21,7 +21,7 @@ $NetBSD: patch-third__party_abseil-cpp_absl_base_config.h,v 1.1 2025/02/06 09:58
  #error ABSL_HAVE_SEMAPHORE_H cannot be directly set
 -#elif defined(__linux__) || defined(__ros__) || defined(__VXWORKS__)
 +#elif defined(__linux__) || defined(__ros__) || defined(__VXWORKS__) || \
-+    defined(__OpenBSD__) || defined(__FreeBSD__)
++    defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
  #define ABSL_HAVE_SEMAPHORE_H 1
  #endif
  
diff --git a/chromium/patches/patch-third__party_libc++abi_src_src_cxa__guard__impl.h b/chromium/patches/patch-third__party_libc++abi_src_src_cxa__guard__impl.h
index 1d258cf792..3b29b646f1 100644
--- a/chromium/patches/patch-third__party_libc++abi_src_src_cxa__guard__impl.h
+++ b/chromium/patches/patch-third__party_libc++abi_src_src_cxa__guard__impl.h
@@ -4,13 +4,14 @@ $NetBSD: patch-third__party_libc++abi_src_src_cxa__guard__impl.h,v 1.1 2025/02/0
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/libc++abi/src/src/cxa_guard_impl.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/libc++abi/src/src/cxa_guard_impl.h.orig	2024-12-17 18:58:49.000000000 +0100
 +++ third_party/libc++abi/src/src/cxa_guard_impl.h
-@@ -425,6 +425,17 @@ void PlatformFutexWake(int* addr) {
+@@ -425,7 +425,18 @@ void PlatformFutexWake(int* addr) {
    __tsan_release(addr);
    futex(reinterpret_cast<volatile uint32_t*>(addr), WAKE, INT_MAX, NULL, NULL);
  }
-+#elif defined(__NetBSD__)
+-#elif defined(SYS_futex)
++/*#elif defined(__NetBSD__)
 +void PlatformFutexWait(int* addr, int expect) {
 +  constexpr int WAIT = 0;
 +  syscall(SYS___futex, addr, WAIT, expect, NULL, NULL, 0, 0);
@@ -20,7 +21,8 @@ $NetBSD: patch-third__party_libc++abi_src_src_cxa__guard__impl.h,v 1.1 2025/02/0
 +  constexpr int WAKE = 1;
 +  __tsan_release(addr);
 +  syscall(SYS___futex, addr, WAKE, INT_MAX, NULL, NULL, 0, 0);
-+}
- #elif defined(SYS_futex)
++}*/
++#elif defined(SYS_futex) && !defined(__NetBSD__)
  void PlatformFutexWait(int* addr, int expect) {
    constexpr int WAIT = 0;
+   syscall(SYS_futex, addr, WAIT, expect, 0);
Prev by Date: webkit-gtk-2.46: fix build, but not works
Next by Date: koha: Add reference to CVE-2025-30076
Previous by Thread: webkit-gtk-2.46: fix build, but not works
Next by Thread: koha: Add reference to CVE-2025-30076
Indexes:
Home | Main Index | Thread Index | Old Index