From ad9809e1e3c0f914cb927f3619e9b328f5a5870d Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Sun, 5 Jul 2026 16:03:19 +0200 Subject: gtk-broadway-run.sh is now used in all headless builds * It's already used on home:rhaberkorn:sciteco:UNSTABLE (OBS). We cannot introduce it in STABLE though until the next stable release which will contain the gtk-broadway-run.sh script. * The FreeBSD packaging is actually not tested yet. The package version had been dumped to 2.6.0 since it definitely won't work with v2.5.2 tarballs. The v2.5.2_1 patches have consequently also been removed. You can still find them in the bugzilla ticket (not merged into ports yet). --- freebsd/files/sbrk.patch | 76 ------------------------------------------------ 1 file changed, 76 deletions(-) delete mode 100644 freebsd/files/sbrk.patch (limited to 'freebsd/files/sbrk.patch') diff --git a/freebsd/files/sbrk.patch b/freebsd/files/sbrk.patch deleted file mode 100644 index 66b94aa..0000000 --- a/freebsd/files/sbrk.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 62177d06bd9d31242e67995d4e33a755a3447ca2 Mon Sep 17 00:00:00 2001 -From: Robin Haberkorn -Date: Tue, 19 May 2026 21:21:52 +0400 -Subject: [PATCH] check for sbrk() even on UNIX - -* Turns out that not all UNIXes support sbrk(). - FreeBSD arm64 and riscv ports don't implement sbrk(). - It's also apparently not in POSIX - so other systems might also - be affected. - This needs to be passed on to dlmalloc. -* We now use DLMALLOC_CPPFLAGS instead of conditionals to pass - on flags to dlmalloc. -* Should be backported to the FreeBSD v2.5.2 package - to fix Poudriere fallout. ---- - configure.ac | 9 ++++++++- - contrib/dlmalloc/Makefile.am | 7 ++----- - 2 files changed, 10 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b5cac0b..43b4d1b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -18,10 +18,10 @@ AC_CANONICAL_BUILD - AC_CANONICAL_HOST - - AX_CHECK_ENABLE_DEBUG --AM_CONDITIONAL(DEBUG, [test x$ax_enable_debug != xno]) - if [[ x$ax_enable_debug = xno ]]; then - # glib does not look at NDEBUG - AC_DEFINE(G_DISABLE_ASSERT, 1, [Disable g_assert()]) -+ DLMALLOC_CPPFLAGS="$DLMALLOC_CPPFLAGS -DINSECURE=1" - fi - - # Use the user provided CXXFLAGS for Scintilla as well. -@@ -224,6 +224,13 @@ case $host in - ;; - esac - -+# Optional UNIX libc functions. -+# FreeBSD arm64 and riscv are missing sbrk(), which can be used by dlmalloc. -+AC_CHECK_FUNCS([sbrk], , [ -+ DLMALLOC_CPPFLAGS="$DLMALLOC_CPPFLAGS -DHAVE_MORECORE=0" -+]) -+AC_SUBST(DLMALLOC_CPPFLAGS) -+ - # - # Config options - # -diff --git a/contrib/dlmalloc/Makefile.am b/contrib/dlmalloc/Makefile.am -index 223ed13..73232d7 100644 ---- a/contrib/dlmalloc/Makefile.am -+++ b/contrib/dlmalloc/Makefile.am -@@ -1,6 +1,6 @@ - # Source: http://gee.cs.oswego.edu/dl/html/malloc.html - # --# FIXME: On FreeBSD, we might implement a compatible mremap() based on the BSD mremap() and pass -+# FIXME: On NetBSD, we might implement a compatible mremap() based on the NetBSD mremap() and pass - # in -DHAVE_MREMAP=1 -DMREMAP=mremap_bsd. We'll have to add a declaration to malloc.c or - # use -include mremap_bsd.h in CPPFLAGS. - # -@@ -8,10 +8,7 @@ - # for increased portability. There is also AC_LIBOBJ, but it's usually for defining sources of - # replacement libraries. - --AM_CPPFLAGS = -DNO_MALLINFO=1 -DNO_MALLOC_STATS=1 -DUSE_LOCKS=1 -DUSE_DL_PREFIX --if !DEBUG --AM_CPPFLAGS += -DINSECURE=1 --endif -+AM_CPPFLAGS = @DLMALLOC_CPPFLAGS@ -DNO_MALLINFO=1 -DNO_MALLOC_STATS=1 -DUSE_LOCKS=1 -DUSE_DL_PREFIX - - # FIXME: This optimization is still broken as of GCC v9.3.0. - # This is a known GCC bug, triggered by memset() in calloc(). --- -2.53.0 - -- cgit v1.2.3