diff --git a/extra/firefox/build b/extra/firefox/build index 2fb75580..c7e84ee6 100755 --- a/extra/firefox/build +++ b/extra/firefox/build @@ -7,11 +7,6 @@ done sed '/UNZIP/d' toolkit/moz.configure > _ mv -f _ toolkit/moz.configure -# Remove upper limit on psutil for those encountering build errors when using -# python-psutil from community. -sed 's/psutil>=5\.4\.2,<=5\.8\.0/psutil>=5\.4\.2/g' python/sites/mach.txt > _ -mv -f _ python/sites/mach.txt - # If using libc++, CXXSTDLIB needs to be set manually. case $("$CC" -print-file-name=libc++.so) in */*) export CXXSTDLIB=c++ @@ -72,6 +67,7 @@ ac_add_options --disable-system-extension-dirs EOF ./mach build +./mach run DESTDIR="$1" ./mach install # Remove a lot of uneeded "stuff". diff --git a/extra/firefox/checksums b/extra/firefox/checksums index fc92b906..c18f261a 100644 --- a/extra/firefox/checksums +++ b/extra/firefox/checksums @@ -1,7 +1,6 @@ -df955bb61545a682ca6cf9b96d038cf4f99d58db20901d4bc1605ce37fdc531c81 -be44c4a1e76704bd9e0fa713f00b88e9897150eda359c3bf58c30461d9cf56e3c8 +9f9317c045810f7ea01ec7f00c6c3e631e0914f57909976940b548d6f1cbfae959 +bd231369e10f0300360b79ae2e9b429f1d5833f6a46b615722979c38b6ebb70882 ee279241e461011e2265086328d9d0a913ab938bb81aa97fa22b8b9b7edf5e33bc 8c0f419eb138061e67dbe2ac73e9c8332649fb90aacb57ac4f00d5de94c0cf23a8 3bfec8b5e7cb94481d94e1039a602e14564c8a6da5a28f089ce4a69d23f9e42bbb 2914dbf6d620c3403fbe99fcd04618eaab4257b706470dec3bacc5952f79a0fa31 -2a1a5e3e928687cca972b6d7ee53f35420fec364ffeda0131f38a42bec309b1c23 diff --git a/extra/firefox/patches/fix-linux-header.patch b/extra/firefox/patches/fix-linux-header.patch deleted file mode 100644 index 9f7fc51a..00000000 --- a/extra/firefox/patches/fix-linux-header.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c b/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c -index 73e85c6ccc..9eca548638 100644 ---- a/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c -+++ b/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c -@@ -31,6 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - - #if defined(LINUX) -+#include - #include "addrs-netlink.h" - #include - #include diff --git a/extra/firefox/patches/fix-overalignment.patch b/extra/firefox/patches/fix-overalignment.patch new file mode 100644 index 00000000..20c2d796 --- /dev/null +++ b/extra/firefox/patches/fix-overalignment.patch @@ -0,0 +1,50 @@ +diff --git a/js/public/Utility.h b/js/public/Utility.h +index 5a3002b..8927d65 100644 +--- a/js/public/Utility.h ++++ b/js/public/Utility.h +@@ -478,6 +478,9 @@ static inline void js_free(void* p) { + #define JS_DECLARE_NEW_METHODS(NEWNAME, ALLOCATOR, QUALIFIERS) \ + template \ + QUALIFIERS T* MOZ_HEAP_ALLOCATOR NEWNAME(Args&&... args) { \ ++ static_assert( \ ++ alignof(T) <= alignof(max_align_t), \ ++ "over-aligned type is not supported by JS_DECLARE_NEW_METHODS"); \ + void* memory = ALLOCATOR(sizeof(T)); \ + return MOZ_LIKELY(memory) ? new (memory) T(std::forward(args)...) \ + : nullptr; \ +@@ -494,6 +497,9 @@ static inline void js_free(void* p) { + #define JS_DECLARE_NEW_ARENA_METHODS(NEWNAME, ALLOCATOR, QUALIFIERS) \ + template \ + QUALIFIERS T* MOZ_HEAP_ALLOCATOR NEWNAME(arena_id_t arena, Args&&... args) { \ ++ static_assert( \ ++ alignof(T) <= alignof(max_align_t), \ ++ "over-aligned type is not supported by JS_DECLARE_NEW_ARENA_METHODS"); \ + void* memory = ALLOCATOR(arena, sizeof(T)); \ + return MOZ_LIKELY(memory) ? new (memory) T(std::forward(args)...) \ + : nullptr; \ +diff --git a/js/src/gc/GCMarker.h b/js/src/gc/GCMarker.h +index 495e66c..053ba90 100644 +--- a/js/src/gc/GCMarker.h ++++ b/js/src/gc/GCMarker.h +@@ -274,7 +274,7 @@ enum ShouldReportMarkTime : bool { + + } /* namespace gc */ + +-class alignas(TypicalCacheLineSize) GCMarker { ++class GCMarker { + enum MarkingState : uint8_t { + // Have not yet started marking. + NotActive, +diff --git a/js/src/gc/Nursery.h b/js/src/gc/Nursery.h +index ae1e8c2..3dde209 100644 +--- a/js/src/gc/Nursery.h ++++ b/js/src/gc/Nursery.h +@@ -67,7 +67,7 @@ class GCSchedulingTunables; + class TenuringTracer; + } // namespace gc + +-class alignas(TypicalCacheLineSize) Nursery { ++class Nursery { + public: + explicit Nursery(gc::GCRuntime* gc); + ~Nursery(); diff --git a/extra/firefox/patches/no-perl.patch b/extra/firefox/patches/no-perl.patch deleted file mode 100644 index bcde015a..00000000 --- a/extra/firefox/patches/no-perl.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/moz.configure b/moz.configure -index 95763e2..dc0ed30 100755 ---- a/moz.configure -+++ b/moz.configure -@@ -527,60 +527,6 @@ def awk_for_old_configure(value): - - add_old_configure_assignment("AWK", awk_for_old_configure) - -- --# Perl detection --# ============================================================== --perl = check_prog("PERL", ("perl5", "perl")) -- --# Until the PERL variable is not necessary in old-configure -- -- --@depends(perl) --def perl_for_old_configure(value): -- return value -- -- --add_old_configure_assignment("PERL", perl_for_old_configure) -- -- --@template --def perl_version_check(min_version): -- @depends(perl) -- @checking("for minimum required perl version >= %s" % min_version) -- def get_perl_version(perl): -- return Version( -- check_cmd_output( -- perl, -- "-e", -- "print $]", -- onerror=lambda: die("Failed to get perl version."), -- ) -- ) -- -- @depends(get_perl_version) -- def check_perl_version(version): -- if version < min_version: -- die("Perl %s or higher is required.", min_version) -- -- @depends(perl) -- @checking("for full perl installation") -- @imports("subprocess") -- def has_full_perl_installation(perl): -- ret = subprocess.call([perl, "-e", "use Config; exit(!-d $Config{archlib})"]) -- return ret == 0 -- -- @depends(has_full_perl_installation) -- def require_full_perl_installation(has_full_perl_installation): -- if not has_full_perl_installation: -- die( -- "Cannot find Config.pm or $Config{archlib}. " -- "A full perl installation is required." -- ) -- -- --perl_version_check("5.006") -- -- - # GNU make detection - # ============================================================== - option(env="MAKE", nargs=1, help="Path to GNU make") diff --git a/extra/firefox/sources b/extra/firefox/sources index 7f4fff05..835be394 100644 --- a/extra/firefox/sources +++ b/extra/firefox/sources @@ -1,7 +1,6 @@ -https://ftp.mozilla.org/pub/firefox/releases/113.0.2/source/firefox-113.0.2.source.tar.xz -patches/fix-linux-header.patch +https://ftp.mozilla.org/pub/firefox/releases/115.0.2/source/firefox-115.0.2.source.tar.xz +patches/fix-overalignment.patch patches/musl-sandbox.patch patches/no-atk.patch patches/no-dbus.patch patches/no-fribidi.patch -patches/no-perl.patch diff --git a/extra/firefox/version b/extra/firefox/version index 9c6ebe53..93efae58 100644 --- a/extra/firefox/version +++ b/extra/firefox/version @@ -1 +1 @@ -113.0.2 1 +115.0.2 1 diff --git a/testing/clang/README b/testing/clang/README deleted file mode 100644 index ddef9fb9..00000000 --- a/testing/clang/README +++ /dev/null @@ -1,68 +0,0 @@ -clang -________________________________________________________________________________ - -Clang is a compiler front end for the C, C++, Objective-C and Objective-C++ -programming languages, as well as the OpenMP, OpenCL, RenderScript, CUDA and -HIP frameworks. It uses the LLVM compiler infrastructure as its back end and has -been part of the LLVM release cycle since LLVM 2.6. - -It is designed to act as a drop-in replacement for the GNU Compiler Collection -(GCC), supporting most of its compilation flags and unofficial language -extensions. Its contributors include Apple, Microsoft, Google, ARM, Sony, -Intel and Advanced Micro Devices (AMD). [0] - -Upstream: https://clang.llvm.org/ - - -[000] Index -________________________________________________________________________________ - -* Installation ........................................................... [001] -* Setup .................................................................. [002] -* Usage .................................................................. [003] -* Troubleshooting ........................................................ [004] -* References ............................................................. [005] - - -[001] Installation -________________________________________________________________________________ - -+------------------------------------------------------------------------------+ -| | -| $ kiss b clang | -| | -+------------------------------------------------------------------------------+ - - -[002] Setup -________________________________________________________________________________ - -To use clang as the system compiler, set the following environment variables in -your .profile or shell runtime configuration file. - -+------------------------------------------------------------------------------+ -| | -| $ export CC=clang | -| $ export CXX=clang++ | -| | -+------------------------------------------------------------------------------+ - - -[003] Usage -________________________________________________________________________________ - -Refer to the command help output. This package does not yet provide manual -pages. Documentation can also be found online. - - -[004] Troubleshooting -________________________________________________________________________________ - -If a package fails to build with clang, open an issue at $/kisslinux/repo - - -[005] References -________________________________________________________________________________ - -[0] https://en.wikipedia.org/wiki/Clang - diff --git a/testing/clang/build b/testing/clang/build deleted file mode 100755 index d8b7cd09..00000000 --- a/testing/clang/build +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -e - -export DESTDIR="$1" - -cd clang -cmake -B build \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DLLVM_ENABLE_RTTI=ON \ - -DLLVM_ENABLE_EH=ON \ - -DLLVM_ENABLE_LIBXML2=OFF \ - -DCLANG_BUILD_EXAMPLES=OFF \ - -DCLANG_INCLUDE_DOCS=OFF \ - -DCLANG_INCLUDE_TESTS=OFF \ - -DLIBCLANG_BUILD_STATIC=ON \ - -Wno-dev - -cmake --build build -cmake --install build - -# Fix up libexec location. This can't be done during -# the configure stage of the build as it is hardcoded. -{ - mv -f \ - "$1/usr/libexec/"*analyze* \ - "$1/usr/libexec/"*intercept* \ - "$1/usr/lib/clang" - - rmdir "$1/usr/libexec" - - sed 's|libexec|lib/clang|' "$1/usr/bin/scan-build" > _ - mv -f _ "$1/usr/bin/scan-build" - chmod +x "$1/usr/bin/scan-build" -} diff --git a/testing/clang/checksums b/testing/clang/checksums deleted file mode 100644 index b85a5ac2..00000000 --- a/testing/clang/checksums +++ /dev/null @@ -1,2 +0,0 @@ -d4ca2b1fe727cd98f8bf17b90533e80fde90637162245c6e4ed0fd6669cb293dd0 -40a6c658591f26fe23ad5e5b3e6645eea2476e31b9adbcce139949ee17f17b1dea diff --git a/testing/clang/depends b/testing/clang/depends deleted file mode 100644 index 7a0f0b0e..00000000 --- a/testing/clang/depends +++ /dev/null @@ -1,5 +0,0 @@ -cmake make -llvm -python make -xz -zlib diff --git a/testing/clang/sources b/testing/clang/sources deleted file mode 100644 index 675532fa..00000000 --- a/testing/clang/sources +++ /dev/null @@ -1,2 +0,0 @@ -https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/clang-16.0.3.src.tar.xz clang -https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/cmake-16.0.3.src.tar.xz cmake diff --git a/testing/clang/version b/testing/clang/version deleted file mode 100644 index 63f837a6..00000000 --- a/testing/clang/version +++ /dev/null @@ -1 +0,0 @@ -16.0.3 1 diff --git a/testing/firefox/build b/testing/firefox/build index fef79673..c7e84ee6 100755 --- a/testing/firefox/build +++ b/testing/firefox/build @@ -67,6 +67,7 @@ ac_add_options --disable-system-extension-dirs EOF ./mach build +./mach run DESTDIR="$1" ./mach install # Remove a lot of uneeded "stuff". diff --git a/testing/firefox/checksums b/testing/firefox/checksums index cb238b34..f5866f32 100644 --- a/testing/firefox/checksums +++ b/testing/firefox/checksums @@ -1,6 +1,5 @@ -f56a26edea0cc5905b9cd0988e15ecc02d71424437c818c91e0dad1ff00e311ac3 +d6b9e4472f73c5a1726f4b33d1749aff7831b73915ab6797b66b5d23c5604cb0a5 ee279241e461011e2265086328d9d0a913ab938bb81aa97fa22b8b9b7edf5e33bc 8c0f419eb138061e67dbe2ac73e9c8332649fb90aacb57ac4f00d5de94c0cf23a8 3bfec8b5e7cb94481d94e1039a602e14564c8a6da5a28f089ce4a69d23f9e42bbb 2914dbf6d620c3403fbe99fcd04618eaab4257b706470dec3bacc5952f79a0fa31 -2a1a5e3e928687cca972b6d7ee53f35420fec364ffeda0131f38a42bec309b1c23 diff --git a/testing/firefox/patches/no-perl.patch b/testing/firefox/patches/no-perl.patch deleted file mode 100644 index bcde015a..00000000 --- a/testing/firefox/patches/no-perl.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/moz.configure b/moz.configure -index 95763e2..dc0ed30 100755 ---- a/moz.configure -+++ b/moz.configure -@@ -527,60 +527,6 @@ def awk_for_old_configure(value): - - add_old_configure_assignment("AWK", awk_for_old_configure) - -- --# Perl detection --# ============================================================== --perl = check_prog("PERL", ("perl5", "perl")) -- --# Until the PERL variable is not necessary in old-configure -- -- --@depends(perl) --def perl_for_old_configure(value): -- return value -- -- --add_old_configure_assignment("PERL", perl_for_old_configure) -- -- --@template --def perl_version_check(min_version): -- @depends(perl) -- @checking("for minimum required perl version >= %s" % min_version) -- def get_perl_version(perl): -- return Version( -- check_cmd_output( -- perl, -- "-e", -- "print $]", -- onerror=lambda: die("Failed to get perl version."), -- ) -- ) -- -- @depends(get_perl_version) -- def check_perl_version(version): -- if version < min_version: -- die("Perl %s or higher is required.", min_version) -- -- @depends(perl) -- @checking("for full perl installation") -- @imports("subprocess") -- def has_full_perl_installation(perl): -- ret = subprocess.call([perl, "-e", "use Config; exit(!-d $Config{archlib})"]) -- return ret == 0 -- -- @depends(has_full_perl_installation) -- def require_full_perl_installation(has_full_perl_installation): -- if not has_full_perl_installation: -- die( -- "Cannot find Config.pm or $Config{archlib}. " -- "A full perl installation is required." -- ) -- -- --perl_version_check("5.006") -- -- - # GNU make detection - # ============================================================== - option(env="MAKE", nargs=1, help="Path to GNU make") diff --git a/testing/firefox/sources b/testing/firefox/sources index 6fa4ec8d..d74f9422 100644 --- a/testing/firefox/sources +++ b/testing/firefox/sources @@ -1,6 +1,5 @@ -https://ftp.mozilla.org/pub/firefox/releases/114.0b9/source/firefox-114.0b9.source.tar.xz +https://ftp.mozilla.org/pub/firefox/releases/116.0b2/source/firefox-116.0b2.source.tar.xz patches/musl-sandbox.patch patches/no-atk.patch patches/no-dbus.patch patches/no-fribidi.patch -patches/no-perl.patch diff --git a/testing/firefox/version b/testing/firefox/version index 27966723..4cf28434 100644 --- a/testing/firefox/version +++ b/testing/firefox/version @@ -1 +1 @@ -114.0b9 1 +116.0b2 1 diff --git a/testing/llvm/README b/testing/llvm/README deleted file mode 100644 index ce18103e..00000000 --- a/testing/llvm/README +++ /dev/null @@ -1,43 +0,0 @@ -llvm -________________________________________________________________________________ - -LLVM is a set of compiler and toolchain technologies, which can be used to -develop a front end for any programming language and a back end for any -instruction set architecture. LLVM is designed around a language-independent -intermediate representation (IR) that serves as a portable, high-level assembly -language that can be optimized with a variety of transformations over multiple -passes. [0] - -Upstream: https://llvm.org/ - - -[000] Index -________________________________________________________________________________ - -* Installation ........................................................... [001] -* Usage .................................................................. [002] -* References ............................................................. [003] - - -[001] Installation -________________________________________________________________________________ - -+------------------------------------------------------------------------------+ -| | -| $ kiss b llvm | -| | -+------------------------------------------------------------------------------+ - - -[002] Usage -________________________________________________________________________________ - -Refer to the command help output. No manuals are (yet) provided with alongside -this package. - - -[003] References -________________________________________________________________________________ - -[0] https://en.wikipedia.org/wiki/LLVM - diff --git a/testing/llvm/build b/testing/llvm/build deleted file mode 100755 index 6bee4a51..00000000 --- a/testing/llvm/build +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -e - -export DESTDIR="$1" - -cd llvm -cmake -B build \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DLLVM_BUILD_LLVM_DYLIB=ON \ - -DLLVM_LINK_LLVM_DYLIB=ON \ - -DLLVM_TARGETS_TO_BUILD="host;AMDGPU" \ - -DLLVM_ENABLE_RTTI=ON \ - -DLLVM_HOST_TRIPLE="$(cc -dumpmachine)" \ - -DLLVM_INCLUDE_BENCHMARKS=OFF \ - -DLLVM_INCLUDE_EXAMPLES=OFF \ - -DLLVM_INCLUDE_DOCS=OFF \ - -DLLVM_INCLUDE_TESTS=OFF \ - -DLLVM_ENABLE_TERMINFO=OFF \ - -DLLVM_ENABLE_LIBXML2=OFF \ - -Wno-dev - -cmake --build build -cmake --install build - -# Use new llvm-config to generate a pkg-config file. -PATH="$1/usr/bin:$PATH" -mkdir -p "$1/usr/lib/pkgconfig" - -# shellcheck disable=2016 -sed -e "s|$1||" -e 's|/usr/include|\${includedir}|' \ - > "$1/usr/lib/pkgconfig/llvm.pc" <