pktsurf/smlinux
1
1
Fork 0
Code Issues 1 Pull requests Wiki Activity

Upgraded base/chrony to version 4.4

Browse source 
Upgraded base/cmake to version 3.27.7
Upgraded base/glib to 2.78.1
Upgraded base/libvpx to 1.10.0
Added AMDGPU and BPF build targets to base/llvm
Added a patch to extra/ffmpegthumbnailer for fixing a build error against ffmpeg 5.X versions
Upgraded gtk/libwnck3 to 3.36.0
Upgraded heavybuilds/firefox to 115.5.0
Added some patches to base/wpa-supplicant
Added glslang to xorg
This commit is contained in:
PktSurf 2023-12-10 23:23:41 +05:30
parent d4712a32e9
commit b84f8a4a14
29 changed files with 795 additions and 713 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
base/chrony/chrony.SMBuild
View file

@ -1,6 +1,6 @@
# Maintainer: PktSurf <smlinux@pktsurf.in>
app=chrony
version=4.2
version=4.4
build=1sml
homepage="https://chrony.tuxfamily.org/"
download="https://download.tuxfamily.org/chrony/chrony-$version.tar.gz"
@ -21,7 +21,8 @@ build() {
--prefix="" \
--bindir=/bin \
--sbindir=/bin \
--mandir=/share/man
--mandir=/share/man \
--with-user=chrony
make $MAKEFLAGS
make install DESTDIR=$pkg
@ -41,5 +42,5 @@ build() {
}
sha512sums="
df1f75305eda70294d5217131a63a1f42fc5fd78fd5d73d53c930c81707e2a0750a137ccc739d111f398f0c49775c847b73b27e1f00931d7a174261eb253c409 chrony-4.2.tar.lz
"
6c8c39864dbfcfac8e6a9c3a09fbe91c5f697d987eb044bf241c78b4654b55e968544cebfe644563b199cc7632a14aea1da4cb07b7ebe60f6a152334cf23af9a chrony-4.4.tar.lz
"

15
base/cmake/cmake.SMBuild
View file

@ -1,9 +1,9 @@
# Maintainer: PktSurf <smlinux@pktsurf.in>
app=cmake
version=3.26.4
version=3.27.7
build=1sml
homepage="http://www.cmake.org"
download="https://cmake.org/files/v$version/cmake-$version.tar.gz"
download="https://github.com/Kitware/CMake/releases/download/v$version/cmake-$version.tar.gz"
desc="Cross-platform, open-source make system"
requires="gcc-libs openssl libunistring libidn2"
@ -14,6 +14,7 @@ prepbuilddir() {
tar xf $srcdir/$app-$version.tar.?z*
cd $app-$version
fixbuilddirpermissions
applypatch $srcdir/pkgconfig-whitespace.patch
}
build() {
@ -28,10 +29,11 @@ build() {
--no-system-bzip2 \
--no-system-libarchive \
--no-qt-gui \
--parallel="$para"
--parallel="$para" \
--generator=Ninja
make
make install DESTDIR=$pkg
ninja
DESTDIR=$pkg ninja install
cp Licenses/* Copyright.txt $pkgdocs/
@ -39,5 +41,6 @@ build() {
}
sha512sums="
30b886e39df4d0bcc613a2d83b7f07537b45ca5d91375bbf4d8481bec0e0ff1226180f5491318d05438837ab27e4f89c9d25735ce22389c5d6bdf86edd48231a cmake-3.26.4.tar.lz
875b8a67ace104977367d1cb0984307161263c2dd5c36cb4a6af82c2d88fa250a53dd683f234807b28a9b846d2a0dfef225ed02e9feb61960d2999e090118f11 cmake-3.27.7.tar.lz
675c27a8ef1445381fdb20da354621f232964484e9806ba17f67b5840f2e132baf51db3007f8aa580bd68ef48ef76c0a10e155bb68890b3cbb821ffab660cd34 pkgconfig-whitespace.patch
"

37
base/cmake/pkgconfig-whitespace.patch Normal file
View file

@ -0,0 +1,37 @@
Patch-Source: https://gitlab.kitware.com/cmake/cmake/-/commit/9beb4dd8a752e3c9ea0e19152b85f68b0f96d7c6
From d47771bbb96a8435401950fb504b06003ec0babb Mon Sep 17 00:00:00 2001
From: Paul Zander <negril.nx@gmail.com>
Date: Sat, 9 Sep 2023 13:45:19 +0200
Subject: [PATCH] FindPkgConfig: ignore whitespace separators in version check
The regex used to split up the version if it contains an operator fails
if the string contains whitespaces. Resulting in an extra whitespace
after the package name and before the package version leading to
breakage in pkgconf and thus webkit-gtk.
See:
https://github.com/pkgconf/pkgconf/issues/317
https://bugs.webkit.org/show_bug.cgi?id=261125
https://bugs.gentoo.org/913644
---
Modules/FindPkgConfig.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index 4d29f4505c..6e8b78441a 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -563,8 +563,8 @@ macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cma
foreach (_pkg_check_modules_pkg ${_pkg_check_modules_list})
set(_pkg_check_modules_exist_query)
- # check whether version is given
- if (_pkg_check_modules_pkg MATCHES "(.*[^><])(=|[><]=?)(.*)")
+ # check whether version is given while ignoring whitespace
+ if (_pkg_check_modules_pkg MATCHES "(.*[^>< \t])[ \t]*(=|[><]=?)[ \t]*(.*)")
set(_pkg_check_modules_pkg_name "${CMAKE_MATCH_1}")
set(_pkg_check_modules_pkg_op "${CMAKE_MATCH_2}")
set(_pkg_check_modules_pkg_ver "${CMAKE_MATCH_3}")
--
GitLab

6
base/glib/glib.SMBuild
View file

@ -1,6 +1,6 @@
# Maintainer: PktSurf <smlinux@pktsurf.in>
app=glib
version=2.76.3
version=2.78.1
build=1sml
homepage="https://gitlab.gnome.org/GNOME/glib"
download="https://download.gnome.org/sources/glib/2.66/glib-$version.tar.xz"
@ -34,5 +34,5 @@ build() {
}
sha512sums="
25b6efe33ad206f05c3bd3981fe58c3cb6b399dae9fc4b31160a241fbbdb114c594a3d9d2f408b7b0965011177b7bb141fe52f32e0e66551b719d012ba7daef3 glib-2.76.3.tar.lz
"
417177f991fc449308135d6390a4c887a02718c32ba8a3699126d2f2d2b3225fb34946c47ae32895232e1e0df65ae3a9643ed7bc9c6d0a42c0847ab8e134a1a3 glib-2.78.1.tar.lz
"

8
base/libvpx/libvpx.SMBuild
View file

@ -1,7 +1,7 @@
# Maintainer: PktSurf <smlinux@pktsurf.in>
app=libvpx
version=1.8.2
build=2sml
version=1.10.0
build=1sml
homepage="https://github.com/webmproject/libvpx"
download="https://github.com/webmproject/libvpx/archive/refs/tags/v$version.tar.gz"
desc="provides the WebM VP8/VP9 codec libraries"
@ -35,5 +35,5 @@ build() {
}
sha512sums="
2f038cf1f3306ca70c6888d9bf9853dcb0f97bfca0fa28963596da4cf39939a4e2e67e0363c674326c17dbb562ce92a5ee39131881a39d88fd2588980d3f3d0f libvpx-1.8.2.tar.lz
"
ee9993a0db857f6bf8279105cd78e0f635855b6b4f1a080ccb15a78db5ad4075e30679e9c6714706e3830e644fc2503d56d4d34d1367403fb4f818e009f6f5b8 libvpx-1.10.0.tar.lz
"

4
base/llvm/llvm.SMBuild
View file

@ -1,7 +1,7 @@
# Maintainer: PktSurf <smlinux@pktsurf.in>
app=llvm
version=15.0.7
build=1sml
build=2sml
homepage="http://llvm.org/"
download="https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/llvm-$version.src.tar.xz"
desc="LLVM compiler toolkit"
@ -52,7 +52,7 @@ build() {
# Set build targets
if [[ $arch = x86_64 ]] ; then
buildtarget='X86'
buildtarget='X86;AMDGPU;BPF'
elif [[ $arch = aarch64 ]] ; then
buildtarget="AArch64"
fi

345
extra/ffmpegthumbnailer/ffmpeg5.patch Normal file
View file

@ -0,0 +1,345 @@
Patch-Source: https://github.com/dirkvdb/ffmpegthumbnailer/commit/efb5b618f1c1471c1a7900aed3a59d851ea9a210
Patch-Source: https://github.com/dirkvdb/ffmpegthumbnailer/pull/198
From 67be4abd22b726e277c4b67bfb3abf5a65cfd9b5 Mon Sep 17 00:00:00 2001
From: Zane van Iperen <zane@zanevaniperen.com>
Date: Mon, 15 Mar 2021 17:23:23 +1000
Subject: [PATCH 1/9] lib/moviedecoder: remove unused variable
---
libffmpegthumbnailer/moviedecoder.cpp | 2 --
1 file changed, 2 deletions(-)
diff --git a/libffmpegthumbnailer/moviedecoder.cpp b/libffmpegthumbnailer/moviedecoder.cpp
index 290e212..aa44adf 100644
--- a/libffmpegthumbnailer/moviedecoder.cpp
+++ b/libffmpegthumbnailer/moviedecoder.cpp
@@ -570,8 +570,6 @@ bool MovieDecoder::getVideoPacket()
bool framesAvailable = true;
bool frameDecoded = false;
- int attempts = 0;
-
if (m_pPacket)
{
av_packet_unref(m_pPacket);
From 66f64668e7a063e790813c7733ca438ab112af89 Mon Sep 17 00:00:00 2001
From: Zane van Iperen <zane@zanevaniperen.com>
Date: Mon, 15 Mar 2021 17:42:07 +1000
Subject: [PATCH 2/9] lib/moviedecoder: clang-tidy fixes
---
libffmpegthumbnailer/moviedecoder.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libffmpegthumbnailer/moviedecoder.cpp b/libffmpegthumbnailer/moviedecoder.cpp
index aa44adf..79c950b 100644
--- a/libffmpegthumbnailer/moviedecoder.cpp
+++ b/libffmpegthumbnailer/moviedecoder.cpp
@@ -503,12 +503,12 @@ void MovieDecoder::seek(int timeInSeconds)
avcodec_flush_buffers(m_pFormatContext->streams[m_VideoStream]->codec);
int keyFrameAttempts = 0;
- bool gotFrame = 0;
+ bool gotFrame;
do
{
int count = 0;
- gotFrame = 0;
+ gotFrame = false;
while (!gotFrame && count < 20)
{
From 96c22aa66719846854895afcb72962862d5a4ffd Mon Sep 17 00:00:00 2001
From: Zane van Iperen <zane@zanevaniperen.com>
Date: Mon, 15 Mar 2021 20:39:32 +1000
Subject: [PATCH 3/9] lib/moviedecoder: remove SilenceLogLevel
Was unused.
---
libffmpegthumbnailer/moviedecoder.cpp | 5 -----
1 file changed, 5 deletions(-)
diff --git a/libffmpegthumbnailer/moviedecoder.cpp b/libffmpegthumbnailer/moviedecoder.cpp
index 79c950b..21df096 100644
--- a/libffmpegthumbnailer/moviedecoder.cpp
+++ b/libffmpegthumbnailer/moviedecoder.cpp
@@ -41,11 +41,6 @@ using namespace std;
namespace ffmpegthumbnailer
{
-struct SilenceLogLevel
-{
- SilenceLogLevel() { av_log_set_level(AV_LOG_QUIET); }
-};
-
MovieDecoder::MovieDecoder(AVFormatContext* pavContext)
: m_VideoStream(-1)
, m_pFormatContext(pavContext)
From 664680f4bfeb89923f485eba270f9e49a8d02bfc Mon Sep 17 00:00:00 2001
From: Zane van Iperen <zane@zanevaniperen.com>
Date: Mon, 15 Mar 2021 17:25:40 +1000
Subject: [PATCH 4/9] lib/moviedecoder: remove registration calls
They're not needed anymore.
---
libffmpegthumbnailer/moviedecoder.cpp | 4 ----
1 file changed, 4 deletions(-)
diff --git a/libffmpegthumbnailer/moviedecoder.cpp b/libffmpegthumbnailer/moviedecoder.cpp
index 21df096..ac3e5b9 100644
--- a/libffmpegthumbnailer/moviedecoder.cpp
+++ b/libffmpegthumbnailer/moviedecoder.cpp
@@ -65,8 +65,6 @@ MovieDecoder::~MovieDecoder()
void MovieDecoder::initialize(const string& filename, bool preferEmbeddedMetadata)
{
- av_register_all();
- avcodec_register_all();
avformat_network_init();
string inputFile = filename == "-" ? "pipe:" : filename;
@@ -386,8 +384,6 @@ void MovieDecoder::initializeFilterGraph(const AVRational& timeBase, const std::
auto del = [] (AVBufferSinkParams* p) { av_freep(p); };
std::unique_ptr<AVBufferSinkParams, decltype(del)> buffersinkParams(av_buffersink_params_alloc(), del);
- avfilter_register_all();
-
m_pFilterGraph = avfilter_graph_alloc();
assert(m_pFilterGraph);
From 1ae42e664e1f3c915d186ae00aa2c8018b998708 Mon Sep 17 00:00:00 2001
From: Zane van Iperen <zane@zanevaniperen.com>
Date: Mon, 15 Mar 2021 17:30:21 +1000
Subject: [PATCH 5/9] lib/moviedecoder: remove use of AVBufferSinkParams
---
libffmpegthumbnailer/moviedecoder.cpp | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/libffmpegthumbnailer/moviedecoder.cpp b/libffmpegthumbnailer/moviedecoder.cpp
index ac3e5b9..dece668 100644
--- a/libffmpegthumbnailer/moviedecoder.cpp
+++ b/libffmpegthumbnailer/moviedecoder.cpp
@@ -379,11 +379,6 @@ std::string MovieDecoder::createScaleString(const std::string& sizeString, bool
void MovieDecoder::initializeFilterGraph(const AVRational& timeBase, const std::string& size, bool maintainAspectRatio)
{
- static const AVPixelFormat pixelFormats[] = { AV_PIX_FMT_RGB24, AV_PIX_FMT_NONE };
-
- auto del = [] (AVBufferSinkParams* p) { av_freep(p); };
- std::unique_ptr<AVBufferSinkParams, decltype(del)> buffersinkParams(av_buffersink_params_alloc(), del);
-
m_pFilterGraph = avfilter_graph_alloc();
assert(m_pFilterGraph);
@@ -395,10 +390,8 @@ void MovieDecoder::initializeFilterGraph(const AVRational& timeBase, const std::
checkRc(avfilter_graph_create_filter(&m_pFilterSource, avfilter_get_by_name("buffer"), "thumb_buffer", ss.str().c_str(), nullptr, m_pFilterGraph),
"Failed to create filter source");
- buffersinkParams->pixel_fmts = pixelFormats;
- checkRc(avfilter_graph_create_filter(&m_pFilterSink, avfilter_get_by_name("buffersink"), "thumb_buffersink", nullptr, buffersinkParams.get(), m_pFilterGraph),
+ checkRc(avfilter_graph_create_filter(&m_pFilterSink, avfilter_get_by_name("buffersink"), "thumb_buffersink", nullptr, nullptr, m_pFilterGraph),
"Failed to create filter sink");
- buffersinkParams.release();
AVFilterContext* yadifFilter = nullptr;
if (m_pFrame->interlaced_frame != 0)
From 19675349662a4ea4455d7d13b01cca28ab585762 Mon Sep 17 00:00:00 2001
From: Zane van Iperen <zane@zanevaniperen.com>
Date: Mon, 15 Mar 2021 17:39:58 +1000
Subject: [PATCH 6/9] lib/moviedecoder: use m_pVideoCodecContext instead of
AVStream::codec
---
libffmpegthumbnailer/moviedecoder.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libffmpegthumbnailer/moviedecoder.cpp b/libffmpegthumbnailer/moviedecoder.cpp
index dece668..0b7a280 100644
--- a/libffmpegthumbnailer/moviedecoder.cpp
+++ b/libffmpegthumbnailer/moviedecoder.cpp
@@ -484,7 +484,7 @@ void MovieDecoder::seek(int timeInSeconds)
}
checkRc(av_seek_frame(m_pFormatContext, -1, timestamp, 0), "Seeking in video failed");
- avcodec_flush_buffers(m_pFormatContext->streams[m_VideoStream]->codec);
+ avcodec_flush_buffers(m_pVideoCodecContext);
int keyFrameAttempts = 0;
bool gotFrame;
From 4f74f83a009fa2b3f3d546adb24d4f1406910007 Mon Sep 17 00:00:00 2001
From: Zane van Iperen <zane@zanevaniperen.com>
Date: Mon, 15 Mar 2021 17:49:03 +1000
Subject: [PATCH 7/9] lib/moviedecoder: codec -> codecpar
---
libffmpegthumbnailer/moviedecoder.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libffmpegthumbnailer/moviedecoder.cpp b/libffmpegthumbnailer/moviedecoder.cpp
index 0b7a280..e58904e 100644
--- a/libffmpegthumbnailer/moviedecoder.cpp
+++ b/libffmpegthumbnailer/moviedecoder.cpp
@@ -145,10 +145,10 @@ int32_t MovieDecoder::findPreferedVideoStream(bool preferEmbeddedMetadata)
for (unsigned int i = 0; i < m_pFormatContext->nb_streams; ++i)
{
AVStream *stream = m_pFormatContext->streams[i];
- auto ctx = m_pFormatContext->streams[i]->codec;
- if (ctx->codec_type == AVMEDIA_TYPE_VIDEO)
+ auto par = m_pFormatContext->streams[i]->codecpar;
+ if (par->codec_type == AVMEDIA_TYPE_VIDEO)
{
- if (!preferEmbeddedMetadata || !isStillImageCodec(ctx->codec_id))
+ if (!preferEmbeddedMetadata || !isStillImageCodec(par->codec_id))
{
videoStreams.push_back(i);
continue;
From 3ffdd65cbda6ef21d36c96013db1b0f4dc9fc57b Mon Sep 17 00:00:00 2001
From: Zane van Iperen <zane@zanevaniperen.com>
Date: Mon, 15 Mar 2021 17:52:01 +1000
Subject: [PATCH 8/9] lib/movedecoder: don't rely on avformat to allocate a
context
---
libffmpegthumbnailer/moviedecoder.cpp | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/libffmpegthumbnailer/moviedecoder.cpp b/libffmpegthumbnailer/moviedecoder.cpp
index e58904e..da5f32a 100644
--- a/libffmpegthumbnailer/moviedecoder.cpp
+++ b/libffmpegthumbnailer/moviedecoder.cpp
@@ -90,8 +90,7 @@ void MovieDecoder::destroy()
{
if (m_pVideoCodecContext)
{
- avcodec_close(m_pVideoCodecContext);
- m_pVideoCodecContext = nullptr;
+ avcodec_free_context(&m_pVideoCodecContext);
}
if ((!m_FormatContextWasGiven) && m_pFormatContext)
@@ -196,8 +195,7 @@ void MovieDecoder::initializeVideo(bool preferEmbeddedMetadata)
}
m_pVideoStream = m_pFormatContext->streams[m_VideoStream];
- m_pVideoCodecContext = m_pVideoStream->codec;
- m_pVideoCodec = avcodec_find_decoder(m_pVideoCodecContext->codec_id);
+ m_pVideoCodec = avcodec_find_decoder(m_pVideoStream->codecpar->codec_id);
if (m_pVideoCodec == nullptr)
{
@@ -207,6 +205,20 @@ void MovieDecoder::initializeVideo(bool preferEmbeddedMetadata)
throw logic_error("Video Codec not found");
}
+ m_pVideoCodecContext = avcodec_alloc_context3(m_pVideoCodec);
+
+ if (m_pVideoCodecContext == nullptr)
+ {
+ destroy();
+ throw logic_error("Could not allocate video codec context");
+ }
+
+ if (avcodec_parameters_to_context(m_pVideoCodecContext, m_pVideoStream->codecpar) < 0)
+ {
+ destroy();
+ throw logic_error("Could not configure video codec context");
+ }
+
m_pVideoCodecContext->workaround_bugs = 1;
if (avcodec_open2(m_pVideoCodecContext, m_pVideoCodec, nullptr) < 0)
From f9273852c8e3d7af77d6c8929b1ac6c8a26eca50 Mon Sep 17 00:00:00 2001
From: Zane van Iperen <zane@zanevaniperen.com>
Date: Mon, 15 Mar 2021 20:57:45 +1000
Subject: [PATCH 9/9] lib/moviedecoder: replace avcodec_decode_video2() usage
---
libffmpegthumbnailer/moviedecoder.cpp | 31 +++++++++++++++++++++------
1 file changed, 24 insertions(+), 7 deletions(-)
diff --git a/libffmpegthumbnailer/moviedecoder.cpp b/libffmpegthumbnailer/moviedecoder.cpp
index da5f32a..f32577a 100644
--- a/libffmpegthumbnailer/moviedecoder.cpp
+++ b/libffmpegthumbnailer/moviedecoder.cpp
@@ -548,17 +548,33 @@ bool MovieDecoder::decodeVideoPacket()
return false;
}
- av_frame_unref(m_pFrame);
-
- int frameFinished;
+ int rc = avcodec_send_packet(m_pVideoCodecContext, m_pPacket);
+ if(rc == AVERROR(EAGAIN))
+ {
+ rc = 0;
+ }
- int bytesDecoded = avcodec_decode_video2(m_pVideoCodecContext, m_pFrame, &frameFinished, m_pPacket);
- if (bytesDecoded < 0)
+ if(rc == AVERROR_EOF)
+ {
+ return false;
+ }
+ else if(rc < 0)
{
- throw logic_error("Failed to decode video frame: bytesDecoded < 0");
+ throw logic_error("Failed to decode video frame: avcodec_send_packet() < 0");
}
- return frameFinished > 0;
+ rc = avcodec_receive_frame(m_pVideoCodecContext, m_pFrame);
+ switch(rc)
+ {
+ case 0:
+ return true;
+
+ case AVERROR(EAGAIN):
+ return false;
+
+ default:
+ throw logic_error("Failed to decode video frame: avcodec_receive_frame() < 0");
+ }
}
bool MovieDecoder::getVideoPacket()
@@ -574,6 +590,7 @@ bool MovieDecoder::getVideoPacket()
m_pPacket = new AVPacket();
+
while (framesAvailable && !frameDecoded)
{
framesAvailable = av_read_frame(m_pFormatContext, m_pPacket) >= 0;
From efb5b618f1c1471c1a7900aed3a59d851ea9a210 Mon Sep 17 00:00:00 2001
From: Paul Jonkins <paul.ionkin@gmail.com>
Date: Wed, 23 Jun 2021 17:53:55 +0200
Subject: [PATCH] Constify AVCodec
---
libffmpegthumbnailer/moviedecoder.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libffmpegthumbnailer/moviedecoder.h b/libffmpegthumbnailer/moviedecoder.h
index 3ef5f12..fb6add2 100644
--- a/libffmpegthumbnailer/moviedecoder.h
+++ b/libffmpegthumbnailer/moviedecoder.h
@@ -78,7 +78,7 @@ class MovieDecoder
int m_VideoStream;
AVFormatContext* m_pFormatContext;
AVCodecContext* m_pVideoCodecContext;
- AVCodec* m_pVideoCodec;
+ const AVCodec* m_pVideoCodec;
AVFilterGraph* m_pFilterGraph;
AVFilterContext* m_pFilterSource;
AVFilterContext* m_pFilterSink;

5
extra/ffmpegthumbnailer/ffmpegthumbnailer.SMBuild
View file

@ -14,6 +14,8 @@ prepbuilddir() {
tar xf $srcdir/$app-$version.tar.?z*
cd $app-$version
fixbuilddirpermissions
applypatch $srcdir/ffmpeg5.patch
}
build() {
@ -36,4 +38,5 @@ build() {
sha512sums="
cbfb8ce4eebb0331260b060592322566075862182bc6f4b7410e686b4260395ea64ab341330212bcd08b1889f4fc9da13bf50b45ce800466d5d1e05a08cc722e ffmpegthumbnailer-2.2.2.tar.lz
"
f4a28c49ab4b6c3d740d9c0df47e670cfbeff77889f149762d8509dcf10b3fe67107f00615aadef1d7ee1029f99aaed415b1bbf7dc9b14ac332c17b85e79608c ffmpeg5.patch
"

21
gtk/libwnck3/libwnck3.SMBuild
View file

@ -1,6 +1,6 @@
# Maintainer: PktSurf <smlinux@pktsurf.in>
app=libwnck3
version=3.18.0
version=3.36.0
build=1sml
homepage="https://gitlab.gnome.org/GNOME/libwnck"
download="https://gitlab.gnome.org/GNOME/libwnck/-/archive/$version/libwnck-$version.tar.bz2"
@ -17,21 +17,18 @@ prepbuilddir() {
}
build() {
./configure \
--prefix=
mkdir -p smbuild && cd smbuild
meson .. \
--prefix="/" \
-Dgtk_doc=false
for i in po ; do
printf 'all:\n\ttrue\ninstall:\n\ttrue\nclean:\n\ttrue\n' > "$i"/Makefile
done
make
make install DESTDIR=$pkg
cp COPYING $pkgdocs/
ninja
DESTDIR="$pkg" ninja install
cp ../COPYING $pkgdocs/
mkfinalpkg
}
sha512sums="
adc9d31b1620c10c79eea153b3652f7e61f92ee94f631df4fb1c36c985d3639fb0c3ee6ee852d684f33f31a98654fb02c129f4fe8bbd946bb0dfaf3430ccc090 libwnck-3.18.0.tar.lz
fe860dfe24e3920af3241772d895932fb734cdf11177d80218b6d481cd69c166b973f277268c898bec6418b3acf42b1b8c6f3541ef1a7cea24f5d68c571f17b0 libwnck-3.36.0.tar.lz
"

564
heavybuilds/firefox/allow-custom-rust-vendor.patch
View file

@ -1,564 +0,0 @@
From a5a3db2d32ff1d359aef5ec586b91164570c1685 Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@mozilla.com>
Date: Tue, 5 Nov 2019 09:56:15 -0800
Subject: [PATCH 1/7] Support custom vendor strings.
Add support for custom vendors, as in "x86_64-gentoo-linux-musl".
Fixes #33.
---
src/targets.rs | 108 ++++++++++++++++++++++++++++++++++++++++++++++++-
src/triple.rs | 4 --
2 files changed, 106 insertions(+), 6 deletions(-)
diff --git a/src/targets.rs b/src/targets.rs
index 6ae570e..90b2736 100644
--- a/third_party/rust/target-lexicon-0.9.0/src/targets.rs
+++ b/third_party/rust/target-lexicon-0.9.0/src/targets.rs
@@ -1,6 +1,8 @@
// This file defines all the identifier enums and target-aware logic.
use crate::triple::{Endianness, PointerWidth, Triple};
+use alloc::boxed::Box;
+use alloc::string::String;
use core::fmt;
use core::str::FromStr;
@@ -292,7 +294,7 @@ impl Aarch64Architecture {
/// The "vendor" field, which in practice is little more than an arbitrary
/// modifier.
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
#[allow(missing_docs)]
pub enum Vendor {
Unknown,
@@ -306,6 +308,15 @@ pub enum Vendor {
Sun,
Uwp,
Wrs,
+
+ /// A custom vendor. "Custom" in this context means that the vendor is
+ /// not specifically recognized by upstream Autotools, LLVM, Rust, or other
+ /// relevant authorities on triple naming. It's useful for people building
+ /// and using locally patched toolchains.
+ ///
+ /// Outside of such patched environments, users of `target-lexicon` should
+ /// treat `Custom` the same as `Unknown` and ignore the string.
+ Custom(Box<String>),
}
/// The "operating system" field, which sometimes implies an environment, and
@@ -717,6 +728,7 @@ impl fmt::Display for Vendor {
Vendor::Sun => "sun",
Vendor::Uwp => "uwp",
Vendor::Wrs => "wrs",
+ Vendor::Custom(ref name) => name,
};
f.write_str(s)
}
@@ -738,7 +750,46 @@ impl FromStr for Vendor {
"sun" => Vendor::Sun,
"uwp" => Vendor::Uwp,
"wrs" => Vendor::Wrs,
- _ => return Err(()),
+ custom => {
+ use alloc::borrow::ToOwned;
+
+ // A custom vendor. Since triple syntax is so loosely defined,
+ // be as conservative as we can to avoid potential ambiguities.
+ // We err on the side of being too strict here, as we can
+ // always relax it if needed.
+
+ // Don't allow empty string names.
+ if custom.is_empty() {
+ return Err(());
+ }
+
+ // Don't allow any other recognized name as a custom vendor,
+ // since vendors can be omitted in some contexts.
+ if Architecture::from_str(custom).is_ok()
+ || OperatingSystem::from_str(custom).is_ok()
+ || Environment::from_str(custom).is_ok()
+ || BinaryFormat::from_str(custom).is_ok()
+ {
+ return Err(());
+ }
+
+ // Require the first character to be an ascii lowercase.
+ if !custom.chars().nth(0).unwrap().is_ascii_lowercase() {
+ return Err(());
+ }
+
+ // Restrict the set of characters permitted in a custom vendor.
+ if custom
+ .find(|c: char| {
+ !(c.is_ascii_lowercase() || c.is_ascii_digit() || c == '_' || c == '.')
+ })
+ .is_some()
+ {
+ return Err(());
+ }
+
+ Vendor::Custom(Box::new(custom.to_owned()))
+ }
})
}
}
@@ -1120,4 +1171,57 @@ mod tests {
assert_eq!(t.environment, Environment::Eabihf);
assert_eq!(t.binary_format, BinaryFormat::Elf);
}
+
+ #[test]
+ fn custom_vendors() {
+ assert!(Triple::from_str("x86_64--linux").is_err());
+ assert!(Triple::from_str("x86_64-42-linux").is_err());
+ assert!(Triple::from_str("x86_64-__customvendor__-linux").is_err());
+ assert!(Triple::from_str("x86_64-^-linux").is_err());
+ assert!(Triple::from_str("x86_64- -linux").is_err());
+ assert!(Triple::from_str("x86_64-CustomVendor-linux").is_err());
+ assert!(Triple::from_str("x86_64-linux-linux").is_err());
+ assert!(Triple::from_str("x86_64-x86_64-linux").is_err());
+ assert!(Triple::from_str("x86_64-elf-linux").is_err());
+ assert!(Triple::from_str("x86_64-gnu-linux").is_err());
+ assert!(Triple::from_str("x86_64-linux-customvendor").is_err());
+ assert!(Triple::from_str("customvendor").is_err());
+ assert!(Triple::from_str("customvendor-x86_64").is_err());
+ assert!(Triple::from_str("x86_64-").is_err());
+ assert!(Triple::from_str("x86_64--").is_err());
+
+ let t = Triple::from_str("x86_64-customvendor-linux")
+ .expect("can't parse target with custom vendor");
+ assert_eq!(t.architecture, Architecture::X86_64);
+ assert_eq!(
+ t.vendor,
+ Vendor::Custom(Box::new(String::from_str("customvendor").unwrap()))
+ );
+ assert_eq!(t.operating_system, OperatingSystem::Linux);
+ assert_eq!(t.environment, Environment::Unknown);
+ assert_eq!(t.binary_format, BinaryFormat::Elf);
+ assert_eq!(t.to_string(), "x86_64-customvendor-linux");
+
+ let t = Triple::from_str("x86_64-customvendor")
+ .expect("can't parse target with custom vendor");
+ assert_eq!(t.architecture, Architecture::X86_64);
+ assert_eq!(
+ t.vendor,
+ Vendor::Custom(Box::new(String::from_str("customvendor").unwrap()))
+ );
+ assert_eq!(t.operating_system, OperatingSystem::Unknown);
+ assert_eq!(t.environment, Environment::Unknown);
+ assert_eq!(t.binary_format, BinaryFormat::Unknown);
+
+ assert_eq!(
+ Triple::from_str("unknown-foo"),
+ Ok(Triple {
+ architecture: Architecture::Unknown,
+ vendor: Vendor::Custom(Box::new(String::from_str("foo").unwrap())),
+ operating_system: OperatingSystem::Unknown,
+ environment: Environment::Unknown,
+ binary_format: BinaryFormat::Unknown,
+ })
+ );
+ }
}
diff --git a/src/triple.rs b/src/triple.rs
index 36dcd9a..1abda26 100644
--- a/third_party/rust/target-lexicon.0.9.0/src/triple.rs
+++ b/third_party/rust/target-lexicon-0.9.0/src/triple.rs
@@ -322,10 +322,6 @@ mod tests {
Triple::from_str("foo"),
Err(ParseError::UnrecognizedArchitecture("foo".to_owned()))
);
- assert_eq!(
- Triple::from_str("unknown-foo"),
- Err(ParseError::UnrecognizedVendor("foo".to_owned()))
- );
assert_eq!(
Triple::from_str("unknown-unknown-foo"),
Err(ParseError::UnrecognizedOperatingSystem("foo".to_owned()))
From 6f90d7274dce4e7f9bb120f6b36cf26881bde9a7 Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@mozilla.com>
Date: Tue, 5 Nov 2019 10:33:56 -0800
Subject: [PATCH 2/7] Add more tests.
---
src/targets.rs | 30 ++++++++++++++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/targets.rs b/src/targets.rs
index 90b2736..7d1f069 100644
--- a/third_party/rust/target-lexicon-0.9.0/src/targets.rs
+++ b/third_party/rust/target-lexicon-0.9.0/src/targets.rs
@@ -1174,6 +1174,7 @@ mod tests {
#[test]
fn custom_vendors() {
+ // Test various invalid cases.
assert!(Triple::from_str("x86_64--linux").is_err());
assert!(Triple::from_str("x86_64-42-linux").is_err());
assert!(Triple::from_str("x86_64-__customvendor__-linux").is_err());
@@ -1190,6 +1191,31 @@ mod tests {
assert!(Triple::from_str("x86_64-").is_err());
assert!(Triple::from_str("x86_64--").is_err());
+ // Test various Unicode things.
+ assert!(
+ Triple::from_str("x86_64-𝓬𝓾𝓼𝓽𝓸𝓶𝓿𝓮𝓷𝓭𝓸𝓻-linux").is_err(),
+ "unicode font hazard"
+ );
+ assert!(
+ Triple::from_str("x86_64-ćúśtőḿvéńdőŕ-linux").is_err(),
+ "diacritical mark stripping hazard"
+ );
+ assert!(
+ Triple::from_str("x86_64-customvendοr-linux").is_err(),
+ "homoglyph hazard"
+ );
+ assert!(Triple::from_str("x86_64-customvendor-linux").is_ok());
+ assert!(
+ Triple::from_str("x86_64-ffi-linux").is_err(),
+ "normalization hazard"
+ );
+ assert!(Triple::from_str("x86_64-ffi-linux").is_ok());
+ assert!(
+ Triple::from_str("x86_64-custom‍vendor-linux").is_err(),
+ "zero-width character hazard"
+ );
+
+ // Test some valid cases.
let t = Triple::from_str("x86_64-customvendor-linux")
.expect("can't parse target with custom vendor");
assert_eq!(t.architecture, Architecture::X86_64);
@@ -1202,8 +1228,8 @@ mod tests {
assert_eq!(t.binary_format, BinaryFormat::Elf);
assert_eq!(t.to_string(), "x86_64-customvendor-linux");
- let t = Triple::from_str("x86_64-customvendor")
- .expect("can't parse target with custom vendor");
+ let t =
+ Triple::from_str("x86_64-customvendor").expect("can't parse target with custom vendor");
assert_eq!(t.architecture, Architecture::X86_64);
assert_eq!(
t.vendor,
From c0e318b3c1be2d1965579f07dd563fb9cc0c4eb1 Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@mozilla.com>
Date: Tue, 5 Nov 2019 12:56:31 -0800
Subject: [PATCH 3/7] Use `.chars().any(...)` instead of
`.find(...).is_some()`.
---
src/targets.rs | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/targets.rs b/src/targets.rs
index 7d1f069..1078dd3 100644
--- a/third_party/rust/target-lexicon-0.9.0/src/targets.rs
+++ b/third_party/rust/target-lexicon/src-0.9.0/targets.rs
@@ -779,12 +779,9 @@ impl FromStr for Vendor {
}
// Restrict the set of characters permitted in a custom vendor.
- if custom
- .find(|c: char| {
- !(c.is_ascii_lowercase() || c.is_ascii_digit() || c == '_' || c == '.')
- })
- .is_some()
- {
+ if custom.chars().any(|c: char| {
+ !(c.is_ascii_lowercase() || c.is_ascii_digit() || c == '_' || c == '.')
+ }) {
return Err(());
}
From f319950528654c772193d9eb3bf40bc8df35fcae Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@mozilla.com>
Date: Thu, 7 Nov 2019 15:15:48 -0800
Subject: [PATCH 4/7] Fix build.rs to generate the correct code to build
Vendors.
---
build.rs | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/build.rs b/build.rs
index a0ba3b7..446f9e7 100644
--- a/third_party/rust/target-lexicon-0.9.0/build.rs
+++ b/third_party/rust/target-lexicon-0.9.0/build.rs
@@ -32,6 +32,7 @@ mod parse_error {
}
}
+use self::targets::Vendor;
use self::triple::Triple;
fn main() {
@@ -60,7 +61,7 @@ fn write_host_rs(mut out: File, triple: Triple) -> io::Result<()> {
" architecture: Architecture::{:?},",
triple.architecture
)?;
- writeln!(out, " vendor: Vendor::{:?},", triple.vendor)?;
+ writeln!(out, " vendor: {},", vendor_display(&triple.vendor))?;
writeln!(
out,
" operating_system: OperatingSystem::{:?},",
@@ -90,7 +91,7 @@ fn write_host_rs(mut out: File, triple: Triple) -> io::Result<()> {
writeln!(out, "impl Vendor {{")?;
writeln!(out, " /// Return the vendor for the current host.")?;
writeln!(out, " pub const fn host() -> Self {{")?;
- writeln!(out, " Vendor::{:?}", triple.vendor)?;
+ writeln!(out, " {}", vendor_display(&triple.vendor))?;
writeln!(out, " }}")?;
writeln!(out, "}}")?;
writeln!(out)?;
@@ -160,3 +161,12 @@ fn write_host_rs(mut out: File, triple: Triple) -> io::Result<()> {
Ok(())
}
+
+fn vendor_display(vendor: &Vendor) -> String {
+ match vendor {
+ Vendor::Custom(custom) => {
+ format!("Vendor::Custom(Box::new(String::from_str({:?})))", custom)
+ }
+ known => format!("Vendor::{:?}", known),
+ }
+}
From e558f6934535be3b8ccc9a99a33e861cb7431dfe Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@mozilla.com>
Date: Fri, 8 Nov 2019 12:10:34 -0800
Subject: [PATCH 5/7] Fix custom vendors in `const fn` contexts.
---
build.rs | 15 +++++++++++----
src/lib.rs | 4 ++--
src/targets.rs | 51 ++++++++++++++++++++++++++++++++++++++++++--------
3 files changed, 56 insertions(+), 14 deletions(-)
diff --git a/build.rs b/build.rs
index 446f9e7..e88206e 100644
--- a/third_party/rust/target-lexicon-0.9.0/build.rs
+++ b/third_party/rust/target-lexicon-0.9.0/build.rs
@@ -53,6 +53,8 @@ fn write_host_rs(mut out: File, triple: Triple) -> io::Result<()> {
writeln!(out, "use crate::Aarch64Architecture::*;")?;
writeln!(out, "#[allow(unused_imports)]")?;
writeln!(out, "use crate::ArmArchitecture::*;")?;
+ writeln!(out, "#[allow(unused_imports)]")?;
+ writeln!(out, "use crate::CustomVendor;")?;
writeln!(out)?;
writeln!(out, "/// The `Triple` of the current host.")?;
writeln!(out, "pub const HOST: Triple = Triple {{")?;
@@ -139,7 +141,11 @@ fn write_host_rs(mut out: File, triple: Triple) -> io::Result<()> {
" architecture: Architecture::{:?},",
triple.architecture
)?;
- writeln!(out, " vendor: Vendor::{:?},", triple.vendor)?;
+ writeln!(
+ out,
+ " vendor: {},",
+ vendor_display(&triple.vendor)
+ )?;
writeln!(
out,
" operating_system: OperatingSystem::{:?},",
@@ -164,9 +170,10 @@ fn write_host_rs(mut out: File, triple: Triple) -> io::Result<()> {
fn vendor_display(vendor: &Vendor) -> String {
match vendor {
- Vendor::Custom(custom) => {
- format!("Vendor::Custom(Box::new(String::from_str({:?})))", custom)
- }
+ Vendor::Custom(custom) => format!(
+ "Vendor::Custom(CustomVendor::Static({:?}))",
+ custom.as_str()
+ ),
known => format!("Vendor::{:?}", known),
}
}
diff --git a/src/lib.rs b/src/lib.rs
index 8d6da8d..70f6488 100644
--- a/third_party/rust/target-lexicon-0.9.0/src/lib.rs
+++ b/third_party/rust/target-lexicon-0.9.0/src/lib.rs
@@ -28,7 +28,7 @@ mod triple;
pub use self::host::HOST;
pub use self::parse_error::ParseError;
pub use self::targets::{
- Aarch64Architecture, Architecture, ArmArchitecture, BinaryFormat, Environment, OperatingSystem,
- Vendor,
+ Aarch64Architecture, Architecture, ArmArchitecture, BinaryFormat, CustomVendor, Environment,
+ OperatingSystem, Vendor,
};
pub use self::triple::{CallingConvention, Endianness, PointerWidth, Triple};
diff --git a/src/targets.rs b/src/targets.rs
index 1078dd3..7152020 100644
--- a/third_party/rust/target-lexicon-0.9.0/src/targets.rs
+++ b/third_party/rust/target-lexicon-0.9.0/src/targets.rs
@@ -4,6 +4,7 @@ use crate::triple::{Endianness, PointerWidth, Triple};
use alloc::boxed::Box;
use alloc::string::String;
use core::fmt;
+use core::hash::{Hash, Hasher};
use core::str::FromStr;
/// The "architecture" field, which in some cases also specifies a specific
@@ -292,6 +293,39 @@ impl Aarch64Architecture {
}
}
+/// A string for a `Vendor::Custom` that can either be used in `const`
+/// contexts or hold dynamic strings.
+#[derive(Clone, Debug, Eq)]
+pub enum CustomVendor {
+ /// An owned `String`. This supports the general case.
+ Owned(Box<String>),
+ /// A static `str`, so that `CustomVendor` can be constructed in `const`
+ /// contexts.
+ Static(&'static str),
+}
+
+impl CustomVendor {
+ /// Extracts a string slice.
+ pub fn as_str(&self) -> &str {
+ match self {
+ CustomVendor::Owned(s) => s,
+ CustomVendor::Static(s) => s,
+ }
+ }
+}
+
+impl PartialEq for CustomVendor {
+ fn eq(&self, other: &Self) -> bool {
+ self.as_str() == other.as_str()
+ }
+}
+
+impl Hash for CustomVendor {
+ fn hash<H: Hasher>(&self, state: &mut H) {
+ self.as_str().hash(state)
+ }
+}
+
/// The "vendor" field, which in practice is little more than an arbitrary
/// modifier.
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
@@ -316,7 +350,7 @@ pub enum Vendor {
///
/// Outside of such patched environments, users of `target-lexicon` should
/// treat `Custom` the same as `Unknown` and ignore the string.
- Custom(Box<String>),
+ Custom(CustomVendor),
}
/// The "operating system" field, which sometimes implies an environment, and
@@ -728,7 +762,7 @@ impl fmt::Display for Vendor {
Vendor::Sun => "sun",
Vendor::Uwp => "uwp",
Vendor::Wrs => "wrs",
- Vendor::Custom(ref name) => name,
+ Vendor::Custom(ref name) => name.as_str(),
};
f.write_str(s)
}
@@ -779,13 +813,14 @@ impl FromStr for Vendor {
}
// Restrict the set of characters permitted in a custom vendor.
- if custom.chars().any(|c: char| {
+ fn is_prohibited_char(c: char) -> bool {
!(c.is_ascii_lowercase() || c.is_ascii_digit() || c == '_' || c == '.')
- }) {
+ }
+ if custom.chars().any(is_prohibited_char) {
return Err(());
}
- Vendor::Custom(Box::new(custom.to_owned()))
+ Vendor::Custom(CustomVendor::Owned(Box::new(custom.to_owned())))
}
})
}
@@ -1218,7 +1253,7 @@ mod tests {
assert_eq!(t.architecture, Architecture::X86_64);
assert_eq!(
t.vendor,
- Vendor::Custom(Box::new(String::from_str("customvendor").unwrap()))
+ Vendor::Custom(CustomVendor::Static("customvendor"))
);
assert_eq!(t.operating_system, OperatingSystem::Linux);
assert_eq!(t.environment, Environment::Unknown);
@@ -1230,7 +1265,7 @@ mod tests {
assert_eq!(t.architecture, Architecture::X86_64);
assert_eq!(
t.vendor,
- Vendor::Custom(Box::new(String::from_str("customvendor").unwrap()))
+ Vendor::Custom(CustomVendor::Static("customvendor"))
);
assert_eq!(t.operating_system, OperatingSystem::Unknown);
assert_eq!(t.environment, Environment::Unknown);
@@ -1240,7 +1275,7 @@ mod tests {
Triple::from_str("unknown-foo"),
Ok(Triple {
architecture: Architecture::Unknown,
- vendor: Vendor::Custom(Box::new(String::from_str("foo").unwrap())),
+ vendor: Vendor::Custom(CustomVendor::Static("foo")),
operating_system: OperatingSystem::Unknown,
environment: Environment::Unknown,
binary_format: BinaryFormat::Unknown,
From bc4b444133b8a5e56602f7c77c10ef3f1e7a7c78 Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@mozilla.com>
Date: Mon, 18 Nov 2019 13:45:58 -0800
Subject: [PATCH 6/7] Add a testcase with a BOM too, just in case.
---
src/targets.rs | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/targets.rs b/src/targets.rs
index 7152020..9a4d990 100644
--- a/third_party/rust/target-lexicon-0.9.0/src/targets.rs
+++ b/third_party/rust/target-lexicon-0.9.0/src/targets.rs
@@ -1246,6 +1246,10 @@ mod tests {
Triple::from_str("x86_64-custom‍vendor-linux").is_err(),
"zero-width character hazard"
);
+ assert!(
+ Triple::from_str("x86_64-customvendor-linux").is_err(),
+ "BOM hazard"
+ );
// Test some valid cases.
let t = Triple::from_str("x86_64-customvendor-linux")
From 721fbbe1c9cfd3adc9aaf011c62d6a36078f4133 Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@mozilla.com>
Date: Mon, 18 Nov 2019 20:56:40 -0800
Subject: [PATCH 7/7] Use an anonymous function instead of just a local
function.
---
src/targets.rs | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/targets.rs b/src/targets.rs
index 9a4d990..eb5a088 100644
--- a/third_party/rust/target-lexicon-0.9.0/src/targets.rs
+++ b/third_party/rust/target-lexicon-0.9.0/src/targets.rs
@@ -813,10 +813,9 @@ impl FromStr for Vendor {
}
// Restrict the set of characters permitted in a custom vendor.
- fn is_prohibited_char(c: char) -> bool {
+ if custom.chars().any(|c: char| {
!(c.is_ascii_lowercase() || c.is_ascii_digit() || c == '_' || c == '.')
- }
- if custom.chars().any(is_prohibited_char) {
+ }) {
return Err(());
}

61
heavybuilds/firefox/audio-lfs64.patch Normal file
View file

@ -0,0 +1,61 @@
--- a/third_party/rust/audio_thread_priority/src/rt_linux.rs
+++ b/third_party/rust/audio_thread_priority/src/rt_linux.rs
@@ -112,7 +112,7 @@
/// Returns the maximum priority, maximum real-time time slice, and the current real-time time
/// slice for this process.
-fn get_limits() -> Result<(i64, u64, libc::rlimit64), AudioThreadPriorityError> {
+fn get_limits() -> Result<(i64, u64, libc::rlimit), AudioThreadPriorityError> {
let c = Connection::get_private(BusType::System)?;
let p = Props::new(
@@ -122,7 +122,7 @@
"org.freedesktop.RealtimeKit1",
DBUS_SOCKET_TIMEOUT,
);
- let mut current_limit = libc::rlimit64 {
+ let mut current_limit = libc::rlimit {
rlim_cur: 0,
rlim_max: 0,
};
@@ -141,9 +141,9 @@
));
}
- if unsafe { libc::getrlimit64(libc::RLIMIT_RTTIME, &mut current_limit) } < 0 {
+ if unsafe { libc::getrlimit(libc::RLIMIT_RTTIME, &mut current_limit) } < 0 {
return Err(AudioThreadPriorityError::new_with_inner(
- "getrlimit64",
+ "getrlimit",
Box::new(OSError::last_os_error()),
));
}
@@ -154,13 +154,13 @@
fn set_limits(request: u64, max: u64) -> Result<(), AudioThreadPriorityError> {
// Set a soft limit to the limit requested, to be able to handle going over the limit using
// SIGXCPU. Set the hard limit to the maxium slice to prevent getting SIGKILL.
- let new_limit = libc::rlimit64 {
+ let new_limit = libc::rlimit {
rlim_cur: request,
rlim_max: max,
};
- if unsafe { libc::setrlimit64(libc::RLIMIT_RTTIME, &new_limit) } < 0 {
+ if unsafe { libc::setrlimit(libc::RLIMIT_RTTIME, &new_limit) } < 0 {
return Err(AudioThreadPriorityError::new_with_inner(
- "setrlimit64",
+ "setrlimit",
Box::new(OSError::last_os_error()),
));
}
@@ -296,9 +296,9 @@
match r {
Ok(_) => Ok(handle),
Err(e) => {
- if unsafe { libc::setrlimit64(libc::RLIMIT_RTTIME, &limits) } < 0 {
+ if unsafe { libc::setrlimit(libc::RLIMIT_RTTIME, &limits) } < 0 {
return Err(AudioThreadPriorityError::new_with_inner(
- "setrlimit64",
+ "setrlimit",
Box::new(OSError::last_os_error()),
));
}

15
heavybuilds/firefox/avoid-redefinition.patch
View file

@ -1,15 +0,0 @@
Author: Rasmus Thomsen <oss@cogitri.dev>
Reason: FF is mixing userspace net headers (net/if.h) and kernelspace ones
(linux/if.h), leading to redefinitions. We need to include net/if.h before
linux/if.h because linux/if.h has redifinition guards whereas net/if.h doesnt
Upstream: No
--- a/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c.orig 2020-07-28 19:24:32.359751046 +0200
+++ b/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c 2020-07-28 19:24:37.856343751 +0200
@@ -31,6 +31,7 @@
*/
#if defined(LINUX)
+#include <net/if.h>
#include "addrs-netlink.h"
#include <csi_platform.h>
#include <assert.h>

39
heavybuilds/firefox/disable-neon-in-aom.patch
View file

@ -1,39 +0,0 @@
Firefox (75) and AOM itself fail to build with NEON enabled. As such
we should disable it for now.
In file included from /home/buildozer/aports/community/firefox/src/firefox-75.0/third_party/aom/aom_dsp/arm/blend_a64_mask_neon.c:12:
/home/buildozer/aports/community/firefox/src/firefox-75.0/third_party/aom/av1/common/arm/mem_neon.h: In function 'load_u8_8x8':
/usr/lib/gcc/armv7-alpine-linux-musleabihf/9.3.0/include/arm_neon.h:10303:1: error: inlining failed in call to always_inline 'vld1_u8': target specific option mismatch
10303 | vld1_u8 (const uint8_t * __a)
| ^~~~~~~
--- a/media/libaom/moz.build 2020-04-09 08:20:14.608439591 +0200
+++ b/media/libaom/moz.build 2020-04-09 08:20:21.801745246 +0200
@@ -42,26 +42,6 @@
ASFLAGS += [ '-I%s/media/libaom/config/linux/ia32/' % TOPSRCDIR ]
LOCAL_INCLUDES += [ '/media/libaom/config/linux/ia32/' ]
EXPORTS.aom += [ 'config/linux/ia32/config/aom_config.h' ]
-elif CONFIG['CPU_ARCH'] == 'arm':
- EXPORTS.aom += files['ARM_EXPORTS']
- ASFLAGS += [
- '-I%s/media/libaom/config/linux/arm/' % TOPSRCDIR,
- '-I%s/libaom' % OBJDIR,
- ]
- LOCAL_INCLUDES += [ '/media/libaom/config/linux/arm/' ]
- EXPORTS.aom += [ 'config/linux/arm/config/aom_config.h' ]
-
- SOURCES += files['ARM_SOURCES']
-
- for f in SOURCES:
- if f.endswith('neon.c'):
- SOURCES[f].flags += CONFIG['VPX_ASFLAGS']
-
- if CONFIG['OS_TARGET'] == 'Android':
- # For cpu-features.h
- LOCAL_INCLUDES += [
- '%%%s/sources/android/cpufeatures' % CONFIG['ANDROID_NDK'],
- ]
else:
# Generic C-only configuration
EXPORTS.aom += files['GENERIC_EXPORTS']

18
heavybuilds/firefox/esr-metainfo.patch Normal file
View file

@ -0,0 +1,18 @@
see https://gitlab.alpinelinux.org/alpine/aports/-/issues/13235
--- a/taskcluster/docker/firefox-flatpak/org.mozilla.firefox.appdata.xml.in
+++ b/taskcluster/docker/firefox-flatpak/org.mozilla.firefox.appdata.xml.in
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<application>
- <id type="desktop">org.mozilla.firefox</id>
+ <id type="desktop">org.mozilla.firefox-esr</id>
- <launchable type="desktop-id">org.mozilla.firefox.desktop</launchable>
+ <launchable type="desktop-id">firefox-esr.desktop</launchable>
- <name>Firefox</name>
+ <name>Firefox ESR</name>
<developer_name>Mozilla</developer_name>
- <summary>Fast, Private &amp; Safe Web Browser</summary>
+ <summary>Mozilla Firefox Web Browser Extended Support Release</summary>
<metadata_license>CC0-1.0</metadata_license>
<project_license>MPL-2.0</project_license>
<description>

47
heavybuilds/firefox/firefox.SMBuild
View file

@ -1,6 +1,6 @@
# Maintainer: PktSurf <smlinux@pktsurf.in>
app=firefox
version=102.10.0
version=115.5.0
build=1sml
homepage="http://www.mozilla.org/projects/firefox/"
download="https://archive.mozilla.org/pub/firefox/releases/$version/source/firefox-"$version"esr.source.tar.xz'"
@ -30,18 +30,22 @@ prepbuilddir() {
cd ..
export PATH="$PWD"/AC213/bin:"$PATH"
applypatch $srcdir/allow-custom-rust-vendor.patch
applypatch $srcdir/avoid-redefinition.patch
applypatch $srcdir/audio-lfs64.patch
applypatch $srcdir/disable-moz-stackwalk.patch
applypatch $srcdir/disable-neon-in-aom.patch
applypatch $srcdir/fix-arm-opus-include.patch
applypatch $srcdir/esr-metainfo.patch
applypatch $srcdir/fix-fortify-system-wrappers.patch
applypatch $srcdir/fix-rust-target.patch
applypatch $srcdir/fix-webrtc-glibcisms.patch
applypatch $srcdir/mallinfo.patch
#applypatch $srcdir/icu74.patch
applypatch $srcdir/lfs64.patch
applypatch $srcdir/no-ccache-stats.patch
applypatch $srcdir/python-deps.patch
applypatch $srcdir/rust-lto-thin.patch
applypatch $srcdir/sandbox-fork.patch
applypatch $srcdir/sandbox-largefile.patch
applypatch $srcdir/sandbox-sched_setscheduler.patch
applypatch $srcdir/symboltable.patch
applypatch $srcdir/isnan.patch
cp $srcdir/stab.h toolkit/crashreporter/google-breakpad/src/
@ -50,7 +54,6 @@ prepbuilddir() {
}
clear_vendor_checksums audio_thread_priority
clear_vendor_checksums target-lexicon-0.9.0
}
@ -96,17 +99,7 @@ build() {
--enable-optimize="-O2" \
--disable-profiling \
--enable-ffmpeg \
--enable-system-ffi \
--enable-system-pixman \
--with-system-icu \
--with-system-jpeg \
--with-system-libevent \
--with-system-libvpx \
--with-system-zlib \
--with-system-pixman \
--with-system-webp \
--with-system-nss \
--with-system-nspr \
--allow-addon-sideload \
--enable-linker=lld \
--disable-cargo-incremental \
@ -142,18 +135,22 @@ build() {
sha512sums="
602584f4c77b7a554aaa068eda5409b68eb0b3229e9c224bffb91c83c4314d25de15bd560a323626ff78f6df339c79e1ef8938c54b78ecadf4dc75c5241290ad autoconf-2.13.tar.gz
f2b53c35bdd22a3de6f32699b832babcbf499667197c02dd50cf0b6cd956e0f4471f420938c2ab72f0a0686ed99fe74e3184afe9b5f7169130879b8f8fd99f0b firefox-102.10.0esr.source.tar.xz
4e584621145cf8add069c6dac18e805b3274a1ee402d84e924df2341f7d3c5be261a93ef51283bacbd606f47fbdc628c4323ecc31efc5b403b8d224b18dc278f allow-custom-rust-vendor.patch
b1cb2db3122634f66d2bae7066e76f2dcd455c464e021db4de3b0a08314df95cb667846081682db549dd2af8a00831cabe44a2420c66cdfb5e3b5fa7e6bd21d3 avoid-redefinition.patch
5ee722884cd545cf5146f414526b4547286625f4f5996a409d7f64f115633fb7eb74d202e82f175fd5b2d24cce88deee70020fcb284055fcdea3d39da182074e firefox-115.5.0esr.source.tar.xz
3e0501ae7a650346c667dfdc0ae0ca286084f22e89ab2ac671cc0d7315673dc5b6dcb9f9882f6f39d26e9a31e57f7a0fd53d6b805e520224e22b8976850e2eb8 audio-lfs64.patch
454ea3263cabce099accbdc47aaf83be26a19f8b5a4568c01a7ef0384601cf8315efd86cd917f9c8bf419c2c845db89a905f3ff9a8eb0c8e41042e93aa96a85c disable-moz-stackwalk.patch
55eab1a02e19a19a1ee0e36b11097ab48a44200e07e543d91469967206854f39709c7c0bc31855559528e64642d610868140e9533f1c0e3bebc953353c142fa8 disable-neon-in-aom.patch
b88b312ec14330351fe2d3aef0aef9fa0d533f46dae7ddd1288aa79fc06e9c247147769369a11387988fa0685836135bbfc24000f30d263173361b9c0c5c3c39 fix-arm-opus-include.patch
f7b3b45ba04d05d17439d009bf0c9f27881e126f424e2257552338a0c1e3771ee1289c044babcb0920f62af62873a268c0cf524e1d35711e6dc8b808ca5e9f26 esr-metainfo.patch
2f4f15974d52de4bb273b62a332d13620945d284bbc6fe6bd0a1f58ff7388443bc1d3bf9c82cc31a8527aad92b0cd3a1bc41d0af5e1800e0dcbd7033e58ffd71 fix-fortify-system-wrappers.patch
cd68b89e29e5f6379fbd5679db27b9a5ef70ea65e51c0d0a8137e1f1fd210e35a8cfb047798e9549bc7275606d7ec5c8d8af1335d29da4699db7acd8bc7ff556 fix-rust-target.patch
305c874fdea3096e9c4c6aa6520ac64bb1c347c4b59db8360096646593fe684c3b5377874d91cecd33d56d1410b4714fbdea2b514923723ecbeff79d51265d9b fix-webrtc-glibcisms.patch
a4a3e062661bda64d502d426c480ac9645345860118de9df9ffe6e0597738c70c11e5cdef2d4fd12c5e2ee30a09310159230524655a419a4f7e4eeeb0f3c06b0 mallinfo.patch
afabea91b328c5a68eaa20f9099ac7b2d0e7f2423e816b05ed168bdd326a5684fa02de08bf05c6033e9b888f02775d1b0443a00329b7a632ee399122a391c13a icu74.patch
528cf76e8b00a8c12b99afb2c9bb102aca095b7eab9d224139e36d9dad533fd441d636a950e3c5e36626a5fb9b49fb601601712ce0b30de9d8968385c42340e5 isnan.patch
5fa9382c692e4bd6a2634308f24a6526fd12a60a2563d2090056d43a60505df3ec9881bbf54562e69394467529b3b0dc45955afca46ed329af03cea074fff070 lfs64.patch
c0437a6753f3f350968fa12d250efdfe1bea77baf0e4c06b072b5cc9e78c774dbf4506bc536337030d349fb3ba4460097b75b0c7c5b8fb2d39d8b0a392948936 no-ccache-stats.patch
ff3618223bba2d7b877a16451256e67d973c5f4e24027cb5a7da4c0a6f6a028a1eb51d3cbcddae71bca584a4c13cb485950b86022ea26d4e25ae3fdf3ce5d910 python-deps.patch
1c6918dd6655d3a1251bfd4af2e1c561cbb00d540a883b4c1ebf7f5de530d754d9ac07b4b5f56cdab6c511d25c8910ec94043f5733e97501a67abffe1bafaeb1 rust-lto-thin.patch
2518f2fc75b5db30058e0735f47d60fdf1e7adfaeee4b33fb2afb1bd9a616ce943fd88f4404d0802d4083703f4acf1d5ad42377218d025bc768807fbaf7e1609 sandbox-fork.patch
36ce3c2f97e4b53a627d3dba48a34921eb3fe7303524b8fe59033f3d159ea48bc90869fb555b1774b532f31e5b967fbf76d0305743f462cd9036f43cba7da044 sandbox-largefile.patch
b7d0a6126bdf6c0569f80aabf5b37ed2c7a35712eb8a0404a2d85381552f5555d4f97d213ea26cec6a45dc2785f22439376ed5f8e78b4fd664ef0223307b333e sandbox-largefile.patch
94433c5ffdbe579c456d95c5f053f61fcbab2f652fa90bc69dcc27d9a1507a8e5c677adeadae9a7a75cc9a55184c1040737f4dfd10b279c088ef016561e6f135 sandbox-sched_setscheduler.patch
7c8584c39c8d3d2c8b0bd430fea6d835359580419e6676d06d9f5973c43222de3f314d9f42ee6a492544af5882596dba20373d8fcad9c82d0ce454aa40066e9f symboltable.patch
0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127 stab.h
"
"

11
heavybuilds/firefox/fix-arm-opus-include.patch
View file

@ -1,11 +0,0 @@
--- a/media/libopus/silk/arm/arm_silk_map.c 2019-03-19 20:55:01.249609964 +0100
+++ b/media/libopus/silk/arm/arm_silk_map.c 2019-03-19 20:55:25.769400255 +0100
@@ -28,7 +28,7 @@
# include "config.h"
#endif
-#include "main_FIX.h"
+#include "../fixed/main_FIX.h"
#include "NSQ.h"
#include "SigProc_FIX.h"

31
heavybuilds/firefox/fix-rust-target.patch Normal file
View file

@ -0,0 +1,31 @@
Allow us to just set RUST_TARGEt ourselves instead of hacking around in mozilla's
weird custom build system...
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
@@ -225,7 +225,9 @@
data.setdefault(key, []).append(namespace(rust_target=t, target=info))
return data
-
+@imports('os')
+@imports(_from='mozbuild.util', _import='ensure_unicode')
+@imports(_from='mozbuild.util', _import='system_encoding')
def detect_rustc_target(
host_or_target, compiler_info, arm_target, rust_supported_targets
):
@@ -340,13 +342,13 @@
return None
- rustc_target = find_candidate(candidates)
+ rustc_target = os.environ['RUST_TARGET']
if rustc_target is None:
die("Don't know how to translate {} for rustc".format(host_or_target.alias))
- return rustc_target
+ return ensure_unicode(rustc_target, system_encoding)
@imports('os')

38
heavybuilds/firefox/icu74.patch Normal file
View file

@ -0,0 +1,38 @@
https://bugzilla.mozilla.org/show_bug.cgi?id=1862601
# HG changeset patch
# User André Bargull <andre.bargull@gmail.com>
# Date 1697435923 -7200
# Node ID d5f3b0c4f08a426ce00a153c04e177eecb6820e2
# Parent c63994f8259efdf6e745c960aa9e1409d5477049
Bug xxx - Part 12: Add new line break classes. r?
diff --git a/intl/lwbrk/LineBreaker.cpp b/intl/lwbrk/LineBreaker.cpp
--- a/intl/lwbrk/LineBreaker.cpp
+++ b/intl/lwbrk/LineBreaker.cpp
@@ -443,17 +443,23 @@ static int8_t GetClass(uint32_t u, LineB
/* JT = 34, [JT] */ CLASS_CHARACTER,
/* JV = 35, [JV] */ CLASS_CHARACTER,
/* CLOSE_PARENTHESIS = 36, [CP] */ CLASS_CLOSE_LIKE_CHARACTER,
/* CONDITIONAL_JAPANESE_STARTER = 37, [CJ] */ CLASS_CLOSE,
/* HEBREW_LETTER = 38, [HL] */ CLASS_CHARACTER,
/* REGIONAL_INDICATOR = 39, [RI] */ CLASS_CHARACTER,
/* E_BASE = 40, [EB] */ CLASS_BREAKABLE,
/* E_MODIFIER = 41, [EM] */ CLASS_CHARACTER,
- /* ZWJ = 42, [ZWJ]*/ CLASS_CHARACTER};
+ /* ZWJ = 42, [ZWJ]*/ CLASS_CHARACTER,
+ /* AKSARA = 43, [AK] */ CLASS_CHARACTER,
+ /* AKSARA_PREBASE = 44, [AP] */ CLASS_CHARACTER,
+ /* AKSARA_START = 45, [AS] */ CLASS_CHARACTER,
+ /* VIRAMA_FINAL = 46, [VF] */ CLASS_CHARACTER,
+ /* VIRAMA = 47, [VI] */ CLASS_CHARACTER,
+ };
static_assert(U_LB_COUNT == mozilla::ArrayLength(sUnicodeLineBreakToClass),
"Gecko vs ICU LineBreak class mismatch");
auto cls = GetLineBreakClass(u);
MOZ_ASSERT(cls < mozilla::ArrayLength(sUnicodeLineBreakToClass));
// Overrides based on rules for the different line-break values given in

38
heavybuilds/firefox/isnan.patch Normal file
View file

@ -0,0 +1,38 @@
--- a/dom/webtransport/api/WebTransportDatagramDuplexStream.cpp 2023-12-03 10:38:07.439311864 +0530
+++ b/dom/webtransport/api/WebTransportDatagramDuplexStream.cpp 2023-12-03 10:38:25.075311277 +0530
@@ -62,7 +62,7 @@
ErrorResult& aRv) {
// https://w3c.github.io/webtransport/#dom-webtransportdatagramduplexstream-incomingmaxage
// Step 1
- if (isnan(aMaxAge) || aMaxAge < 0.) {
+ if (std::isnan(aMaxAge) || aMaxAge < 0.) {
aRv.ThrowRangeError("Invalid IncomingMaxAge");
return;
}
@@ -78,7 +78,7 @@
ErrorResult& aRv) {
// https://w3c.github.io/webtransport/#dom-webtransportdatagramduplexstream-outgoingmaxage
// Step 1
- if (isnan(aMaxAge) || aMaxAge < 0.) {
+ if (std::isnan(aMaxAge) || aMaxAge < 0.) {
aRv.ThrowRangeError("Invalid OutgoingMaxAge");
return;
}
@@ -94,7 +94,7 @@
double aWaterMark, ErrorResult& aRv) {
// https://w3c.github.io/webtransport/#dom-webtransportdatagramduplexstream-incominghighwatermark
// Step 1
- if (isnan(aWaterMark) || aWaterMark < 0.) {
+ if (std::isnan(aWaterMark) || aWaterMark < 0.) {
aRv.ThrowRangeError("Invalid OutgoingMaxAge");
return;
}
@@ -110,7 +110,7 @@
double aWaterMark, ErrorResult& aRv) {
// https://w3c.github.io/webtransport/#dom-webtransportdatagramduplexstream-outgoinghighwatermark
// Step 1
- if (isnan(aWaterMark) || aWaterMark < 0.) {
+ if (std::isnan(aWaterMark) || aWaterMark < 0.) {
aRv.ThrowRangeError("Invalid OutgoingHighWaterMark");
return;
}

35
heavybuilds/firefox/lfs64.patch Normal file
View file

@ -0,0 +1,35 @@
force stat() instead of stat64() on 32-bit
--
--- a/xpcom/io/nsLocalFileUnix.h
+++ b/xpcom/io/nsLocalFileUnix.h
@@ -21,7 +21,7 @@
// stat64 and lstat64 are deprecated on OS X. Normal stat and lstat are
// 64-bit by default on OS X 10.6+.
-#if defined(HAVE_STAT64) && defined(HAVE_LSTAT64) && !defined(XP_DARWIN)
+#if 0 && defined(HAVE_STAT64) && defined(HAVE_LSTAT64) && !defined(XP_DARWIN)
# if defined(AIX)
# if defined STAT
# undef STAT
--- a/mozglue/baseprofiler/core/shared-libraries-linux.cc
+++ b/mozglue/baseprofiler/core/shared-libraries-linux.cc
@@ -178,7 +178,7 @@
return false;
}
-#if defined(__x86_64__) || defined(__aarch64__) || \
+#if 1 || defined(__x86_64__) || defined(__aarch64__) || \
(defined(__mips__) && _MIPS_SIM == _ABI64) || \
!(defined(GP_OS_linux) || defined(GP_OS_android))
--- a/security/sandbox/linux/broker/SandboxBrokerUtils.h
+++ b/security/sandbox/linux/broker/SandboxBrokerUtils.h
@@ -15,7 +15,7 @@
// calls. We'll intercept those and handle them in the stat functions
// but must be sure to use the right structure layout.
-#if defined(__NR_stat64) || defined(__NR_fstatat64)
+#if 0 && (defined(__NR_stat64) || defined(__NR_fstatat64) )
typedef struct stat64 statstruct;
# define statsyscall stat64
# define lstatsyscall lstat64

20
heavybuilds/firefox/mallinfo.patch
View file

@ -1,20 +0,0 @@
diff --git a/xpcom/base/nsMemoryReporterManager.cpp b/xpcom/base/nsMemoryReporterManager.cpp
index 865e1b5430..9a00dafecb 100644
--- a/xpcom/base/nsMemoryReporterManager.cpp
+++ b/xpcom/base/nsMemoryReporterManager.cpp
@@ -124,6 +124,7 @@ static MOZ_MUST_USE nsresult ResidentUniqueDistinguishedAmount(int64_t* aN) {
return GetProcSelfSmapsPrivate(aN);
}
+#ifdef __GLIBC__
# ifdef HAVE_MALLINFO
# define HAVE_SYSTEM_HEAP_REPORTER 1
static MOZ_MUST_USE nsresult SystemHeapSize(int64_t* aSizeOut) {
@@ -143,6 +144,7 @@ static MOZ_MUST_USE nsresult SystemHeapSize(int64_t* aSizeOut) {
return NS_OK;
}
# endif
+#endif
#elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || \
defined(__OpenBSD__) || defined(__FreeBSD_kernel__)

13
heavybuilds/firefox/no-ccache-stats.patch Normal file
View file

@ -0,0 +1,13 @@
prevents a call to ccache
diff --git a/python/mozbuild/mozbuild/controller/building.py b/python/mozbuild/mozbuild/controller/building.py
index bf7009a..011c012 100644
--- a/python/mozbuild/mozbuild/controller/building.py
+++ b/python/mozbuild/mozbuild/controller/building.py
@@ -570,6 +570,7 @@ class BuildMonitor(MozbuildObject):
)
def ccache_stats(self, ccache=None):
+ return None
ccache_stats = None
if ccache is None:

9
heavybuilds/firefox/python-deps.patch Normal file
View file

@ -0,0 +1,9 @@
--- a/python/sites/mach.txt
+++ b/python/sites/mach.txt
@@ -134,4 +134,4 @@
# We aren't (yet) able to pin packages in automation, so we have to
# support down to the oldest locally-installed version (5.4.2).
-pypi-optional:psutil>=5.4.2,<=5.9.4:telemetry will be missing some data
+pypi-optional:psutil>=5.4.2,<=5.10.0:telemetry will be missing some data
-pypi-optional:zstandard>=0.11.1,<=0.19.0:zstd archives will not be possible to extract
+pypi-optional:zstandard>=0.11.1,<=0.24.0:zstd archives will not be possible to extract

12
heavybuilds/firefox/rust-lto-thin.patch Normal file
View file

@ -0,0 +1,12 @@
set rust crate lto to thin to not use fatlto for gkrust which fails sometimes
--- a/config/makefiles/rust.mk
+++ b/config/makefiles/rust.mk
@@ -92,7 +92,7 @@
# Never enable when coverage is enabled to work around https://github.com/rust-lang/rust/issues/90045.
ifndef MOZ_CODE_COVERAGE
ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
-cargo_rustc_flags += -Clto$(if $(filter full,$(MOZ_LTO_RUST_CROSS)),=fat)
+cargo_rustc_flags += -Clto=thin
endif
# We need -Cembed-bitcode=yes for all crates when using -Clto.
RUSTFLAGS += -Cembed-bitcode=yes

4
heavybuilds/firefox/sandbox-largefile.patch
View file

@ -1,7 +1,7 @@
--- a/security/sandbox/linux/SandboxFilter.cpp 2020-11-23 22:41:14.556378950 +0100
+++ b/security/sandbox/linux/SandboxFilter.cpp 2020-11-23 22:40:23.595806444 +0100
@@ -68,7 +68,13 @@
// The headers define O_LARGEFILE as 0 on x86_64, but we need the
// actual value because it shows up in file flags.
-#define O_LARGEFILE_REAL 00100000
@ -12,6 +12,6 @@
+#else
+#define O_LARGEFILE_REAL O_LARGEFILE
+#endif
// Not part of UAPI, but userspace sees it in F_GETFL; see bug 1650751.
#define FMODE_NONOTIFY 0x4000000

22
net/wpa-supplicant/allow-tlsv1.patch Normal file
View file

@ -0,0 +1,22 @@
From: Andrej Shadura <andrewsh@debian.org>
Subject: Enable TLSv1.0 by default
OpenSSL 1.1.1 disables TLSv1.0 by default and sets the security level to 2.
Some older networks may support for TLSv1.0 and less secure cyphers.
--- a/src/crypto/tls_openssl.c
+++ b/src/crypto/tls_openssl.c
@@ -988,6 +988,13 @@
os_free(data);
return NULL;
}
+
+#ifndef EAP_SERVER_TLS
+ /* Enable TLSv1.0 by default to allow connecting to legacy
+ * networks since Debian OpenSSL is set to minimum TLSv1.2 and SECLEVEL=2. */
+ SSL_CTX_set_min_proto_version(ssl, TLS1_VERSION);
+#endif
+
data->ssl = ssl;
if (conf)
data->tls_session_lifetime = conf->tls_session_lifetime;

30
net/wpa-supplicant/silence-scan-results,patch Normal file
View file

@ -0,0 +1,30 @@
From 763a4ef660e2bd81f6cdc71a2f29a0a3e71b2ebc Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Tue, 22 Nov 2016 15:48:17 +0100
Subject: [PATCH 1/2] quiet an annoying and frequent syslog message
---
wpa_supplicant/events.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index abe3b47..72a0412 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -1555,11 +1555,11 @@ static int _wpa_supplicant_event_scan_results(struct wpa_supplicant *wpa_s,
if (wpa_s->last_scan_req == MANUAL_SCAN_REQ &&
wpa_s->manual_scan_use_id && wpa_s->own_scan_running &&
own_request && !(data && data->scan_info.external_scan)) {
- wpa_msg_ctrl(wpa_s, MSG_INFO, WPA_EVENT_SCAN_RESULTS "id=%u",
+ wpa_msg_ctrl(wpa_s, MSG_DEBUG, WPA_EVENT_SCAN_RESULTS "id=%u",
wpa_s->manual_scan_id);
wpa_s->manual_scan_use_id = 0;
} else {
- wpa_msg_ctrl(wpa_s, MSG_INFO, WPA_EVENT_SCAN_RESULTS);
+ wpa_msg_ctrl(wpa_s, MSG_DEBUG, WPA_EVENT_SCAN_RESULTS);
}
wpas_notify_scan_results(wpa_s);
--
2.9.3

13
net/wpa-supplicant/wpa-supplicant.SMBuild
View file

@ -2,7 +2,7 @@
app=wpa-supplicant
sapp="${app/-/_}"
version=2.10
build=2sml
build=3sml
homepage="https://w1.fi/"
download="https://w1.fi/releases/wpa_supplicant-$version.tar.gz"
desc="WPA/WPA2/IEEE 802.1X Supplicant"
@ -19,19 +19,21 @@ prepbuilddir() {
applypatch $srcdir/eloop.patch
applypatch $srcdir/unsafe-renegotiation-1.patch
applypatch $srcdir/unsafe-renegotiation-2.patch
applypatch $srcdir/allow-tlsv1.patch
applypatch $srcdir/silence-scan-results,patch
}
build() {
cd wpa_supplicant ; cp $srcdir/config .config
cd wpa_supplicant
cp $srcdir/config .config
make LIBDIR=/lib BINDIR=/bin all eapol_test
make install LIBDIR=/lib BINDIR=/bin DESTDIR=$pkg
cp ../COPYING $pkgdocs/LICENSE
mkdir -p $pkg/share/dbus-1/{system.d,system-services}
cp dbus/fi.w1.wpa_supplicant1.service $pkg/share/dbus-1/system-services/
cp dbus/dbus-wpa_supplicant.conf $pkg/share/dbus-1/system.d/
install -Dm 644 dbus/fi.w1.wpa_supplicant1.service $pkg/share/dbus-1/system-services/fi.w1.wpa_supplicant1.service
install -Dm 644 dbus/dbus-wpa_supplicant.conf $pkg/share/dbus-1/system.d/dbus-wpa_supplicant.conf
mkdir -p $pkg/share/man/man{5,8}
cp doc/docbook/wpa_supplicant.conf.5 $pkg/share/man/man5/
@ -48,6 +50,7 @@ build() {
sha512sums="
021c2a48f45d39c1dc6557730be5debaee071bc0ff82a271638beee6e32314e353e49d39e2f0dc8dff6e094dcc7008cfe1c32d0c7a34a1a345a12a3f1c1e11a1 wpa_supplicant-2.10.tar.gz
9c20b646cf89fab8919927f6533fa24d5e0ec2e6ca10fb738c6e1c17ad451978ecc9f26c09d518d8936d63f86994c8658cbf757d1b65ebced0481635ad69d89b allow-tlsv1.patch
2be055dd1f7da5a3d8e79c2f2c0220ddd31df309452da18f290144d2112d6dbde0fc633bb2ad02c386a39d7785323acaf5f70e5969995a1e8303a094eb5fe232 eloop.patch
9528735924faf876a7094de46760605e5e66e265187421a668be06dbf03d7b4db6b84cbad793fcd6bd614e3ba540f82f1f80660d75e8a6070eeb7e9abb54ed28 unsafe-renegotiation-1.patch
a92ba3ed3f41022a8af9396d2b703ee47f78aa05c1fddb42919a7fe6a6fad71e3515c63457e97e252ae0a32c6c34d67ea6efe0278df1e141cf36e650237e5295 unsafe-renegotiation-2.patch

38
xorg/glslang/glslang.SMBuild Executable file
View file

@ -0,0 +1,38 @@
# Maintainer: PktSurf <smlinux@pktsurf.in>
app=glslang
version=1.3.268
build=1sml
homepage="https://xorg.freedesktop.org/"
download="https://xorg.freedesktop.org/releases/individual/lib/libICE-$version.tar.bz2"
desc="OpenGL and OpenGL ES shader front end and validato"
requires="xorgproto xorg-macros xtrans"
prepbuilddir() {
mkandenterbuilddir
rm -rf glslang-vulkan-sdk-$version
tar xf $srcdir/glslang-vulkan-sdk-$version.tar.?z*
cd glslang-vulkan-sdk-$version
fixbuilddirpermissions
}
build() {
mkdir -p smbuild && cd smbuild
cmake .. \
-DCMAKE_BUILD_TYPE=None \
-DCMAKE_INSTALL_PREFIX="" \
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=On \
-DENABLE_OPT=0
make
make install DESTDIR=$pkg
cp ../LICENSE* $pkgdocs/
mkfinalpkg
}
sha512sums="
623fb8070a54be2068f9ea1ee80c1fc7ba0be314213b5f691a482241c76df75baa26d40f9c2ca2f8de3d247965b15203d82cbd69d8e888e18dfe4533c2a79abb glslang-vulkan-sdk-1.3.268.tar.lz
"