Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions devel/qt6-base/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
PORTNAME= base
DISTVERSION= ${QT6_VERSION}
PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= qt6-

Expand Down
13 changes: 0 additions & 13 deletions devel/qt6-base/files/patch-cmake_QtFlagHandlingHelpers.cmake

This file was deleted.

11 changes: 0 additions & 11 deletions devel/qt6-base/files/patch-cmake_QtRpathHelpers.cmake

This file was deleted.

27 changes: 0 additions & 27 deletions devel/qt6-base/files/patch-src_corelib_global_qcomparehelpers.h

This file was deleted.

27 changes: 27 additions & 0 deletions devel/qt6-base/files/patch-src_corelib_io_qprocess__unix.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
--- src/corelib/io/qprocess_unix.cpp.orig 2025-08-11 04:54:51 UTC
+++ src/corelib/io/qprocess_unix.cpp
@@ -59,10 +59,9 @@
# define _PATH_TTY _PATH_DEV "tty"
#endif

-#ifdef Q_OS_FREEBSD
-__attribute__((weak))
-#endif
+#ifndef Q_OS_FREEBSD
extern char **environ;
+#endif

QT_BEGIN_NAMESPACE

@@ -74,6 +73,11 @@ QProcessEnvironment QProcessEnvironment::systemEnviron
{
QProcessEnvironment env;
const char *entry;
+#ifdef Q_OS_FREEBSD
+ static char* nullenv = nullptr;
+ char ***environ_p = reinterpret_cast<char***>(dlsym(RTLD_DEFAULT, "environ"));
+ char **environ = environ_p ? *environ_p : &nullenv;
+#endif
for (int count = 0; (entry = environ[count]); ++count) {
const char *equal = strchr(entry, '=');
if (!equal)
2 changes: 1 addition & 1 deletion www/qt6-webengine/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ PORTNAME?= webengine
DISTVERSION= ${QT6_VERSION}
# This is the parent port of print/qt6-pdf. Please always keep 'PORTREVISION?='
# and reset the value to '0' only after increasing QT6_VERSION in Mk/Uses/qt.mk.
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES?= www
PKGNAMEPREFIX= qt6-

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,40 @@
--- src/3rdparty/chromium/base/process/launch_posix.cc.orig 2024-10-22 08:31:56 UTC
--- src/3rdparty/chromium/base/process/launch_posix.cc.orig 2025-08-18 00:53:11 UTC
+++ src/3rdparty/chromium/base/process/launch_posix.cc
@@ -67,6 +67,9 @@
@@ -67,7 +67,9 @@
#error "macOS should use launch_mac.cc"
#endif

+#if defined(OS_FREEBSD)
+#pragma weak environ
+#endif
+#if !defined(OS_FREEBSD)
extern char** environ;
+#endif

namespace base {

@@ -88,13 +90,27 @@ char** GetEnvironment() {
// Get the process's "environment" (i.e. the thing that setenv/getenv
// work with).
char** GetEnvironment() {
+#if !defined(OS_FREEBSD)
return environ;
+#else
+ static char* nullenv = nullptr;
+ char ***environ_p = reinterpret_cast<char***>(dlsym(RTLD_DEFAULT, "environ"));
+ char **environ = environ_p ? *environ_p : &nullenv;
+ return environ;
+#endif
}

// Set the process's "environment" (i.e. the thing that setenv/getenv
// work with).
void SetEnvironment(char** env) {
+#if !defined(OS_FREEBSD)
environ = env;
+#else
+ char ***environ_p = reinterpret_cast<char***>(dlsym(RTLD_DEFAULT, "environ"));
+ if (!environ_p)
+ return;
+ *environ_p = env;
+#endif
}

// Set the calling thread's signal mask to new_sigmask and return