Page MenuHomeFreeBSD
Files F107448217

D26646.id77942.diff
No OneTemporary
Actions

D26646.id77942.diff
View Options

Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -1177,7 +1177,7 @@
.endif
_EXPORTED_VARS+= OSVERSION
-.if (${OPSYS} == FreeBSD && (${OSVERSION} < 1103000 || (${OSVERSION} >= 1200000 && ${OSVERSION} < 1201000))) || \
+.if (${OPSYS} == FreeBSD && (${OSVERSION} < 1104000 || (${OSVERSION} >= 1200000 && ${OSVERSION} < 1201000))) || \
(${OPSYS} == DragonFly && ${DFLYVERSION} < 400400)
_UNSUPPORTED_SYSTEM_MESSAGE= Ports Collection support for your ${OPSYS} version has ended, and no ports\
are guaranteed to build on this system. Please upgrade to a supported release.
Index: emulators/i386-wine-devel/Makefile.amd64
===================================================================
--- emulators/i386-wine-devel/Makefile.amd64
+++ emulators/i386-wine-devel/Makefile.amd64
@@ -32,8 +32,8 @@
.endif
.endfor
-.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1103000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1201000 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300084 && ${OSVERSION} < 1400000))
-IGNORE= binaries compiled for FreeBSD 11.3+, 12.1+ and 13.0-CURRENT (OSVERSION >= 1300084) only
+.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1104000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1201000 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300084 && ${OSVERSION} < 1400000))
+IGNORE= binaries compiled for FreeBSD 11.4+, 12.1+ and 13.0-CURRENT (OSVERSION >= 1300084) only
.endif
OPTIONS_DEFINE= GECKO MONO
Index: emulators/i386-wine/Makefile.amd64
===================================================================
--- emulators/i386-wine/Makefile.amd64
+++ emulators/i386-wine/Makefile.amd64
@@ -33,8 +33,8 @@
.endif
.endfor
-.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1103000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1201000 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300084 && ${OSVERSION} < 1400000))
-IGNORE= binaries compiled for FreeBSD 11.3+, 12.1+ and 13.0-CURRENT (OSVERSION >= 1300084) only
+.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1104000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1201000 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300084 && ${OSVERSION} < 1400000))
+IGNORE= binaries compiled for FreeBSD 11.4+, 12.1+ and 13.0-CURRENT (OSVERSION >= 1300084) only
.endif
OPTIONS_DEFINE= GECKO MONO
Index: emulators/mesen/Makefile
===================================================================
--- emulators/mesen/Makefile
+++ emulators/mesen/Makefile
@@ -28,22 +28,22 @@
MAKEFILE= makefile
MAKE_ARGS= MESENPLATFORM=${MESEN_ARCH} \
CC="${CC}" CPPC="${CXX}" \
+ LTO=true \
SYSTEM_LIBEVDEV=true
MESEN_ARCH= ${ARCH:S/amd64/x64/:S/i386/x86/}
.if exists(/usr/lib/libc++fs.a)
+# XXX Remove after FreeBSD 12.1 EOL
MAKE_ARGS+= FSLIB=-lc++fs
-.elif exists(/usr/lib/libc++experimental.a)
-# XXX Remove after FreeBSD 12.0 EOL
-MAKE_ARGS+= FSLIB=-lc++experimental
.else
-# XXX Remove after FreeBSD 11.2 EOL
-USE_GCC= yes
+# Not required with libc++9 or libstdc++9
+# https://github.com/llvm/llvm-project/commit/cc37af7a3631
+# https://github.com/gcc-mirror/gcc/commit/3935f409704b
+MAKE_ARGS+= FSLIB= # empty
.endif
-# XXX Always enable LTO after FreeBSD 11.2 and 12.0 EOL
-.if defined(USE_GCC) || (${/usr/bin/ld:L:tA} == /usr/bin/ld.lld)
-MAKE_ARGS+= LTO=true
+.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
+LDFLAGS+= -fuse-ld=lld
.endif
OPTIONS_MULTI= FRONTENDS
Index: emulators/rpcs3/Makefile
===================================================================
--- emulators/rpcs3/Makefile
+++ emulators/rpcs3/Makefile
@@ -56,7 +56,7 @@
CXX= clang++${LLVM_DEFAULT}
CPP= clang-cpp${LLVM_DEFAULT}
-# XXX Drop after FreeBSD 11.3/12.1 EOL
+# XXX Drop after FreeBSD 12.1 EOL
.if make(makesum) || (!exists(/usr/include/c++/v1/fenv.h) && exists(/usr/lib/libc++.so))
MASTER_SITES+= https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VER}/:libcxx
DISTFILES+= libcxx-${LLVM_VER}.src.tar.xz:libcxx
Index: emulators/yuzu/Makefile
===================================================================
--- emulators/yuzu/Makefile
+++ emulators/yuzu/Makefile
@@ -96,7 +96,7 @@
.include <bsd.port.pre.mk>
-# XXX Drop after FreeBSD 11.3/12.1 EOL
+# XXX Drop after FreeBSD 12.1 EOL
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 100
. if ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} < 100
LLVM_DEFAULT= 10
@@ -107,7 +107,7 @@
CPP= clang-cpp${LLVM_DEFAULT}
.endif
-# XXX Drop after FreeBSD 11.3/12.1 EOL
+# XXX Drop after FreeBSD 12.1 EOL
.if make(makesum) || (!exists(/usr/include/c++/v1/fenv.h) && exists(/usr/lib/libc++.so))
MASTER_SITES+= https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VER}/:libcxx
DISTFILES+= libcxx-${LLVM_VER}.src.tar.xz:libcxx
Index: graphics/drm-fbsd11.2-kmod/pkg-descr
===================================================================
--- graphics/drm-fbsd11.2-kmod/pkg-descr
+++ graphics/drm-fbsd11.2-kmod/pkg-descr
@@ -1,6 +1,6 @@
amdgpu, i915, and radeon DRM modules for the linuxkpi-based KMS components.
Currently corresponding to Linux 4.11 DRM.
-This version is for FreeBSD 11.3.
+This version is for FreeBSD 11.4.
amdgpu and radeonkms are known to fail with EFI boot.
WWW: https://github.com/FreeBSDDesktop/kms-drm
Index: graphics/drm-kmod/Makefile
===================================================================
--- graphics/drm-kmod/Makefile
+++ graphics/drm-kmod/Makefile
@@ -16,15 +16,15 @@
IGNORE= not supported on anything but FreeBSD (missing linuxkpi functionality)
.else
.if ${ARCH} != "amd64"
-.if ${OSVERSION} >= 1200080
+.if ${OSVERSION} >= 1201000
RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-legacy-kmod
-.elif ${OSVERSION} < 1200080
-IGNORE= legacy kmod not required on less than 12.0
+.else
+IGNORE= legacy kmod not required on less than 12.1
.endif
.else
-.if ${OSVERSION} >= 1103000 && ${OSVERSION} < 1200000
+.if ${OSVERSION} >= 1104000 && ${OSVERSION} < 1200000
RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd11.2-kmod
-.elif ${OSVERSION} >= 1200058 && ${OSVERSION} < 1300000
+.elif ${OSVERSION} >= 1201000 && ${OSVERSION} < 1300000
RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd12.0-kmod
.elif ${OSVERSION} >= 1300000 && ${OSVERSION} < 1300108
IGNORE= not supported on older 13, no kernel support
Index: graphics/dspdfviewer/Makefile
===================================================================
--- graphics/dspdfviewer/Makefile
+++ graphics/dspdfviewer/Makefile
@@ -46,7 +46,7 @@
.endif
# Fixes build failure for Clang 8.0.0
-.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1300014 || (${OSVERSION} >= 1103000 && ${OSVERSION} < 1200000) || ${OSVERSION} >= 1201000) && ${CHOSEN_COMPILER_TYPE} == clang
+.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1300014 || (${OSVERSION} >= 1104000 && ${OSVERSION} < 1200000) || (${OSVERSION} >= 1201000 && ${OSVERSION} < 1300000)) && ${CHOSEN_COMPILER_TYPE} == clang
CFLAGS+= -Wno-error=extra-semi-stmt
.endif
Index: graphics/linux-c7-libdrm/Makefile
===================================================================
--- graphics/linux-c7-libdrm/Makefile
+++ graphics/linux-c7-libdrm/Makefile
@@ -19,8 +19,8 @@
.include <bsd.port.options.mk>
-.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1103501 \
- || (${OSVERSION} >= 1200000 && ${OSVERSION} < 1201501) \
+.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1104000 \
+ || (${OSVERSION} >= 1201000 && ${OSVERSION} < 1201501) \
|| (${OSVERSION} >= 1300000 && ${OSVERSION} < 1300048))
PORTVERSION= 2.4.91
DISTVERSIONSUFFIX= -3.el7
Index: graphics/waifu2x-converter-cpp/Makefile
===================================================================
--- graphics/waifu2x-converter-cpp/Makefile
+++ graphics/waifu2x-converter-cpp/Makefile
@@ -37,7 +37,7 @@
PORTDATA= *
.if exists(/usr/lib/libc++fs.a)
-# XXX Remove after FreeBSD 11.3/12.1 EOL
+# XXX Remove after FreeBSD 12.1 EOL
CMAKE_ARGS+= -DFILE_SYSTEM_LIB:STRING=c++fs
.endif
Index: lang/gnatcross-binutils-aarch64/Makefile
===================================================================
--- lang/gnatcross-binutils-aarch64/Makefile
+++ lang/gnatcross-binutils-aarch64/Makefile
@@ -9,7 +9,7 @@
COMMENT= Infrastructure for C/Ada FreeBSD cross-compiler (aarch64)
BRANCH2= # Assume aarch64 will always be only CPU for FreeBSD/ARM64
-XCCTARGET= aarch64-aux-freebsd11.3
+XCCTARGET= aarch64-aux-freebsd11.4
PREFIX= ${LOCALBASE}/FreeBSD_ARM64
SRPREFIX= ${PREFIX}/sysroot
SYSROOT= gnatcross-sysroot-aarch64
Index: lang/gnatcross-sysroot-aarch64/Makefile
===================================================================
--- lang/gnatcross-sysroot-aarch64/Makefile
+++ lang/gnatcross-sysroot-aarch64/Makefile
@@ -5,11 +5,11 @@
PORTVERSION= 1
PORTREVISION= 1
CATEGORIES= lang
-MASTER_SITES= ${PUB_FREEBSD}/releases/arm64/aarch64/11.3-RELEASE/
+MASTER_SITES= ${PUB_FREEBSD}/releases/arm64/aarch64/11.4-RELEASE/
PKGNAMEPREFIX= gnatcross-
PKGNAMESUFFIX= -aarch64
DISTNAME= base
-DIST_SUBDIR= gnatcross/arm64-aarch64/R11_3
+DIST_SUBDIR= gnatcross/arm64-aarch64/R11_4
MAINTAINER= ports@FreeBSD.org
COMMENT= FreeBSD sysroots for C/Ada cross-compiler (${ARCH})
@@ -34,7 +34,7 @@
@${MKDIR} ${STAGEDIR}${PREFIX}/sysroot
@${MV} ${WRKDIR}/lib ${STAGEDIR}${PREFIX}/sysroot
@${MV} ${WRKDIR}/usr ${STAGEDIR}${PREFIX}/sysroot
- @${ECHO_CMD} aarch64-aux-freebsd11.3 > ${STAGEDIR}${PREFIX}/sysroot/target_triplet
+ @${ECHO_CMD} aarch64-aux-freebsd11.4 > ${STAGEDIR}${PREFIX}/sysroot/target_triplet
@(cd ${STAGEDIR}${PREFIX}; ${FIND} sysroot -type d -empty -delete)
@(cd ${STAGEDIR}${PREFIX}; ${FIND} sysroot \( -type f -or -type l \) \
| ${SORT} >> ${TMPPLIST})
Index: lang/rust-bootstrap/Makefile
===================================================================
--- lang/rust-bootstrap/Makefile
+++ lang/rust-bootstrap/Makefile
@@ -61,7 +61,7 @@
_RUST_FBSD_DIST_powerpc64_elfv1= FreeBSD-${_RUST_FBSD_VER}-powerpc64-elfv1${EXTRACT_SUFX}:base \
FreeBSD-${_RUST_FBSD_VER}-powerpc64-elfv1-gcc9-9.2.0${EXTRACT_SUFX}:powerpc64_gcc
_RUST_FBSD_DIST_powerpc64_elfv2= FreeBSD-${_RUST_FBSD_VER}-powerpc64-elfv2-r356261${EXTRACT_SUFX}:base
-_RUST_FBSD_VER= ${_RUST_FBSD_VER_${FLAVOR}:U11.3-RELEASE}
+_RUST_FBSD_VER= ${_RUST_FBSD_VER_${FLAVOR}:U11.4-RELEASE}
_RUST_FBSD_VER_armv7= 12.1-RELEASE
_RUST_FBSD_VER_powerpc64_elfv1= 12.1-RELEASE
_RUST_FBSD_VER_powerpc64_elfv2= 13.0-CURRENT
Index: mail/thunderbird/files/patch-freebsd11.3
===================================================================
--- mail/thunderbird/files/patch-freebsd11.3
+++ /dev/null
@@ -1,60 +0,0 @@
-Drop after FreeBSD 11.3 EOL around 2020-09-20.
-https://svnweb.freebsd.org/changeset/base/351766
-
-mozglue/baseprofiler/core/shared-libraries-linux.cc:374:34: error: use of undeclared
- identifier 'NT_GNU_BUILD_ID'
- if (note_header->n_type == NT_GNU_BUILD_ID) break;
- ^
-In file included from Unified_cpp_mozglue_baseprofiler0.cpp:137:
-mozglue/baseprofiler/lul/LulElf.cpp:762:32: error: use of undeclared identifier
- 'NT_GNU_BUILD_ID'
- if (note_header->n_type == NT_GNU_BUILD_ID) break;
- ^
-In file included from Unified_cpp_tools_profiler1.cpp:38:
-tools/profiler/lul/LulElf.cpp:776:32: error: use of undeclared identifier
- 'NT_GNU_BUILD_ID'
- if (note_header->n_type == NT_GNU_BUILD_ID) break;
- ^
-
---- mozglue/baseprofiler/core/shared-libraries-linux.cc.orig 2020-06-25 17:04:48 UTC
-+++ mozglue/baseprofiler/core/shared-libraries-linux.cc
-@@ -50,6 +50,11 @@ extern "C" MOZ_EXPORT __attribute__((weak)) int dl_ite
- # define ElfW(type) Elf_##type
- #endif
-
-+#if defined(GP_OS_freebsd) && !defined(NT_GNU_BUILD_ID)
-+// FreeBSD < 11.4 doesn't define NT_GNU_BUILD_ID
-+# define NT_GNU_BUILD_ID 3
-+#endif
-+
- // ----------------------------------------------------------------------------
- // Starting imports from toolkit/crashreporter/google-breakpad/, as needed by
- // this file when moved to mozglue.
---- mozglue/baseprofiler/lul/LulElf.cpp.orig 2020-06-25 17:04:48 UTC
-+++ mozglue/baseprofiler/lul/LulElf.cpp
-@@ -79,6 +79,11 @@
- # define EM_AARCH64 183
- #endif
-
-+#if defined(GP_OS_freebsd) && !defined(NT_GNU_BUILD_ID)
-+// FreeBSD < 11.4 doesn't define NT_GNU_BUILD_ID
-+# define NT_GNU_BUILD_ID 3
-+#endif
-+
- // This namespace contains helper functions.
- namespace {
-
---- tools/profiler/lul/LulElf.cpp.orig 2020-06-25 17:05:05 UTC
-+++ tools/profiler/lul/LulElf.cpp
-@@ -84,6 +84,11 @@
- # define EM_AARCH64 183
- #endif
-
-+#if defined(GP_OS_freebsd) && !defined(NT_GNU_BUILD_ID)
-+// FreeBSD < 11.4 doesn't define NT_GNU_BUILD_ID
-+# define NT_GNU_BUILD_ID 3
-+#endif
-+
- // This namespace contains helper functions.
- namespace {
-
Index: multimedia/libva/Makefile
===================================================================
--- multimedia/libva/Makefile
+++ multimedia/libva/Makefile
@@ -27,7 +27,6 @@
GH_ACCOUNT= intel
# -lpthread is not necessary if pthread_getthreadid_np is a libc stub
LDFLAGS+= ${LDFLAGS_${OPSYS}_${OSREL}}
-LDFLAGS_FreeBSD_11.3= -lpthread
OPTIONS_DEFINE= GLX WAYLAND X11
OPTIONS_DEFAULT=GLX WAYLAND X11
Index: sysutils/ebsnvme-id/Makefile
===================================================================
--- sysutils/ebsnvme-id/Makefile
+++ sysutils/ebsnvme-id/Makefile
@@ -22,7 +22,7 @@
.include <bsd.port.pre.mk>
-.if (${OSVERSION} < 1103501) || (${OSVERSION} >= 1200000 && ${OSVERSION} < 1200516) || (${OSVERSION} >= 1300000 && ${OSVERSION} < 1300039)
+.if (${OSVERSION} < 1104000) || (${OSVERSION} >= 1300000 && ${OSVERSION} < 1300039)
IGNORE= needs NVME_GET_NSID ioctl
.endif
Index: sysutils/p5-BSD-Jail-Object/files/patch-Object.pm
===================================================================
--- sysutils/p5-BSD-Jail-Object/files/patch-Object.pm
+++ sysutils/p5-BSD-Jail-Object/files/patch-Object.pm
@@ -8,9 +8,9 @@
! version information along with the cached data.
! Look at usr.sbin/{jail,jls,jexec} sources for the right ideas.
!
---- ./Object.pm.orig 2006-08-08 04:54:29.000000000 +0000
-+++ ./Object.pm 2008-12-28 14:06:27.000000000 +0000
-@@ -317,21 +317,69 @@
+--- Object.pm.orig 2006-08-08 04:54:29 UTC
++++ Object.pm
+@@ -317,21 +317,56 @@ struct xprison
return NULL;
}
@@ -22,19 +22,13 @@
+_is_jail_ip4(char *string, struct xprison *xp)
+{
+ struct in_addr in;
-+#if ((__FreeBSD_version >= 800056) || (__FreeBSD_version < 800000) && (__FreeBSD_version >= 701103))
+ struct in_addr *iap;
+ char *q;
+ int i;
-+#endif
+
+ if (inet_pton(AF_INET, string, &in) != 1)
+ return (0);
+
-+#if ((__FreeBSD_version >= 800000 && __FreeBSD_version < 800056) || __FreeBSD_version < 701103)
-+ if (in.s_addr == xp->pr_ip)
-+ return (1);
-+#else
+ if (xp->pr_ip4s == 0)
+ return (0);
+ q = (char *)(xp + 1);
@@ -42,21 +36,15 @@
+ for (i=0; i < xp->pr_ip4s; i++)
+ if (in.s_addr == iap[i].s_addr)
+ return (1);
-+#endif
+ return (0);
+}
+
+static void
+_get_jail_ip4(struct xprison *xp, struct in_addr *ia)
+{
-+#if ((__FreeBSD_version >= 800056) || (__FreeBSD_version < 800000) && (__FreeBSD_version >= 701103))
+ struct in_addr *iap;
+ char *q;
-+#endif
+
-+#if ((__FreeBSD_version >= 800000 && __FreeBSD_version < 800056) || __FreeBSD_version < 701103)
-+ ia->s_addr = xp->pr_ip;
-+#else
+ if (xp->pr_ip4s == 0)
+ ia->s_addr = 0;
+ else {
@@ -64,7 +52,6 @@
+ iap = (struct in_addr *)(void *)q;
+ ia->s_addr = iap[0].s_addr;
+ }
-+#endif
+}
+
// fetch a specific jail's information
@@ -83,7 +70,7 @@
len = sysctl_len();
/*
-@@ -341,15 +389,15 @@
+@@ -341,15 +376,15 @@ _find_jail( int compare, char *string )
*/
for (i = 0; i < len / sizeof(*xp); i++) {
@@ -101,7 +88,7 @@
Inline_Stack_Push( sv_2mortal( newSVpvf( inet_ntoa(in) ) ));
Inline_Stack_Push( sv_2mortal( newSVpvf( xp->pr_host ) ));
Inline_Stack_Push( sv_2mortal( newSVpvf( xp->pr_path ) ));
-@@ -360,6 +408,7 @@
+@@ -360,6 +395,7 @@ _find_jail( int compare, char *string )
}
}
@@ -109,7 +96,7 @@
Inline_Stack_Done;
}
-@@ -367,12 +416,12 @@
+@@ -367,12 +403,12 @@ _find_jail( int compare, char *string )
void
_find_jids()
{
@@ -124,7 +111,7 @@
len = sysctl_len();
for (i = 0; i < len / sizeof(*xp); i++) {
-@@ -380,6 +429,7 @@
+@@ -380,6 +416,7 @@ _find_jids()
xp++;
}
@@ -132,18 +119,15 @@
Inline_Stack_Done;
}
-@@ -402,8 +452,14 @@
+@@ -402,8 +439,9 @@ _create( char *path, char *hostname, char *ipaddr )
j.path = path;
j.hostname = hostname;
-+#if ((__FreeBSD_version >= 800000 && __FreeBSD_version < 800056) || __FreeBSD_version < 701103)
- j.ip_number = ntohl( ip.s_addr );
- j.version = 0;
-+#else
+- j.ip_number = ntohl( ip.s_addr );
+- j.version = 0;
+ j.version = JAIL_API_VERSION;
+ j.ip4s = 1;
+ j.ip4 = &ip;
-+#endif
if ( (jid = jail( &j )) == -1 ) return 0;
Index: www/chromium/Makefile
===================================================================
--- www/chromium/Makefile
+++ www/chromium/Makefile
@@ -137,7 +137,7 @@
google_default_client_secret="IR1za9-1VK0zZ0f_O8MVFicn"
.if !defined(GN_ONLY)
-SUB_FILES= chromium-browser.desktop chrome pkg-message
+SUB_FILES= chromium-browser.desktop chrome
SUB_LIST+= COMMENT="${COMMENT}"
OPTIONS_DEFINE= CODECS CUPS DEBUG DRIVER KERBEROS TEST
Index: www/chromium/files/pkg-message.in
===================================================================
--- www/chromium/files/pkg-message.in
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-{ type: install
- message: <<EOM
-Chromium has a known problem of hanging tabs. The bug has been fixed
-in r337328. Therefore, it is recommended to upgrade the system after
-the correction date.
-
- # svn diff -c337328 --summarize svn://svn.freebsd.org/base
-
-See PR 212812 for further details.
-EOM
-}
-]
Index: www/cliqz/files/patch-freebsd11.3
===================================================================
--- www/cliqz/files/patch-freebsd11.3
+++ /dev/null
@@ -1,61 +0,0 @@
-Drop after FreeBSD 11.3 EOL around 2020-09-20.
-https://svnweb.freebsd.org/changeset/base/351766
-
-mozglue/baseprofiler/core/shared-libraries-linux.cc:374:34: error: use of undeclared
- identifier 'NT_GNU_BUILD_ID'
- if (note_header->n_type == NT_GNU_BUILD_ID) break;
- ^
-In file included from Unified_cpp_mozglue_baseprofiler0.cpp:137:
-mozglue/baseprofiler/lul/LulElf.cpp:762:32: error: use of undeclared identifier
- 'NT_GNU_BUILD_ID'
- if (note_header->n_type == NT_GNU_BUILD_ID) break;
- ^
-In file included from Unified_cpp_tools_profiler1.cpp:38:
-tools/profiler/lul/LulElf.cpp:776:32: error: use of undeclared identifier
- 'NT_GNU_BUILD_ID'
- if (note_header->n_type == NT_GNU_BUILD_ID) break;
- ^
-Taken from www/firefox
-
---- mozilla-release/mozglue/baseprofiler/core/shared-libraries-linux.cc.orig 2020-06-25 17:04:48 UTC
-+++ mozilla-release/mozglue/baseprofiler/core/shared-libraries-linux.cc
-@@ -50,6 +50,11 @@ extern "C" MOZ_EXPORT __attribute__((weak)) int dl_ite
- # define ElfW(type) Elf_##type
- #endif
-
-+#if defined(GP_OS_freebsd) && !defined(NT_GNU_BUILD_ID)
-+// FreeBSD < 11.4 doesn't define NT_GNU_BUILD_ID
-+# define NT_GNU_BUILD_ID 3
-+#endif
-+
- // ----------------------------------------------------------------------------
- // Starting imports from toolkit/crashreporter/google-breakpad/, as needed by
- // this file when moved to mozglue.
---- mozilla-release/mozglue/baseprofiler/lul/LulElf.cpp.orig 2020-06-25 17:04:48 UTC
-+++ mozilla-release/mozglue/baseprofiler/lul/LulElf.cpp
-@@ -79,6 +79,11 @@
- # define EM_AARCH64 183
- #endif
-
-+#if defined(GP_OS_freebsd) && !defined(NT_GNU_BUILD_ID)
-+// FreeBSD < 11.4 doesn't define NT_GNU_BUILD_ID
-+# define NT_GNU_BUILD_ID 3
-+#endif
-+
- // This namespace contains helper functions.
- namespace {
-
---- mozilla-release/tools/profiler/lul/LulElf.cpp.orig 2020-06-25 17:05:05 UTC
-+++ mozilla-release/tools/profiler/lul/LulElf.cpp
-@@ -84,6 +84,11 @@
- # define EM_AARCH64 183
- #endif
-
-+#if defined(GP_OS_freebsd) && !defined(NT_GNU_BUILD_ID)
-+// FreeBSD < 11.4 doesn't define NT_GNU_BUILD_ID
-+# define NT_GNU_BUILD_ID 3
-+#endif
-+
- // This namespace contains helper functions.
- namespace {
-
Index: www/falkon/pkg-message
===================================================================
--- www/falkon/pkg-message
+++ www/falkon/pkg-message
@@ -1,11 +1,6 @@
[
{ type: install
message: <<EOM
-On FreeBSD < 11.3 Web Content process may frequently crash due to bug 181741.
-If you cannot upgrade try applying the following workaround:
-
-# sysctl net.local.stream.recvspace=16384
-
If you get wrong colors when watching videos, this is probably because your
system does not support hardware acceleration (see bug 237277): you can
disable it by starting the browser from command line with the --disable-gpu
Index: www/firefox-esr/files/patch-freebsd11.3
===================================================================
--- www/firefox-esr/files/patch-freebsd11.3
+++ /dev/null
@@ -1,60 +0,0 @@
-Drop after FreeBSD 11.3 EOL around 2020-09-20.
-https://svnweb.freebsd.org/changeset/base/351766
-
-mozglue/baseprofiler/core/shared-libraries-linux.cc:374:34: error: use of undeclared
- identifier 'NT_GNU_BUILD_ID'
- if (note_header->n_type == NT_GNU_BUILD_ID) break;
- ^
-In file included from Unified_cpp_mozglue_baseprofiler0.cpp:137:
-mozglue/baseprofiler/lul/LulElf.cpp:762:32: error: use of undeclared identifier
- 'NT_GNU_BUILD_ID'
- if (note_header->n_type == NT_GNU_BUILD_ID) break;
- ^
-In file included from Unified_cpp_tools_profiler1.cpp:38:
-tools/profiler/lul/LulElf.cpp:776:32: error: use of undeclared identifier
- 'NT_GNU_BUILD_ID'
- if (note_header->n_type == NT_GNU_BUILD_ID) break;
- ^
-
---- mozglue/baseprofiler/core/shared-libraries-linux.cc.orig 2020-06-25 17:04:48 UTC
-+++ mozglue/baseprofiler/core/shared-libraries-linux.cc
-@@ -50,6 +50,11 @@ extern "C" MOZ_EXPORT __attribute__((weak)) int dl_ite
- # define ElfW(type) Elf_##type
- #endif
-
-+#if defined(GP_OS_freebsd) && !defined(NT_GNU_BUILD_ID)
-+// FreeBSD < 11.4 doesn't define NT_GNU_BUILD_ID
-+# define NT_GNU_BUILD_ID 3
-+#endif
-+
- // ----------------------------------------------------------------------------
- // Starting imports from toolkit/crashreporter/google-breakpad/, as needed by
- // this file when moved to mozglue.
---- mozglue/baseprofiler/lul/LulElf.cpp.orig 2020-06-25 17:04:48 UTC
-+++ mozglue/baseprofiler/lul/LulElf.cpp
-@@ -79,6 +79,11 @@
- # define EM_AARCH64 183
- #endif
-
-+#if defined(GP_OS_freebsd) && !defined(NT_GNU_BUILD_ID)
-+// FreeBSD < 11.4 doesn't define NT_GNU_BUILD_ID
-+# define NT_GNU_BUILD_ID 3
-+#endif
-+
- // This namespace contains helper functions.
- namespace {
-
---- tools/profiler/lul/LulElf.cpp.orig 2020-06-25 17:05:05 UTC
-+++ tools/profiler/lul/LulElf.cpp
-@@ -84,6 +84,11 @@
- # define EM_AARCH64 183
- #endif
-
-+#if defined(GP_OS_freebsd) && !defined(NT_GNU_BUILD_ID)
-+// FreeBSD < 11.4 doesn't define NT_GNU_BUILD_ID
-+# define NT_GNU_BUILD_ID 3
-+#endif
-+
- // This namespace contains helper functions.
- namespace {
-
Index: www/firefox/files/patch-freebsd11.3
===================================================================
--- www/firefox/files/patch-freebsd11.3
+++ /dev/null
@@ -1,60 +0,0 @@
-Drop after FreeBSD 11.3 EOL around 2020-09-20.
-https://svnweb.freebsd.org/changeset/base/351766
-
-mozglue/baseprofiler/core/shared-libraries-linux.cc:374:34: error: use of undeclared
- identifier 'NT_GNU_BUILD_ID'
- if (note_header->n_type == NT_GNU_BUILD_ID) break;
- ^
-In file included from Unified_cpp_mozglue_baseprofiler0.cpp:137:
-mozglue/baseprofiler/lul/LulElf.cpp:762:32: error: use of undeclared identifier
- 'NT_GNU_BUILD_ID'
- if (note_header->n_type == NT_GNU_BUILD_ID) break;
- ^
-In file included from Unified_cpp_tools_profiler1.cpp:38:
-tools/profiler/lul/LulElf.cpp:776:32: error: use of undeclared identifier
- 'NT_GNU_BUILD_ID'
- if (note_header->n_type == NT_GNU_BUILD_ID) break;
- ^
-
---- mozglue/baseprofiler/core/shared-libraries-linux.cc.orig 2020-06-25 17:04:48 UTC
-+++ mozglue/baseprofiler/core/shared-libraries-linux.cc
-@@ -50,6 +50,11 @@ extern "C" MOZ_EXPORT __attribute__((weak)) int dl_ite
- # define ElfW(type) Elf_##type
- #endif
-
-+#if defined(GP_OS_freebsd) && !defined(NT_GNU_BUILD_ID)
-+// FreeBSD < 11.4 doesn't define NT_GNU_BUILD_ID
-+# define NT_GNU_BUILD_ID 3
-+#endif
-+
- // ----------------------------------------------------------------------------
- // Starting imports from toolkit/crashreporter/google-breakpad/, as needed by
- // this file when moved to mozglue.
---- mozglue/baseprofiler/lul/LulElf.cpp.orig 2020-06-25 17:04:48 UTC
-+++ mozglue/baseprofiler/lul/LulElf.cpp
-@@ -79,6 +79,11 @@
- # define EM_AARCH64 183
- #endif
-
-+#if defined(GP_OS_freebsd) && !defined(NT_GNU_BUILD_ID)
-+// FreeBSD < 11.4 doesn't define NT_GNU_BUILD_ID
-+# define NT_GNU_BUILD_ID 3
-+#endif
-+
- // This namespace contains helper functions.
- namespace {
-
---- tools/profiler/lul/LulElf.cpp.orig 2020-06-25 17:05:05 UTC
-+++ tools/profiler/lul/LulElf.cpp
-@@ -84,6 +84,11 @@
- # define EM_AARCH64 183
- #endif
-
-+#if defined(GP_OS_freebsd) && !defined(NT_GNU_BUILD_ID)
-+// FreeBSD < 11.4 doesn't define NT_GNU_BUILD_ID
-+# define NT_GNU_BUILD_ID 3
-+#endif
-+
- // This namespace contains helper functions.
- namespace {
-
Index: www/webkit2-gtk3/Makefile
===================================================================
--- www/webkit2-gtk3/Makefile
+++ www/webkit2-gtk3/Makefile
@@ -73,9 +73,6 @@
# Building WebKit with debugging symbols requires ar and ld with
# support for thin archives. Also see
# https://bugs.webkit.org/show_bug.cgi?id=140384
-# binutils can be removed when 12.0-R and 11.2 and 11.3 are EOL
-# https://svnweb.freebsd.org/base?view=revision&revision=346079
-DEBUG_BUILD_DEPENDS= binutils>=0:devel/binutils
DEBUG_CMAKE_ON= -DCMAKE_AR=${LOCALBASE}/bin/ar \
-DCMAKE_RANLIB=${LOCALBASE}/bin/ranlib \
-DCMAKE_LINKER=${LOCALBASE}/bin/ld
Index: x11-toolkits/wlroots/Makefile
===================================================================
--- x11-toolkits/wlroots/Makefile
+++ x11-toolkits/wlroots/Makefile
@@ -34,12 +34,6 @@
GH_ACCOUNT= swaywm
MESON_ARGS= -Dexamples=false
-# XXX Drop after FreeBSD 11.3 EOL (aarch64)
-.if exists(/usr/lib/clang/8.0.0)
-# https://github.com/swaywm/wlroots/issues/1450
-LLD_UNSAFE= yes
-.endif
-
OPTIONS_DEFINE= CONSOLEKIT LIBSEAT X11
OPTIONS_DEFAULT=X11
OPTIONS_SUB= yes

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 15, 7:33 AM (13 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15807603
Default Alt Text
D26646.id77942.diff (26 KB)

Event Timeline