removed idea of repos

79 files changed, 0 insertions, 3979 deletions

diff --git a/repo/apps/arandr/arandr.xibuild b/repo/apps/arandr/arandr.xibuild
deleted file mode 100644
index 94d67e2..0000000
--- a/repo/apps/arandr/arandr.xibuild
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-NAME="arandr"
-DESC="ARandR provides a simple visual front end for XRandR"
-
-MAKEDEPS="python"
-DEPS="xrandr cairo python-gobject python "
-
-PKG_VER=0.1.10
-SOURCE="http://christian.amsuess.com/tools/arandr/files/arandr-$PKG_VER.tar.gz"
-
-
-package () {
-	python3 setup.py install --prefix=/usr --root=$PKG_DEST
-}
diff --git a/repo/apps/cava/cava.xibuild b/repo/apps/cava/cava.xibuild
deleted file mode 100644
index 9a60b50..0000000
--- a/repo/apps/cava/cava.xibuild
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-NAME="cava"
-DESC="Console-based Audio Visualizer for ALSA"
-
-MAKEDEPS="make "
-DEPS="alsa-lib fftw iniparser musl ncurses "
-
-PKG_VER=0.8.2
-SOURCE="https://github.com/karlstav/cava/archive/$PKG_VER.tar.gz"
-
-prepare () {
-    ./autogen.sh
-}
-
-build () {
-    ./configure \
-        --prefix=/usr \
-        --bindir=/usr/bin \
-        --sysconfdir=/etc \
-        --disable-static
-    make
-}
-
-package () {
-    make DESTDIR=$PKG_DEST install
-}
diff --git a/repo/apps/chromium/chromium-VirtualCursor-standard-layout.patch b/repo/apps/chromium/chromium-VirtualCursor-standard-layout.patch
deleted file mode 100644
index 721e194..0000000
--- a/repo/apps/chromium/chromium-VirtualCursor-standard-layout.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-diff --git a/sql/recover_module/btree.cc b/sql/recover_module/btree.cc
-index 9ecaafe..839318a 100644
---- a/sql/recover_module/btree.cc
-+++ b/sql/recover_module/btree.cc
-@@ -135,16 +135,25 @@
-               "Move the destructor to the .cc file if it's non-trival");
- #endif  // !DCHECK_IS_ON()
- 
--LeafPageDecoder::LeafPageDecoder(DatabasePageReader* db_reader) noexcept
--    : page_id_(db_reader->page_id()),
--      db_reader_(db_reader),
--      cell_count_(ComputeCellCount(db_reader)),
--      next_read_index_(0),
--      last_record_size_(0) {
-+void LeafPageDecoder::Initialize(DatabasePageReader* db_reader) {
-+  DCHECK(db_reader);
-   DCHECK(IsOnValidPage(db_reader));
-+  page_id_ = db_reader->page_id();
-+  db_reader_ = db_reader;
-+  cell_count_ = ComputeCellCount(db_reader);
-+  next_read_index_ = 0;
-+  last_record_size_ = 0;
-   DCHECK(DatabasePageReader::IsValidPageId(page_id_));
- }
- 
-+void LeafPageDecoder::Reset() {
-+  db_reader_ = nullptr;
-+  page_id_ = 0;
-+  cell_count_ = 0;
-+  next_read_index_ = 0;
-+  last_record_size_ = 0;
-+}
-+
- bool LeafPageDecoder::TryAdvance() {
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-   DCHECK(CanAdvance());
-diff --git a/sql/recover_module/btree.h b/sql/recover_module/btree.h
-index d76d076..33114b0 100644
---- a/sql/recover_module/btree.h
-+++ b/sql/recover_module/btree.h
-@@ -102,7 +102,7 @@
-   //
-   // |db_reader| must have been used to read an inner page of a table B-tree.
-   // |db_reader| must outlive this instance.
--  explicit LeafPageDecoder(DatabasePageReader* db_reader) noexcept;
-+  explicit LeafPageDecoder() noexcept = default;
-   ~LeafPageDecoder() noexcept = default;
- 
-   LeafPageDecoder(const LeafPageDecoder&) = delete;
-@@ -150,6 +150,15 @@
-   // read as long as CanAdvance() returns true.
-   bool TryAdvance();
- 
-+  // Initialize with DatabasePageReader
-+  void Initialize(DatabasePageReader* db_reader);
-+
-+  // Reset internal DatabasePageReader
-+  void Reset();
-+
-+  // True if DatabasePageReader is valid
-+  bool IsValid() { return (db_reader_ != nullptr); }
-+
-   // True if the given reader may point to an inner page in a table B-tree.
-   //
-   // The last ReadPage() call on |db_reader| must have succeeded.
-@@ -163,14 +172,14 @@
-   static int ComputeCellCount(DatabasePageReader* db_reader);
- 
-   // The number of the B-tree page this reader is reading.
--  const int64_t page_id_;
-+  int64_t page_id_;
-   // Used to read the tree page.
-   //
-   // Raw pointer usage is acceptable because this instance's owner is expected
-   // to ensure that the DatabasePageReader outlives this.
--  DatabasePageReader* const db_reader_;
-+  DatabasePageReader* db_reader_;
-   // Caches the ComputeCellCount() value for this reader's page.
--  const int cell_count_ = ComputeCellCount(db_reader_);
-+  int cell_count_;
- 
-   // The reader's cursor state.
-   //
-diff --git a/sql/recover_module/cursor.cc b/sql/recover_module/cursor.cc
-index 0029ff9..42548bc 100644
---- a/sql/recover_module/cursor.cc
-+++ b/sql/recover_module/cursor.cc
-@@ -26,7 +26,7 @@
- int VirtualCursor::First() {
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-   inner_decoders_.clear();
--  leaf_decoder_ = nullptr;
-+  leaf_decoder_.Reset();
- 
-   AppendPageDecoder(table_->root_page_id());
-   return Next();
-@@ -36,18 +36,18 @@
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-   record_reader_.Reset();
- 
--  while (!inner_decoders_.empty() || leaf_decoder_.get()) {
--    if (leaf_decoder_.get()) {
--      if (!leaf_decoder_->CanAdvance()) {
-+  while (!inner_decoders_.empty() || leaf_decoder_.IsValid()) {
-+    if (leaf_decoder_.IsValid()) {
-+      if (!leaf_decoder_.CanAdvance()) {
-         // The leaf has been exhausted. Remove it from the DFS stack.
--        leaf_decoder_ = nullptr;
-+        leaf_decoder_.Reset();
-         continue;
-       }
--      if (!leaf_decoder_->TryAdvance())
-+      if (!leaf_decoder_.TryAdvance())
-         continue;
- 
--      if (!payload_reader_.Initialize(leaf_decoder_->last_record_size(),
--                                      leaf_decoder_->last_record_offset())) {
-+      if (!payload_reader_.Initialize(leaf_decoder_.last_record_size(),
-+                                      leaf_decoder_.last_record_offset())) {
-         continue;
-       }
-       if (!record_reader_.Initialize())
-@@ -99,13 +99,13 @@
- int64_t VirtualCursor::RowId() {
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-   DCHECK(record_reader_.IsInitialized());
--  DCHECK(leaf_decoder_.get());
--  return leaf_decoder_->last_record_rowid();
-+  DCHECK(leaf_decoder_.IsValid());
-+  return leaf_decoder_.last_record_rowid();
- }
- 
- void VirtualCursor::AppendPageDecoder(int page_id) {
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
--  DCHECK(leaf_decoder_.get() == nullptr)
-+  DCHECK(!leaf_decoder_.IsValid())
-       << __func__
-       << " must only be called when the current path has no leaf decoder";
- 
-@@ -113,7 +113,7 @@
-     return;
- 
-   if (LeafPageDecoder::IsOnValidPage(&db_reader_)) {
--    leaf_decoder_ = std::make_unique<LeafPageDecoder>(&db_reader_);
-+    leaf_decoder_.Initialize(&db_reader_);
-     return;
-   }
- 
-diff --git a/sql/recover_module/cursor.h b/sql/recover_module/cursor.h
-index afcd690..b15c31d 100644
---- a/sql/recover_module/cursor.h
-+++ b/sql/recover_module/cursor.h
-@@ -129,7 +129,7 @@
-   std::vector<std::unique_ptr<InnerPageDecoder>> inner_decoders_;
- 
-   // Decodes the leaf page containing records.
--  std::unique_ptr<LeafPageDecoder> leaf_decoder_;
-+  LeafPageDecoder leaf_decoder_;
- 
-   SEQUENCE_CHECKER(sequence_checker_);
- };
-diff --git a/sql/recover_module/pager.cc b/sql/recover_module/pager.cc
-index 58e75de..5fe9620 100644
---- a/sql/recover_module/pager.cc
-+++ b/sql/recover_module/pager.cc
-@@ -23,8 +23,7 @@
-               "ints are not appropriate for representing page IDs");
- 
- DatabasePageReader::DatabasePageReader(VirtualTable* table)
--    : page_data_(std::make_unique<uint8_t[]>(table->page_size())),
--      table_(table) {
-+    : page_data_(), table_(table) {
-   DCHECK(table != nullptr);
-   DCHECK(IsValidPageSize(table->page_size()));
- }
-@@ -57,8 +56,8 @@
-                     std::numeric_limits<int64_t>::max(),
-                 "The |read_offset| computation above may overflow");
- 
--  int sqlite_status =
--      RawRead(sqlite_file, read_size, read_offset, page_data_.get());
-+  int sqlite_status = RawRead(sqlite_file, read_size, read_offset,
-+                              const_cast<uint8_t*>(page_data_.data()));
- 
-   // |page_id_| needs to be set to kInvalidPageId if the read failed.
-   // Otherwise, future ReadPage() calls with the previous |page_id_| value
-diff --git a/sql/recover_module/pager.h b/sql/recover_module/pager.h
-index 0e388ddc..99314e3 100644
---- a/sql/recover_module/pager.h
-+++ b/sql/recover_module/pager.h
-@@ -5,6 +5,7 @@
- #ifndef SQL_RECOVER_MODULE_PAGER_H_
- #define SQL_RECOVER_MODULE_PAGER_H_
- 
-+#include <array>
- #include <cstdint>
- #include <memory>
- 
-@@ -70,7 +71,7 @@
-     DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-     DCHECK_NE(page_id_, kInvalidPageId)
-         << "Successful ReadPage() required before accessing pager state";
--    return page_data_.get();
-+    return page_data_.data();
-   }
- 
-   // The number of bytes in the page read by the last ReadPage() call.
-@@ -137,7 +138,7 @@
-   int page_id_ = kInvalidPageId;
-   // Stores the bytes of the last page successfully read by ReadPage().
-   // The content is undefined if the last call to ReadPage() did not succeed.
--  const std::unique_ptr<uint8_t[]> page_data_;
-+  const std::array<uint8_t, kMaxPageSize> page_data_;
-   // Raw pointer usage is acceptable because this instance's owner is expected
-   // to ensure that the VirtualTable outlives this.
-   VirtualTable* const table_;
diff --git a/repo/apps/chromium/chromium-launcher.sh b/repo/apps/chromium/chromium-launcher.sh
deleted file mode 100644
index ceba3f2..0000000
--- a/repo/apps/chromium/chromium-launcher.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-export DBUS_SESSION_BUS_ADDRES=unix:path=/run/dbus/system_bus_socket
-
-# Allow the user to override command-line flags, bug #357629.
-# This is based on Debian's chromium-browser package, and is intended
-# to be consistent with Debian.
-for f in /etc/chromium/*.conf; do
-    [ -f ${f} ] && . "${f}"
-done
-
-# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system
-# default CHROMIUM_FLAGS (from /etc/chromium/default).
-CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"}
-
-# Let the wrapped binary know that it has been run through the wrapper
-export CHROME_WRAPPER=$(readlink -f "$0")
-
-PROGDIR=${CHROME_WRAPPER%/*}
-
-case ":$PATH:" in
-  *:$PROGDIR:*)
-    # $PATH already contains $PROGDIR
-    ;;
-  *)
-    # Append $PROGDIR to $PATH
-    export PATH="$PATH:$PROGDIR"
-    ;;
-esac
-
-if [ $(id -u) -eq 0 ] && [ $(stat -t -L ${XDG_CONFIG_HOME:-${HOME}} | cut -d' ' -f5) -eq 0 ]; then
-	# Running as root with HOME owned by root.
-	# Pass --user-data-dir to work around upstream failsafe.
-	CHROMIUM_FLAGS="--user-data-dir=${XDG_CONFIG_HOME:-${HOME}/.config}/chromium
-		${CHROMIUM_FLAGS}"
-fi
-
-# Set the .desktop file name
-export CHROME_DESKTOP="chromium.desktop"
-
-exec "$PROGDIR/chromium" --extra-plugin-dir=/usr/lib/nsbrowser/plugins ${CHROMIUM_FLAGS} "$@"
diff --git a/repo/apps/chromium/chromium-revert-drop-of-system-java.patch b/repo/apps/chromium/chromium-revert-drop-of-system-java.patch
deleted file mode 100644
index 117a50f..0000000
--- a/repo/apps/chromium/chromium-revert-drop-of-system-java.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-This was dropped for some reason in 6951c37cecd05979b232a39e5c10e6346a0f74ef
---- a/third_party/closure_compiler/compiler.py	2021-05-20 04:17:53.000000000 +0200
-+++ b/third_party/closure_compiler/compiler.py	2021-05-20 04:17:53.000000000 +0200
-@@ -13,8 +13,9 @@
- 
- 
- _CURRENT_DIR = os.path.join(os.path.dirname(__file__))
--_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
--assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
-+_JAVA_BIN = "java"
-+_JDK_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
-+_JAVA_PATH = _JDK_PATH if os.path.isfile(_JDK_PATH) else _JAVA_BIN
- 
- class Compiler(object):
-   """Runs the Closure compiler on given source files to typecheck them
diff --git a/repo/apps/chromium/chromium-use-alpine-target.patch b/repo/apps/chromium/chromium-use-alpine-target.patch
deleted file mode 100644
index 8282aca..0000000
--- a/repo/apps/chromium/chromium-use-alpine-target.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./build/config/compiler/BUILD.gn
-+++ ./build/config/compiler/BUILD.gn
-@@ -752,8 +752,8 @@
-       }
-     } else if (current_cpu == "arm") {
-       if (is_clang && !is_android && !is_nacl) {
--        cflags += [ "--target=arm-linux-gnueabihf" ]
--        ldflags += [ "--target=arm-linux-gnueabihf" ]
-+        cflags += [ "--target=armv7-alpine-linux-musleabihf" ]
-+        ldflags += [ "--target=armv7-alpine-linux-musleabihf" ]
-       }
-       if (!is_nacl) {
-         cflags += [
-@@ -766,8 +766,8 @@
-       }
-     } else if (current_cpu == "arm64") {
-       if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
--        cflags += [ "--target=aarch64-linux-gnu" ]
--        ldflags += [ "--target=aarch64-linux-gnu" ]
-+        cflags += [ "--target=aarch64-alpine-linux-musl" ]
-+        ldflags += [ "--target=aarch64-alpine-linux-musl" ]
-       }
-     } else if (current_cpu == "mipsel" && !is_nacl) {
-       ldflags += [ "-Wl,--hash-style=sysv" ]
diff --git a/repo/apps/chromium/chromium.conf b/repo/apps/chromium/chromium.conf
deleted file mode 100644
index a8b8db3..0000000
--- a/repo/apps/chromium/chromium.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Default settings for chromium. This file is sourced by /bin/sh from
-# the chromium launcher.
-
-# Options to pass to chromium.
-#CHROMIUM_FLAGS=""
diff --git a/repo/apps/chromium/chromium.desktop b/repo/apps/chromium/chromium.desktop
deleted file mode 100644
index e5f549b..0000000
--- a/repo/apps/chromium/chromium.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Chromium
-GenericName=Web Browser
-Comment=Access the Internet
-Exec=chromium-browser %U
-Terminal=false
-Icon=chromium
-Type=Application
-Categories=GTK;Network;WebBrowser;
-MimeType=text/html;text/xml;application/xhtml+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
diff --git a/repo/apps/chromium/chromium.xibuild b/repo/apps/chromium/chromium.xibuild
deleted file mode 100644
index 5131239..0000000
--- a/repo/apps/chromium/chromium.xibuild
+++ /dev/null
@@ -1,284 +0,0 @@
-#!/bin/sh
-
-NAME="chromium"
-DESC="Chromium webbrowser (ungoogled)"
-
-MAKEDEPS="meson ninja hwids lld pciutils"
-DEPS="alsa-lib at-spi2-atk at-spi2-core atk cairo dbus eudev expat ffmpeg4 flac font-opensans fontconfig freetype2 glib gtk3 harfbuzz lcms2 libdrm libevent libjpeg-turbo libpng pulseaudio libwebp libx11 libxcb libxcomposite libxdamage libxext libxfixes libxkbcommon libxml2 libxrandr libxslt mesa musl nspr nss opus pango re2 snappy wayland xdg-utils nodejs"
-
-PKG_VER=100.0.4896.127
-
-SOURCE="https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$PKG_VER.tar.xz"
-
-fonts_package=cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb 
-_launcher_ver=8
-ADDITIONAL="
-https://github.com/Eloston/ungoogled-chromium/archive/$PKG_VER-1.tar.gz
-https://chromium-fonts.storage.googleapis.com/$fonts_package      
-
-chromium-VirtualCursor-standard-layout.patch
-chromium-revert-drop-of-system-java.patch
-chromium-use-alpine-target.patch
-chromium.conf
-chromium-launcher.sh
-chromium.desktop
-credentials-header.patch
-default-pthread-stacksize.patch
-elf-arm.patch
-fix-narrowing-cast.patch
-fix-unittests-sandbox.patch
-gcc-arm.patch
-gdbinit.patch
-google-api.keys
-media-base.patch
-memory-tagging-arm64.patch
-musl-crashpad.patch
-musl-fixes.patch
-musl-hacks.patch
-musl-sandbox.patch
-musl-stat.patch
-musl-tid-caching.patch
-musl-v8-monotonic-pthread-cont_timedwait.patch
-nasm.patch
-no-execinfo.patch
-no-getcontext.patch
-no-mallinfo.patch
-quiche-arena-size.patch
-resolver.patch
-revert-use-ffile-compilation-dir.patch
-scoped-file.patch
-system-opus.patch
-use-deprecated-ffmpeg-api.patch
-unbundle-ffmpeg-av_stream_get_first_dts.patch
-use-oauth2-client-switches-as-default.patch
-wayland-egl.patch
-webcodecs-stop-using-AudioOpusEncoder.patch
-"
-
-prepare () {
-    apply_patches
-
-    # Congratulations, you have found a bug! The bug is in the application that uses this internal glibc header
-    files="third_party/libsync/src/include/sync/sync.h
-    third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
-    base/allocator/allocator_shim_internals.h"
-    for f in $files; do 
-        sed -i "s/__BEGIN_DECLS/#ifdef __cplusplus\nextern \"C\" {\n#endif/g" $f
-        sed -i "s/__END_DECLS/#ifdef __cplusplus\n}\n#endif/g" $f
-        sed -i "s,#include <sys/cdefs.h>,," $f
-    done
-
-    # prevent annoying errors when regenerating gni
-	sed -i 's,^update_readme$,#update_readme,' \
-		third_party/libvpx/generate_gni.sh
-
-	# allow system dependencies in "official builds"
-	sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
-		tools/generate_shim_headers/generate_shim_headers.py
-
-
-    tar xf chromium-launcher-$_launcher_ver.tar.gz
-    tar xf $fonts_package
-    tar xf $PKG_VER-1.tar.gz
-    ungoogled_repo="ungoogled-chromium-$PKG_VER-1"
-    utils="${ungoogled_repo}/utils"
-
-    python "$utils/prune_binaries.py" ./ "$ungoogled_repo/pruning.list"
-    python "$utils/patches.py" apply ./ "$ungoogled_repo/patches"
-    python "$utils/domain_substitution.py" apply -r "$ungoogled_repo/domain_regex.list" \
-        -f "$ungoogled_repo/domain_substitution.list" -c domainsubcache.tar.gz ./
-    
-    mv test_fonts ./third_party/test_fonts
-
-    sed 's|//third_party/usb_ids/usb.ids|/usr/share/hwdata/usb.ids|g' \
-        -i services/device/public/cpp/usb/BUILD.gn
-
-    mkdir -p third_party/node/linux/node-linux-x64/bin
-    ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
-
-    # Remove bundled libraries for which we will use the system copies; this
-    # *should* do what the remove_bundled_libraries.py script does, with the
-    # added benefit of not having to list all the remaining libraries
-
-    local use_system="
-    ffmpeg
-    flac
-    fontconfig
-    freetype
-    harfbuzz-ng
-    libdrm
-    libevent
-    libjpeg
-    libwebp
-    libxml
-    libxslt
-    opus
-    re2
-    snappy
-    "
-
-    local _lib
-    for _lib in ${use_system}; do
-        for f in $(find "third_party/$_lib/chromium" "third_party/$_lib/google" -type f \( -name "*.gn" -or -name "*.gni" -or -name "*.isolate" \)); do
-            echo "removing $f to use system $_lib"
-            rm $f
-        done
-    done
-
-    python build/linux/unbundle/replace_gn_files.py \
-        --system-libraries ${use_system}
-    python third_party/libaddressinput/chromium/tools/update-strings.py
-}
-
-build () {
-    #export CC=clang
-    #export CXX=clang++
-    #export LD=clang++
-    #export AR=ar
-    #export NM=nm
-    export LDFLAGS="-stdlib=libstdc++"
-
-    flags="
-custom_toolchain=\"//build/toolchain/linux/unbundle:default\"
-host_toolchain=\"//build/toolchain/linux/unbundle:default\" 
-enable_nacl=false
-use_sysroot=false
-gold_path=\"/usr/bin/ld.gold\"
-use_custom_libcxx=false
-use_gold=false
-is_debug=false
-blink_symbol_level=0
-symbol_level=0
-icu_use_data_file=true
-use_allocator=\"none\"
-use_allocator_shim=false
-enable_widevine=true
-use_system_harfbuzz=false
-use_system_wayland_scanner=true
-use_cups=false
-use_gnome_keyring=false
-use_vaapi=true
-enable_js_type_check=true
-use_pulseaudio=true
-link_pulseaudio=true
-rtc_use_pipewire=true
-proprietary_codecs=false
-ffmpeg_branding=\"Chrome\"
-fatal_linker_warnings=false
-disable_fieldtrial_testing_config=true
-is_official_build=true
-is_cfi=false
-use_thin_lto=false
-use_cfi_icall=false
-chrome_pgo_phase=0
-    "
-
-    # Append ungoogled chromium flags to _flags array
-    flags="$flags
-    $(cat "ungoogled-chromium-$PKG_VER-1/flags.gn")
-    "
-
-    # Facilitate deterministic builds (taken from build/config/compiler/BUILD.gn)
-    CFLAGS="$CFLAGS   -Wno-builtin-macro-redefined"
-    CXXFLAGS="$CXXFLAGS -Wno-builtin-macro-redefined"
-    CPPFLAGS="$CPPFLAGS -D__DATE__=  -D__TIME__=  -D__TIMESTAMP__="
-
-    # Do not warn about unknown warning options
-    CFLAGS="$CFLAGS   -Wno-unknown-warning-option"
-    CXXFLAGS="$CXXFLAGS -Wno-unknown-warning-option"
-
-    python3 tools/gn/bootstrap/bootstrap.py -s -v --skip-generate-buildfiles
-
-    ./out/Release/gn gen out/Release --args="$flags"
-
-	ninja -C out/Release mksnapshot
-	ninja -C out/Release v8_context_snapshot_generator
-
-    ulimit -n 2048
-    ninja -C out/Release chrome chrome_sandbox chromedriver
-}
-
-package () {
-    install -Dm755 chromium-launcher.sh \
-        "$PKG_DEST"/usr/lib/chromium/chromium-launcher.sh
-
-    install -D out/Release/chrome "$PKG_DEST/usr/lib/chromium/chromium"
-    install -D out/Release/chromedriver "$PKG_DEST/usr/bin/chromedriver"
-    install -Dm4755 out/Release/chrome_sandbox "$PKG_DEST/usr/lib/chromium/chrome-sandbox"
-
-    install -Dm644 ../chromium-drirc-disable-10bpc-color-configs.conf \
-    "$PKG_DEST/usr/share/drirc.d/10-chromium.conf"
-
-    install -Dm644 chrome/installer/linux/common/desktop.template \
-        "$PKG_DEST/usr/share/applications/chromium.desktop"
-    install -Dm644 chrome/app/resources/manpage.1.in \
-        "$PKG_DEST/usr/share/man/man1/chromium.1"
-    sed -i \
-        -e 's/@@MENUNAME@@/Chromium/g' \
-        -e 's/@@PACKAGE@@/chromium/g' \
-        -e 's/@@USR_BIN_SYMLINK_NAME@@/chromium/g' \
-        "$PKG_DEST/usr/share/applications/chromium.desktop" \
-        "$PKG_DEST/usr/share/man/man1/chromium.1"
-
-    install -Dm644 chrome/installer/linux/common/chromium-browser/chromium-browser.appdata.xml \
-        "$PKG_DEST/usr/share/metainfo/chromium.appdata.xml"
-    sed -ni \
-    -e 's/chromium-browser\.desktop/chromium.desktop/' \
-    -e '/<update_contact>/d' \
-    -e '/<p>/N;/<p>\n.*\(We invite\|Chromium supports Vorbis\)/,/<\/p>/d' \
-    -e '/^<?xml/,$p' \
-    "$PKG_DEST/usr/share/metainfo/chromium.appdata.xml"
-
-    local toplevel_files="
-chrome_100_percent.pak
-chrome_200_percent.pak
-chrome_crashpad_handler
-resources.pak
-v8_context_snapshot.bin
-snapshot_blob.bin
-xdg-mime
-xdg-settings
-libEGL.so
-libGLESv2.so
-libvk_swiftshader.so
-vk_swiftshader_icd.json
-icudtl.dat
-libvulkan.so.1
-    "
-
-    mkdir -p "$PKG_DEST/usr/lib/chromium"
-    mkdir -p "$PKG_DEST/usr/lib/chromium/locales"
-    mkdir -p "$PKG_DEST/usr/lib/chromium/swiftshader"
-
-    for file in $toplevel_files; do
-        cp out/Release/$file "$PKG_DEST/usr/lib/chromium/"
-    done
-
-    for locale in out/Release/locales/* ; do
-        install -Dm644 $locale "$PKG_DEST/usr/lib/chromium/locales" 
-    done
-    for shader in out/Release/swiftshader/*.so; do 
-        install -Dm755 $shader "$PKG_DEST/usr/lib/chromium/swiftshader"
-    done
-
-    for size in 24 48 64 128 256; do
-        install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \
-            "$PKG_DEST/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
-    done
-
-    for size in 16 32; do
-        install -Dm644 "chrome/app/theme/default_100_percent/chromium/product_logo_$size.png" \
-            "$PKG_DEST/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
-    done
- 
-    install -Dm644 LICENSE "$PKG_DEST/usr/share/licenses/chromium/LICENSE"
-
-    mkdir -p "$PKG_DEST"/usr/bin
-    ln -sf /usr/lib/chromium/chromium-launcher.sh "$PKG_DEST"/usr/bin/chromium-browser
-    install -Dm644 chromium.conf \
-        "$PKG_DEST"/etc/chromium/chromium.conf
-
-    install -Dm644 chromium.desktop \
-        "$PKG_DEST"/usr/share/applications/chromium.desktop
-
-}
diff --git a/repo/apps/chromium/credentials-header.patch b/repo/apps/chromium/credentials-header.patch
deleted file mode 100644
index 840bd2a..0000000
--- a/repo/apps/chromium/credentials-header.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./sandbox/linux/services/credentials.h.orig
-+++ ./sandbox/linux/services/credentials.h
-@@ -14,6 +14,8 @@
- #include <string>
- #include <vector>
- 
-+#include <sys/types.h>
-+
- #include "sandbox/linux/system_headers/capability.h"
- #include "sandbox/sandbox_export.h"
- 
diff --git a/repo/apps/chromium/default-pthread-stacksize.patch b/repo/apps/chromium/default-pthread-stacksize.patch
deleted file mode 100644
index 74ebc76..0000000
--- a/repo/apps/chromium/default-pthread-stacksize.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- ./base/threading/platform_thread_linux.cc
-+++ ./base/threading/platform_thread_linux.cc
-@@ -186,7 +186,8 @@
- 
- size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
- #if !defined(THREAD_SANITIZER)
--  return 0;
-+  // use 2mb to avoid running out of space. This is what android uses
-+  return 2 * (1 << 20);
- #else
-   // ThreadSanitizer bloats the stack heavily. Evidence has been that the
-   // default stack size isn't enough for some browser tests.
---- ./base/threading/platform_thread_unittest.cc.orig
-+++ ./base/threading/platform_thread_unittest.cc
-@@ -420,7 +420,7 @@
-     ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) &&                \
-      !defined(THREAD_SANITIZER)) ||                                    \
-     (BUILDFLAG(IS_ANDROID) && !defined(ADDRESS_SANITIZER))
--  EXPECT_EQ(0u, stack_size);
-+  EXPECT_EQ(2u << 20, stack_size);
- #else
-   EXPECT_GT(stack_size, 0u);
-   EXPECT_LT(stack_size, 20u * (1 << 20));
---- ./chrome/browser/shutdown_signal_handlers_posix.cc
-+++ ./chrome/browser/shutdown_signal_handlers_posix.cc
-@@ -187,11 +187,19 @@
-   g_shutdown_pipe_read_fd = pipefd[0];
-   g_shutdown_pipe_write_fd = pipefd[1];
- #if !defined(ADDRESS_SANITIZER)
-+# if defined(__GLIBC__)
-   const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
-+# else
-+  const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2 * 8; // match up musls 2k PTHREAD_STACK_MIN with glibcs 16k
-+# endif
- #else
-+# if defined(__GLIBC__)
-   // ASan instrumentation bloats the stack frames, so we need to increase the
-   // stack size to avoid hitting the guard page.
-   const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
-+# else
-+  const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4 * 8; // match up musls 2k PTHREAD_STACK_MIN with glibcs 16k
-+# endif
- #endif
-   ShutdownDetector* detector = new ShutdownDetector(
-       g_shutdown_pipe_read_fd, std::move(shutdown_callback), task_runner);
diff --git a/repo/apps/chromium/elf-arm.patch b/repo/apps/chromium/elf-arm.patch
deleted file mode 100644
index 3799dc9..0000000
--- a/repo/apps/chromium/elf-arm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./v8/src/base/cpu.cc.orig
-+++ ./v8/src/base/cpu.cc
-@@ -16,7 +16,7 @@
- #if V8_OS_QNX
- #include <sys/syspage.h>  // cpuinfo
- #endif
--#if V8_OS_LINUX && (V8_HOST_ARCH_PPC || V8_HOST_ARCH_PPC64)
-+#if V8_OS_LINUX && (V8_HOST_ARCH_PPC || V8_HOST_ARCH_PPC64 || V8_HOST_ARCH_ARM)
- #include <elf.h>
- #endif
- #if V8_OS_AIX
diff --git a/repo/apps/chromium/enable-GlobalMediaControlsCastStartStop.patch b/repo/apps/chromium/enable-GlobalMediaControlsCastStartStop.patch
deleted file mode 100644
index e0d4544..0000000
--- a/repo/apps/chromium/enable-GlobalMediaControlsCastStartStop.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b58f0f2725a8c1a8a131f9984b5fd53b54119dba Mon Sep 17 00:00:00 2001
-From: Muyao Xu <muyaoxu@google.com>
-Date: Thu, 20 Jan 2022 23:46:21 +0000
-Subject: [PATCH] [Zenith] Enable GlobalMediaControlsCastStartStop flag by
- default
-
-The feature is rolled out to 100% stable through finch for M96+.
-This CL enables it by default and fixes some unit tests failures.
-
-Bug: 1287242, 1287305
-Change-Id: I7e5c9625b77379fef253c41ef292a0dd6fc366fb
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3388416
-Reviewed-by: Takumi Fujimoto <takumif@chromium.org>
-Commit-Queue: Muyao Xu <muyaoxu@google.com>
-Cr-Commit-Position: refs/heads/main@{#961658}
----
- chrome/browser/media/router/media_router_feature.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
-index f28f9b0b802..a8d544f7d6d 100644
---- a/chrome/browser/media/router/media_router_feature.cc
-+++ b/chrome/browser/media/router/media_router_feature.cc
-@@ -33,7 +33,7 @@ const base::Feature kMediaRouter{"MediaRouter",
- const base::Feature kCastAllowAllIPsFeature{"CastAllowAllIPs",
-                                             base::FEATURE_DISABLED_BY_DEFAULT};
- const base::Feature kGlobalMediaControlsCastStartStop{
--    "GlobalMediaControlsCastStartStop", base::FEATURE_DISABLED_BY_DEFAULT};
-+    "GlobalMediaControlsCastStartStop", base::FEATURE_ENABLED_BY_DEFAULT};
- const base::Feature kAllowAllSitesToInitiateMirroring{
-     "AllowAllSitesToInitiateMirroring", base::FEATURE_DISABLED_BY_DEFAULT};
- const base::Feature kDialMediaRouteProvider{"DialMediaRouteProvider",
diff --git a/repo/apps/chromium/fix-narrowing-cast.patch b/repo/apps/chromium/fix-narrowing-cast.patch
deleted file mode 100644
index afd42a1..0000000
--- a/repo/apps/chromium/fix-narrowing-cast.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/base/files/file_util_linux.cc
-+++ b/base/files/file_util_linux.cc
-@@ -23,14 +23,14 @@
- 
-   // Not all possible |statfs_buf.f_type| values are in linux/magic.h.
-   // Missing values are copied from the statfs man page.
--  switch (statfs_buf.f_type) {
-+  switch (static_cast<uintmax_t>(statfs_buf.f_type)) {
-     case 0:
-       *type = FILE_SYSTEM_0;
-       break;
-     case EXT2_SUPER_MAGIC:  // Also ext3 and ext4
-     case MSDOS_SUPER_MAGIC:
-     case REISERFS_SUPER_MAGIC:
--    case static_cast<int>(BTRFS_SUPER_MAGIC):
-+    case BTRFS_SUPER_MAGIC:
-     case 0x5346544E:  // NTFS
-     case 0x58465342:  // XFS
-     case 0x3153464A:  // JFS
-@@ -40,14 +40,14 @@
-       *type = FILE_SYSTEM_NFS;
-       break;
-     case SMB_SUPER_MAGIC:
--    case static_cast<int>(0xFF534D42):  // CIFS
-+    case 0xFF534D42:  // CIFS
-       *type = FILE_SYSTEM_SMB;
-       break;
-     case CODA_SUPER_MAGIC:
-       *type = FILE_SYSTEM_CODA;
-       break;
--    case static_cast<int>(HUGETLBFS_MAGIC):
--    case static_cast<int>(RAMFS_MAGIC):
-+    case HUGETLBFS_MAGIC:
-+    case RAMFS_MAGIC:
-     case TMPFS_MAGIC:
-       *type = FILE_SYSTEM_MEMORY;
-       break;
---- a/base/system/sys_info_posix.cc
-+++ b/base/system/sys_info_posix.cc
-@@ -100,10 +100,10 @@
-   if (HANDLE_EINTR(statfs(path.value().c_str(), &stats)) != 0)
-     return false;
- 
--  switch (stats.f_type) {
-+  switch (static_cast<uintmax_t>(stats.f_type)) {
-     case TMPFS_MAGIC:
--    case static_cast<int>(HUGETLBFS_MAGIC):
--    case static_cast<int>(RAMFS_MAGIC):
-+    case HUGETLBFS_MAGIC:
-+    case RAMFS_MAGIC:
-       return true;
-   }
-   return false;
diff --git a/repo/apps/chromium/fix-unittests-sandbox.patch b/repo/apps/chromium/fix-unittests-sandbox.patch
deleted file mode 100644
index e11face..0000000
--- a/repo/apps/chromium/fix-unittests-sandbox.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./sandbox/linux/syscall_broker/broker_file_permission_unittest.cc.orig
-+++ ./sandbox/linux/syscall_broker/broker_file_permission_unittest.cc
-@@ -134,7 +134,7 @@
- #endif
- 
-   const int kNumberOfBitsInOAccMode = 2;
--  static_assert(O_ACCMODE == ((1 << kNumberOfBitsInOAccMode) - 1),
-+  static_assert(O_ACCMODE == (((1 << kNumberOfBitsInOAccMode) - 1) | O_PATH),
-                 "incorrect number of bits");
-   // check every possible flag and act accordingly.
-   // Skipping AccMode bits as they are present in every case.
diff --git a/repo/apps/chromium/gcc-arm.patch b/repo/apps/chromium/gcc-arm.patch
deleted file mode 100644
index 9eaa240..0000000
--- a/repo/apps/chromium/gcc-arm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./third_party/zlib/BUILD.gn.orig
-+++ ./third_party/zlib/BUILD.gn
-@@ -21,7 +21,7 @@
-     !(is_win && !is_clang)) {
-   # TODO(richard.townsend@arm.com): Optimizations temporarily disabled for
-   # Windows on Arm MSVC builds, see http://crbug.com/v8/10012.
--  if (arm_use_neon) {
-+  if (arm_use_neon && is_clang) {
-     use_arm_neon_optimizations = true
-   }
- }
diff --git a/repo/apps/chromium/gdbinit.patch b/repo/apps/chromium/gdbinit.patch
deleted file mode 100644
index 39d3464..0000000
--- a/repo/apps/chromium/gdbinit.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- ./tools/gdb/gdbinit.orig
-+++ ./tools/gdb/gdbinit
-@@ -50,17 +50,7 @@
- 
- def set_src_dir(compile_dir):
-   global src_dir
--  git = subprocess.Popen(
--      ['git', '-C', compile_dir, 'rev-parse', '--show-toplevel'],
--      stdout=subprocess.PIPE,
--      stderr=subprocess.PIPE)
--  src_dir, _ = git.communicate()
--  if git.returncode:
--    return
--  if isinstance(src_dir, str):
--    src_dir = src_dir.rstrip()
--  else:
--    src_dir = src_dir.decode('utf-8').rstrip()
-+  src_dir = os.path.abspath(os.getcwd())
- 
-   load_libcxx_pretty_printers(src_dir)
- 
diff --git a/repo/apps/chromium/google-api.keys b/repo/apps/chromium/google-api.keys
deleted file mode 100644
index 8cd0f0a..0000000
--- a/repo/apps/chromium/google-api.keys
+++ /dev/null
@@ -1,10 +0,0 @@
-IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
-IyMjIyMKIyBQbGVhc2UgZG9udCB1c2UgdGhlc2Uga2V5cyBvdXRzaWRlIG9mIEFscGluZSBMaW51
-eCBwcm9qZWN0ICMKIyBZb3UgY2FuIGNyZWF0ZSB5b3VyIG93biBhdDogICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICMKIyBodHRwOi8vd3d3LmNocm9taXVtLm9yZy9kZXZlbG9wZXJzL2hv
-dy10b3MvYXBpLWtleXMgICAgICAgICMKIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
-IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKX2dvb2dsZV9hcGlfa2V5PSJBSXphU3lDUkk0
-RUdwRHVfQUFISThFMnllbmpWaFdRZHA0RzhpZ2MiCl9nb29nbGVfZGVmYXVsdF9jbGllbnRfaWQ9
-IjQ5NzU1MDYyMjM2Ny11YnRrbWQzYjJwcDVndWxiYTVuNmhhNnNxNG4zNWVoai5hcHBzLmdvb2ds
-ZXVzZXJjb250ZW50LmNvbSIKX2dvb2dsZV9kZWZhdWx0X2NsaWVudF9zZWNyZXQ9Ik5hQ1g4dElJ
-QXBocmpzNTZuM1RwSHhfZSIKCg==
diff --git a/repo/apps/chromium/media-base.patch b/repo/apps/chromium/media-base.patch
deleted file mode 100644
index 99b881f..0000000
--- a/repo/apps/chromium/media-base.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./media/base/subsample_entry.h
-+++ ./media/base/subsample_entry.h
-@@ -9,6 +9,7 @@
- #include <stdint.h>
- 
- #include <vector>
-+#include <cstddef>
- 
- #include "media/base/media_export.h"
- 
diff --git a/repo/apps/chromium/memory-tagging-arm64.patch b/repo/apps/chromium/memory-tagging-arm64.patch
deleted file mode 100644
index 6072698..0000000
--- a/repo/apps/chromium/memory-tagging-arm64.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./base/allocator/partition_allocator/tagging.cc.orig
-+++ ./base/allocator/partition_allocator/tagging.cc
-@@ -19,15 +19,6 @@
- #define PR_GET_TAGGED_ADDR_CTRL 56
- #define PR_TAGGED_ADDR_ENABLE (1UL << 0)
- 
--#if BUILDFLAG(IS_LINUX)
--#include <linux/version.h>
--
--// Linux headers already provide these since v5.10.
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0)
--#define HAS_PR_MTE_MACROS
--#endif
--#endif
--
- #ifndef HAS_PR_MTE_MACROS
- #define PR_MTE_TCF_SHIFT 1
- #define PR_MTE_TCF_NONE (0UL << PR_MTE_TCF_SHIFT)
diff --git a/repo/apps/chromium/musl-crashpad.patch b/repo/apps/chromium/musl-crashpad.patch
deleted file mode 100644
index 387deea..0000000
--- a/repo/apps/chromium/musl-crashpad.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/third_party/crashpad/crashpad/util/linux/ptracer.cc b/third_party/crashpad/crashpad/util/linux/ptracer.cc
-index c6c9229..a5336b6 100644
---- ./third_party/crashpad/crashpad/util/linux/ptracer.cc
-+++ ./third_party/crashpad/crashpad/util/linux/ptracer.cc
-@@ -26,6 +26,7 @@
- 
- #if defined(ARCH_CPU_X86_FAMILY)
- #include <asm/ldt.h>
-+#include <asm/ptrace-abi.h>
- #endif
- 
- namespace crashpad {
-diff --git a/third_party/crashpad/crashpad/util/linux/thread_info.h b/third_party/crashpad/crashpad/util/linux/thread_info.h
-index 5b55c24..08cec52 100644
---- ./third_party/crashpad/crashpad/util/linux/thread_info.h
-+++ ./third_party/crashpad/crashpad/util/linux/thread_info.h
-@@ -273,7 +273,7 @@ union FloatContext {
-                 "Size mismatch");
- #elif defined(ARCH_CPU_ARMEL)
-   static_assert(sizeof(f32_t::fpregs) == sizeof(user_fpregs), "Size mismatch");
--#if !defined(__GLIBC__)
-+#if defined(OS_ANDROID)
-   static_assert(sizeof(f32_t::vfp) == sizeof(user_vfp), "Size mismatch");
- #endif
- #elif defined(ARCH_CPU_ARM64)
diff --git a/repo/apps/chromium/musl-fixes.patch b/repo/apps/chromium/musl-fixes.patch
deleted file mode 100644
index da2c115..0000000
--- a/repo/apps/chromium/musl-fixes.patch
+++ /dev/null
@@ -1,221 +0,0 @@
---- ./third_party/lss/linux_syscall_support.h.orig
-+++ ./third_party/lss/linux_syscall_support.h
-@@ -1127,6 +1127,12 @@
- #ifndef __NR_fallocate
- #define __NR_fallocate          285
- #endif
-+
-+#undef __NR_pread
-+#define __NR_pread __NR_pread64
-+#undef __NR_pwrite
-+#define __NR_pwrite __NR_pwrite64
-+
- /* End of x86-64 definitions                                                 */
- #elif defined(__mips__)
- #if _MIPS_SIM == _MIPS_SIM_ABI32
---- ./third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h.orig
-+++ ./third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-@@ -37,6 +37,10 @@
- #include "common/memory.h"
- #include "google_breakpad/common/minidump_format.h"
- 
-+#if !defined(__GLIBC__)
-+	#define _libc_fpstate _fpstate
-+#endif
-+
- namespace google_breakpad {
- 
- // Wraps platform-dependent implementations of accessors to ucontext_t structs.
---- ./third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h.orig
-+++ ./third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
-@@ -36,6 +36,7 @@
- #include <elf.h>
- #include <link.h>
- #include <stddef.h>
-+#include <limits.h>
- 
- #include "common/memory_range.h"
- 
---- ./sandbox/linux/suid/process_util.h.orig
-+++ ./sandbox/linux/suid/process_util.h
-@@ -11,6 +11,14 @@
- #include <stdbool.h>
- #include <sys/types.h>
- 
-+// Some additional functions
-+# define TEMP_FAILURE_RETRY(expression) \
-+	(__extension__			\
-+	 ({ long int __result;		\
-+	  do __result = (long int) (expression); \
-+	  while (__result == -1L && errno == EINTR); \
-+	  __result; }))
-+
- // This adjusts /proc/process/oom_score_adj so the Linux OOM killer
- // will prefer certain process types over others. The range for the
- // adjustment is [-1000, 1000], with [0, 1000] being user accessible.
---- ./sandbox/linux/seccomp-bpf/trap.cc.orig	2020-04-12 08:26:40.184159217 -0400
-+++ ./sandbox/linux/seccomp-bpf/trap.cc	2020-04-12 08:46:16.737191222 -0400
-@@ -174,7 +174,7 @@
-   // If the version of glibc doesn't include this information in
-   // siginfo_t (older than 2.17), we need to explicitly copy it
-   // into an arch_sigsys structure.
--  memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
-+  memcpy(&sigsys, &info->__sifields, sizeof(sigsys));
- #endif
- 
- #if defined(__mips__)
-diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
---- ./chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig
-+++ ./chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-@@ -59,7 +59,9 @@
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(__GLIBC__)
- #include <gnu/libc-version.h>
-+#endif
- 
- #include "base/linux_util.h"
- #include "base/strings/string_split.h"
-@@ -321,7 +323,7 @@
- void RecordLinuxGlibcVersion() {
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(__GLIBC__) || BUILDFLAG(IS_CHROMEOS_LACROS)
-   base::Version version(gnu_get_libc_version());
- 
-   UMALinuxGlibcVersion glibc_version_result = UMA_LINUX_GLIBC_NOT_PARSEABLE;
---- ./services/device/serial/serial_io_handler_posix.cc.orig	2019-07-03 10:57:32.568171835 -0400
-+++ ./services/device/serial/serial_io_handler_posix.cc	2019-07-03 10:57:16.867983031 -0400
-@@ -6,6 +6,7 @@
- 
- #include <sys/ioctl.h>
- #include <termios.h>
-+#include <asm-generic/ioctls.h>
- 
- #include <algorithm>
- #include <utility>
-diff --git a/third_party/ots/include/opentype-sanitiser.h b/third_party/ots/include/opentype-sanitiser.h
---- ./third_party/ots/src/include/opentype-sanitiser.h
-+++ ./third_party/ots/src/include/opentype-sanitiser.h
-@@ -20,6 +20,7 @@ typedef unsigned __int64 uint64_t;
- #define htonl(x) _byteswap_ulong (x)
- #define htons(x) _byteswap_ushort (x)
- #else
-+#include <sys/types.h>
- #include <arpa/inet.h>
- #include <stdint.h>
- #endif
---- ./base/logging.cc.orig
-+++ ./base/logging.cc
-@@ -592,8 +592,7 @@
- 
- LogMessage::~LogMessage() {
-   size_t stack_start = stream_.tellp();
--#if !defined(OFFICIAL_BUILD) && !BUILDFLAG(IS_NACL) && !defined(__UCLIBC__) && \
--    !BUILDFLAG(IS_AIX)
-+#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__)
-   if (severity_ == LOGGING_FATAL && !base::debug::BeingDebugged()) {
-     // Include a stack trace on a fatal, unless a debugger is attached.
-     base::debug::StackTrace stack_trace;
---- ./third_party/blink/renderer/platform/wtf/stack_util.cc.orig
-+++ ./third_party/blink/renderer/platform/wtf/stack_util.cc
-@@ -28,7 +28,7 @@
- // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
- // correctly for the main thread.
- 
--#elif defined(__GLIBC__) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
-     BUILDFLAG(IS_FUCHSIA)
-   // pthread_getattr_np() can fail if the thread is not invoked by
-   // pthread_create() (e.g., the main thread of blink_unittests).
-@@ -96,7 +96,7 @@
- }
- 
- void* GetStackStart() {
--#if defined(__GLIBC__) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
-     BUILDFLAG(IS_FUCHSIA)
-   pthread_attr_t attr;
-   int error;
---- ./third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Signals.inc.orig	2019-06-18 11:51:17.000000000 -0400
-+++ ./third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Signals.inc	2019-07-03 12:32:50.938758186 -0400
-@@ -25,7 +25,7 @@
- #include "llvm/Support/raw_ostream.h"
- #include <algorithm>
- #include <string>
--#if HAVE_EXECINFO_H
-+#if HAVE_EXECINFO_H && defined(__GLIBC__)
- # include <execinfo.h>         // For backtrace().
- #endif
- #if HAVE_SIGNAL_H
-@@ -52,6 +52,7 @@
- #include <unwind.h>
- #else
- #undef HAVE__UNWIND_BACKTRACE
-+#undef HAVE_BACKTRACE
- #endif
- #endif
- 
---- ./third_party/nasm/nasmlib/realpath.c.orig	2019-07-03 12:23:05.021949895 -0400
-+++ ./third_party/nasm/nasmlib/realpath.c	2019-07-03 12:24:24.246862665 -0400
-@@ -49,7 +49,7 @@
- 
- #include "nasmlib.h"
- 
--#ifdef HAVE_CANONICALIZE_FILE_NAME
-+#if defined(__GLIBC__)
- 
- /*
-  * GNU-specific, but avoids the realpath(..., NULL)
---- ./third_party/perfetto/include/perfetto/ext/base/thread_utils.h
-+++ ./third_party/perfetto/include/perfetto/ext/base/thread_utils.h
-@@ -29,7 +29,7 @@
- #include <algorithm>
- #endif
- 
--#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
-+#if 1
- #include <sys/prctl.h>
- #endif
- 
-@@ -58,7 +58,7 @@ inline bool MaybeSetThreadName(const std::string& name) {
- 
- inline bool GetThreadName(std::string& out_result) {
-   char buf[16] = {};
--#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
-+#if 1
-   if (prctl(PR_GET_NAME, buf) != 0)
-     return false;
- #else
---- ./net/dns/public/scoped_res_state.cc.orig
-+++ ./net/dns/public/scoped_res_state.cc
-@@ -13,7 +13,7 @@
- namespace net {
- 
- ScopedResState::ScopedResState() {
--#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA) || defined(_GNU_SOURCE)
-   // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
-   // res_init behaves the same way.
-   memset(&_res, 0, sizeof(_res));
-@@ -25,16 +25,8 @@
- }
- 
- ScopedResState::~ScopedResState() {
--#if !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA)
--
--  // Prefer res_ndestroy where available.
--#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FREEBSD)
--  res_ndestroy(&res_);
--#else
--  res_nclose(&res_);
--#endif  // BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FREEBSD)
--
--#endif  // !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA)
-+  // musl res_init() doesn't actually do anything
-+  // no destruction is necessary as no memory has been allocated
- }
- 
- bool ScopedResState::IsValid() const {
diff --git a/repo/apps/chromium/musl-hacks.patch b/repo/apps/chromium/musl-hacks.patch
deleted file mode 100644
index 93db25a..0000000
--- a/repo/apps/chromium/musl-hacks.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- ./base/debug/stack_trace.cc
-+++ ./base/debug/stack_trace.cc
-@@ -168,7 +168,7 @@
- 
- #if BUILDFLAG(CAN_UNWIND_WITH_FRAME_POINTERS)
- uintptr_t GetStackEnd() {
--#if BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_ANDROID) || (defined(OS_LINUX) && !defined(__GLIBC__))
-   // Bionic reads proc/maps on every call to pthread_getattr_np() when called
-   // from the main thread. So we need to cache end of stack in that case to get
-   // acceptable performance.
-@@ -234,8 +234,10 @@
-     defined(MEMORY_SANITIZER)
-   // Sanitizer configurations (ASan, TSan, MSan) emit unsymbolized stacks.
-   return false;
--#else
-+#elif defined(__GLIBC__)
-   return true;
-+#else
-+  return false;
- #endif
- }
- 
-@@ -251,7 +253,9 @@
- }
- 
- void StackTrace::OutputToStream(std::ostream* os) const {
-+#if defined(__GLIBC__) && !defined(_AIX)
-   OutputToStreamWithPrefix(os, nullptr);
-+#endif
- }
- 
- std::string StackTrace::ToString() const {
-@@ -259,7 +263,7 @@
- }
- std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
-   std::stringstream stream;
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(_AIX)
-   OutputToStreamWithPrefix(&stream, prefix_string);
- #endif
-   return stream.str();
---- ./net/socket/udp_socket_posix.cc
-+++ ./net/socket/udp_socket_posix.cc
-@@ -1191,7 +1191,7 @@
-     msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
-   msgvec->reserve(buffers.size());
-   for (size_t j = 0; j < buffers.size(); j++)
--    msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
-+    msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, 0, 0}, 0});
-   int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
-   SendResult send_result(0, 0, std::move(buffers));
-   if (result < 0) {
---- ./base/debug/elf_reader.cc.orig
-+++ ./base/debug/elf_reader.cc
-@@ -149,7 +149,12 @@
-         strtab_addr = static_cast<size_t>(dynamic_iter->d_un.d_ptr) +
-                       reinterpret_cast<const char*>(relocation_offset);
- #else
--        strtab_addr = reinterpret_cast<const char*>(dynamic_iter->d_un.d_ptr);
-+        if (dynamic_iter->d_un.d_ptr < relocation_offset) {
-+          strtab_addr = static_cast<size_t>(dynamic_iter->d_un.d_ptr) +
-+                        reinterpret_cast<const char*>(relocation_offset);
-+        } else {
-+          strtab_addr = reinterpret_cast<const char*>(dynamic_iter->d_un.d_ptr);
-+        }
- #endif
-       } else if (dynamic_iter->d_tag == DT_SONAME) {
-         soname_strtab_offset = dynamic_iter->d_un.d_val;
---- ./mojo/public/c/system/thunks.cc.orig
-+++ ./mojo/public/c/system/thunks.cc
-@@ -100,7 +100,8 @@
-     base::ScopedAllowBlocking allow_blocking;
-     base::NativeLibraryOptions library_options;
- #if !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER) && \
--    !defined(MEMORY_SANITIZER) && !defined(LEAK_SANITIZER)
-+    !defined(MEMORY_SANITIZER) && !defined(LEAK_SANITIZER) && \
-+    defined(RTLD_DEEPBIND)
-     // Sanitizer builds cannnot support RTLD_DEEPBIND, but they also disable
-     // allocator shims, so it's unnecessary there.
-     library_options.prefer_own_symbols = true;
---- ./base/native_library_unittest.cc.orig
-+++ ./base/native_library_unittest.cc
-@@ -121,6 +121,7 @@
- #if !defined(OS_ANDROID) && !defined(THREAD_SANITIZER) && \
-     !defined(MEMORY_SANITIZER)
- 
-+#if defined(RTLD_DEEPBIND)
- // Verifies that the |prefer_own_symbols| option satisfies its guarantee that
- // a loaded library will always prefer local symbol resolution before
- // considering global symbols.
-@@ -156,6 +157,7 @@
-   EXPECT_EQ(2, NativeLibraryTestIncrement());
-   EXPECT_EQ(3, NativeLibraryTestIncrement());
- }
-+#endif // defined(RTLD_DEEPBIND)
- 
- #endif  // !defined(OS_ANDROID)
diff --git a/repo/apps/chromium/musl-sandbox.patch b/repo/apps/chromium/musl-sandbox.patch
deleted file mode 100644
index 4fe0098..0000000
--- a/repo/apps/chromium/musl-sandbox.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-index ff5a1c0..da56b9b 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-+++ ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-@@ -139,21 +139,11 @@ namespace sandbox {
- // present (as in newer versions of posix_spawn).
- ResultExpr RestrictCloneToThreadsAndEPERMFork() {
-   const Arg<unsigned long> flags(0);
--
--  // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
--  const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
--                                     CLONE_SIGHAND | CLONE_THREAD |
--                                     CLONE_SYSVSEM;
--  const uint64_t kObsoleteAndroidCloneMask = kAndroidCloneMask | CLONE_DETACHED;
--
--  const uint64_t kGlibcPthreadFlags =
--      CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD |
--      CLONE_SYSVSEM | CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID;
--  const BoolExpr glibc_test = flags == kGlibcPthreadFlags;
--
--  const BoolExpr android_test =
--      AnyOf(flags == kAndroidCloneMask, flags == kObsoleteAndroidCloneMask,
--            flags == kGlibcPthreadFlags);
-+  const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
-+                       CLONE_THREAD | CLONE_SYSVSEM;
-+  const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
-+                   CLONE_DETACHED;
-+  const BoolExpr thread_clone_ok = (flags&~safe)==required;
- 
-   // The following two flags are the two important flags in any vfork-emulating
-   // clone call. EPERM any clone call that contains both of them.
-@@ -163,7 +153,7 @@ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
-       AnyOf((flags & (CLONE_VM | CLONE_THREAD)) == 0,
-             (flags & kImportantCloneVforkFlags) == kImportantCloneVforkFlags);
- 
--  return If(IsAndroid() ? android_test : glibc_test, Allow())
-+  return If(thread_clone_ok, Allow())
-       .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
-       .Else(CrashSIGSYSClone());
- }
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-index d9d1882..0567557 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-+++ ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-@@ -392,6 +392,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
- #if defined(__i386__)
-     case __NR_waitpid:
- #endif
-+    case __NR_set_tid_address:
-       return true;
-     case __NR_clone:  // Should be parameter-restricted.
-     case __NR_setns:  // Privileged.
-@@ -404,7 +405,6 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
- #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-     case __NR_set_thread_area:
- #endif
--    case __NR_set_tid_address:
-     case __NR_unshare:
- #if !defined(__mips__) && !defined(__aarch64__)
-     case __NR_vfork:
-@@ -514,6 +514,8 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
-     case __NR_mlock:
-     case __NR_munlock:
-     case __NR_munmap:
-+    case __NR_mremap:
-+    case __NR_membarrier:
-       return true;
-     case __NR_madvise:
-     case __NR_mincore:
-@@ -531,7 +533,6 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
-     case __NR_modify_ldt:
- #endif
-     case __NR_mprotect:
--    case __NR_mremap:
-     case __NR_msync:
-     case __NR_munlockall:
-     case __NR_readahead:
-diff --git a/sandbox/linux/system_headers/arm64_linux_syscalls.h ./sandbox/linux/system_headers/arm64_linux_syscalls.h
-index 59d0eab..7ae7002 100644
---- a/sandbox/linux/system_headers/arm64_linux_syscalls.h
-+++ ./sandbox/linux/system_headers/arm64_linux_syscalls.h
-@@ -1063,4 +1063,8 @@
- #define __NR_memfd_create 279
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier 283
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
-diff --git a/sandbox/linux/system_headers/arm_linux_syscalls.h ./sandbox/linux/system_headers/arm_linux_syscalls.h
-index 1addd53..7843b5e 100644
---- a/sandbox/linux/system_headers/arm_linux_syscalls.h
-+++ ./sandbox/linux/system_headers/arm_linux_syscalls.h
-@@ -1385,6 +1385,10 @@
- #define __NR_memfd_create (__NR_SYSCALL_BASE+385)
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier (__NR_SYSCALL_BASE+389)
-+#endif
-+
- // ARM private syscalls.
- #if !defined(__ARM_NR_BASE)
- #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
-diff --git a/sandbox/linux/system_headers/linux_syscalls.h ./sandbox/linux/system_headers/linux_syscalls.h
-index 2b78a0c..b6fedb5 100644
---- a/sandbox/linux/system_headers/linux_syscalls.h
-+++ ./sandbox/linux/system_headers/linux_syscalls.h
-@@ -10,6 +10,7 @@
- #define SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
- 
- #include "build/build_config.h"
-+#include <sys/syscall.h>
- 
- #if defined(__x86_64__)
- #include "sandbox/linux/system_headers/x86_64_linux_syscalls.h"
-diff --git a/sandbox/linux/system_headers/mips64_linux_syscalls.h ./sandbox/linux/system_headers/mips64_linux_syscalls.h
-index ec75815..5515270 100644
---- a/sandbox/linux/system_headers/mips64_linux_syscalls.h
-+++ ./sandbox/linux/system_headers/mips64_linux_syscalls.h
-@@ -1271,4 +1271,8 @@
- #define __NR_memfd_create (__NR_Linux + 314)
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier (__NR_Linux  318)
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS64_LINUX_SYSCALLS_H_
-diff --git a/sandbox/linux/system_headers/mips_linux_syscalls.h ./sandbox/linux/system_headers/mips_linux_syscalls.h
-index ddbf97f..ad3d64b 100644
---- a/sandbox/linux/system_headers/mips_linux_syscalls.h
-+++ ./sandbox/linux/system_headers/mips_linux_syscalls.h
-@@ -1433,4 +1433,8 @@
- #define __NR_memfd_create (__NR_Linux + 354)
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier (__NR_Linux  358)
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS_LINUX_SYSCALLS_H_
-diff --git a/sandbox/linux/system_headers/x86_64_linux_syscalls.h ./sandbox/linux/system_headers/x86_64_linux_syscalls.h
-index b0ae0a2..8b12029 100644
---- a/sandbox/linux/system_headers/x86_64_linux_syscalls.h
-+++ ./sandbox/linux/system_headers/x86_64_linux_syscalls.h
-@@ -1350,5 +1350,9 @@
- #define __NR_rseq 334
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier 324
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
- 
-diff --git a/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc ./services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-index a85c0ea..715aa1e 100644
---- a/sandbox/policy/linux/bpf_renderer_policy_linux.cc
-+++ ./sandbox/policy/linux/bpf_renderer_policy_linux.cc
-@@ -93,11 +93,11 @@
-     case __NR_sysinfo:
-     case __NR_times:
-     case __NR_uname:
--      return Allow();
--    case __NR_sched_getaffinity:
-     case __NR_sched_getparam:
-     case __NR_sched_getscheduler:
-     case __NR_sched_setscheduler:
-+      return Allow();
-+    case __NR_sched_getaffinity:
-       return RestrictSchedTarget(GetPolicyPid(), sysno);
-     case __NR_prlimit64:
-       // See crbug.com/662450 and setrlimit comment above.
-
diff --git a/repo/apps/chromium/musl-stat.patch b/repo/apps/chromium/musl-stat.patch
deleted file mode 100644
index 5a6036a..0000000
--- a/repo/apps/chromium/musl-stat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/base/files/file.h.orig
-+++ b/base/files/file.h
-@@ -19,7 +19,8 @@
- #include "build/build_config.h"
- 
- #if BUILDFLAG(IS_BSD) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_NACL) || \
--    BUILDFLAG(IS_FUCHSIA) || (BUILDFLAG(IS_ANDROID) && __ANDROID_API__ < 21)
-+    BUILDFLAG(IS_FUCHSIA) || (BUILDFLAG(IS_ANDROID) && __ANDROID_API__ < 21) || \
-+    (defined(OS_LINUX) && !defined(__GLIBC__))
- struct stat;
- namespace base {
- typedef struct stat stat_wrapper_t;
diff --git a/repo/apps/chromium/musl-tid-caching.patch b/repo/apps/chromium/musl-tid-caching.patch
deleted file mode 100644
index bb83038..0000000
--- a/repo/apps/chromium/musl-tid-caching.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- ./sandbox/linux/services/namespace_sandbox.cc.orig
-+++ ./sandbox/linux/services/namespace_sandbox.cc
-@@ -209,6 +209,70 @@
-   return base::LaunchProcess(argv, launch_options_copy);
- }
- 
-+#if defined(__aarch64__)
-+#define TLS_ABOVE_TP
-+#endif
-+
-+struct musl_pthread
-+{
-+  /* Part 1 -- these fields may be external or
-+  * internal (accessed via asm) ABI. Do not change. */
-+  struct pthread *self;
-+#ifndef TLS_ABOVE_TP
-+  uintptr_t *dtv;
-+#endif
-+  struct pthread *prev, *next; /* non-ABI */
-+  uintptr_t sysinfo;
-+#ifndef TLS_ABOVE_TP
-+#ifdef CANARY_PAD
-+  uintptr_t canary_pad;
-+#endif
-+  uintptr_t canary;
-+#endif
-+
-+/* Part 2 -- implementation details, non-ABI. */
-+  int tid;
-+  int errno_val;
-+  volatile int detach_state;
-+  volatile int cancel;
-+  volatile unsigned char canceldisable, cancelasync;
-+  unsigned char tsd_used:1;
-+  unsigned char dlerror_flag:1;
-+  unsigned char *map_base;
-+  size_t map_size;
-+  void *stack;
-+  size_t stack_size;
-+  size_t guard_size;
-+  void *result;
-+  struct __ptcb *cancelbuf;
-+  void **tsd;
-+  struct {
-+    volatile void *volatile head;
-+    long off;
-+    volatile void *volatile pending;
-+  } robust_list;
-+  int h_errno_val;
-+  volatile int timer_id;
-+  locale_t locale;
-+  volatile int killlock[1];
-+  char *dlerror_buf;
-+  void *stdio_locks;
-+
-+  /* Part 3 -- the positions of these fields relative to
-+  * the end of the structure is external and internal ABI. */
-+#ifdef TLS_ABOVE_TP
-+  uintptr_t canary;
-+  uintptr_t *dtv;
-+#endif
-+};
-+
-+void MaybeUpdateMuslTidCache()
-+{
-+  pid_t real_tid = sys_gettid();
-+  pid_t* cached_tid_location = &reinterpret_cast<struct musl_pthread*>(pthread_self())->tid;
-+  *cached_tid_location = real_tid;
-+}
-+
- // static
- pid_t NamespaceSandbox::ForkInNewPidNamespace(bool drop_capabilities_in_child) {
-   const pid_t pid =
-@@ -226,6 +290,7 @@
- #if defined(LIBC_GLIBC)
-     MaybeUpdateGlibcTidCache();
- #endif
-+    MaybeUpdateMuslTidCache();
-     return 0;
-   }
- 
diff --git a/repo/apps/chromium/musl-v8-monotonic-pthread-cont_timedwait.patch b/repo/apps/chromium/musl-v8-monotonic-pthread-cont_timedwait.patch
deleted file mode 100644
index 768027d..0000000
--- a/repo/apps/chromium/musl-v8-monotonic-pthread-cont_timedwait.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Use monotonic clock for pthread_cond_timedwait with musl too.
-
---- ./v8/src/base/platform/condition-variable.cc
-+++ ./v8/src/base/platform/condition-variable.cc
-@@ -16,7 +16,7 @@
- 
- ConditionVariable::ConditionVariable() {
- #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
--     (V8_OS_LINUX && V8_LIBC_GLIBC))
-+     V8_OS_LINUX)
-   // On Free/Net/OpenBSD and Linux with glibc we can change the time
-   // source for pthread_cond_timedwait() to use the monotonic clock.
-   pthread_condattr_t attr;
-@@ -92,7 +92,7 @@
-       &native_handle_, &mutex->native_handle(), &ts);
- #else
- #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
--     (V8_OS_LINUX && V8_LIBC_GLIBC))
-+     V8_OS_LINUX)
-   // On Free/Net/OpenBSD and Linux with glibc we can change the time
-   // source for pthread_cond_timedwait() to use the monotonic clock.
-   result = clock_gettime(CLOCK_MONOTONIC, &ts);
diff --git a/repo/apps/chromium/nasm.patch b/repo/apps/chromium/nasm.patch
deleted file mode 100644
index ff22a6f..0000000
--- a/repo/apps/chromium/nasm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./third_party/nasm/config/config-linux.h
-+++ ./third_party/nasm/config/config-linux.h
-@@ -117,7 +117,7 @@
- #define HAVE_ACCESS 1
- 
- /* Define to 1 if you have the `canonicalize_file_name' function. */
--#define HAVE_CANONICALIZE_FILE_NAME 1
-+// #define HAVE_CANONICALIZE_FILE_NAME 1
- 
- /* Define to 1 if you have the `cpu_to_le16' intrinsic function. */
- /* #undef HAVE_CPU_TO_LE16 */
diff --git a/repo/apps/chromium/no-execinfo.patch b/repo/apps/chromium/no-execinfo.patch
deleted file mode 100644
index 8cb2f79..0000000
--- a/repo/apps/chromium/no-execinfo.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- ./base/debug/stack_trace_posix.cc
-+++ ./base/debug/stack_trace_posix.cc
-@@ -27,7 +27,7 @@
- #if !defined(USE_SYMBOLIZE)
- #include <cxxabi.h>
- #endif
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(_AIX)
- #include <execinfo.h>
- #endif
- 
-@@ -89,7 +89,7 @@
-   // Note: code in this function is NOT async-signal safe (std::string uses
-   // malloc internally).
- 
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(_AIX)
-   std::string::size_type search_from = 0;
-   while (search_from < text->size()) {
-     // Look for the start of a mangled symbol, from search_from.
-@@ -136,7 +136,7 @@
-   virtual ~BacktraceOutputHandler() = default;
- };
- 
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(_AIX)
- void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
-   // This should be more than enough to store a 64-bit number in hex:
-   // 16 hex digits + 1 for null-terminator.
-@@ -839,7 +839,7 @@
-   // If we do not have unwind tables, then try tracing using frame pointers.
-   return base::debug::TraceStackFramePointers(const_cast<const void**>(trace),
-                                               count, 0);
--#elif !defined(__UCLIBC__) && !defined(_AIX)
-+#elif defined(__GLIBC__) && !defined(_AIX)
-   // Though the backtrace API man page does not list any possible negative
-   // return values, we take no chance.
-   return base::saturated_cast<size_t>(backtrace(trace, count));
-@@ -852,13 +852,13 @@
- // NOTE: This code MUST be async-signal safe (it's used by in-process
- // stack dumping signal handler). NO malloc or stdio is allowed here.
- 
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(_AIX)
-   PrintBacktraceOutputHandler handler;
-   ProcessBacktrace(trace_, count_, prefix_string, &handler);
- #endif
- }
- 
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(_AIX)
- void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
-                                           const char* prefix_string) const {
-   StreamBacktraceOutputHandler handler(os);
---- ./v8/src/codegen/external-reference-table.cc.orig
-+++ ./v8/src/codegen/external-reference-table.cc
-@@ -11,7 +11,9 @@
-
- #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
- #define SYMBOLIZE_FUNCTION
-+#if defined(__GLIBC__)
- #include <execinfo.h>
-+#endif
-
- #include <vector>
-
-@@ -96,7 +98,7 @@
- }
-
- const char* ExternalReferenceTable::ResolveSymbol(void* address) {
--#ifdef SYMBOLIZE_FUNCTION
-+#if defined(SYMBOLIZE_FUNCTION) && defined(__GLIBC__)
-   char** names = backtrace_symbols(&address, 1);
-   const char* name = names[0];
-   // The array of names is malloc'ed. However, each name string is static
diff --git a/repo/apps/chromium/no-getcontext.patch b/repo/apps/chromium/no-getcontext.patch
deleted file mode 100644
index 71c1e91..0000000
--- a/repo/apps/chromium/no-getcontext.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- ./third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-+++ ./third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-@@ -490,7 +490,9 @@
-   siginfo.si_code = SI_USER;
-   siginfo.si_pid = getpid();
-   ucontext_t context;
-+#if defined(__GLIBC__)
-   getcontext(&context);
-+#endif
-   return HandleSignal(sig, &siginfo, &context);
- }
- 
-@@ -675,9 +677,13 @@
-   sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
- 
-   CrashContext context;
-+#if defined(__GLIBC__)
-   int getcontext_result = getcontext(&context.context);
-   if (getcontext_result)
-     return false;
-+#else
-+  return false;
-+#endif
- 
- #if defined(__i386__)
-   // In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved
diff --git a/repo/apps/chromium/no-mallinfo.patch b/repo/apps/chromium/no-mallinfo.patch
deleted file mode 100644
index 23ce40e..0000000
--- a/repo/apps/chromium/no-mallinfo.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- ./base/trace_event/malloc_dump_provider.cc.orig
-+++ ./base/trace_event/malloc_dump_provider.cc
-@@ -212,7 +212,7 @@
-                      &allocated_objects_count);
- #elif defined(OS_FUCHSIA)
- // TODO(fuchsia): Port, see https://crbug.com/706592.
--#else
-+#elif defined(__GLIBC__)
- #if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
- #if __GLIBC_PREREQ(2, 33)
- #define MALLINFO2_FOUND_IN_LIBC
---- ./base/process/process_metrics_posix.cc.orig
-+++ ./base/process/process_metrics_posix.cc
-@@ -105,7 +105,7 @@
- 
- #endif  // !BUILDFLAG(IS_FUCHSIA)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#if (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
- namespace {
- 
- size_t GetMallocUsageMallinfo() {
-@@ -123,7 +123,7 @@
- }
- 
- }  // namespace
--#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
-+#endif  // (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) ||
-         // BUILDFLAG(IS_ANDROID)
- 
- size_t ProcessMetrics::GetMallocUsage() {
-@@ -131,9 +131,9 @@
-   malloc_statistics_t stats = {0};
-   malloc_zone_statistics(nullptr, &stats);
-   return stats.size_in_use;
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#elif (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-   return GetMallocUsageMallinfo();
--#elif BUILDFLAG(IS_FUCHSIA)
-+#else
-   // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
-   return 0;
- #endif
---- ./third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc.orig
-+++ ./third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
-@@ -35,7 +35,7 @@
- 
- MemoryUsage GetMemoryUsage() {
-   MemoryUsage result;
--#ifdef __linux__
-+#if defined(__linux__) && defined(__GLIBC__)
-   rusage res;
-   if (getrusage(RUSAGE_SELF, &res) == 0) {
-     result.max_rss_kb = res.ru_maxrss;
---- ./third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc
-+++ ./third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc.orig
-@@ -86,11 +86,11 @@
- }
-
- size_t Process::GetMallocUsage() {
--#if defined(HAVE_MALLINFO2)
-+#if defined(HAVE_MALLINFO2) && defined(__GLIBC__)
-   struct mallinfo2 mi;
-   mi = ::mallinfo2();
-   return mi.uordblks;
--#elif defined(HAVE_MALLINFO)
-+#elif defined(HAVE_MALLINFO) && defined(__GLIBC__)
-   struct mallinfo mi;
-   mi = ::mallinfo();
-   return mi.uordblks;
-
---- ./third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h.orig	2019-09-30 13:03:42.556880537 -0400
-+++ ./third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h	2019-09-30 13:07:27.989821227 -0400
-@@ -122,7 +122,9 @@
- /* #undef HAVE_MALLCTL */
- 
- /* Define to 1 if you have the `mallinfo' function. */
-+#if defined(__GLIBC__)
- #define HAVE_MALLINFO 1
-+#endif
- 
- /* Define to 1 if you have the <malloc.h> header file. */
- #define HAVE_MALLOC_H 1
diff --git a/repo/apps/chromium/quiche-arena-size.patch b/repo/apps/chromium/quiche-arena-size.patch
deleted file mode 100644
index 50abcae..0000000
--- a/repo/apps/chromium/quiche-arena-size.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./net/third_party/quiche/src/quic/core/quic_one_block_arena.h
-+++ ./net/third_party/quiche/src/quic/core/quic_one_block_arena.h
-@@ -69,7 +69,7 @@
- 
- // QuicConnections currently use around 1KB of polymorphic types which would
- // ordinarily be on the heap. Instead, store them inline in an arena.
--using QuicConnectionArena = QuicOneBlockArena<1152>;
-+using QuicConnectionArena = QuicOneBlockArena<1504>;
- 
- }  // namespace quic
- 
diff --git a/repo/apps/chromium/remove-strip_binary.patch b/repo/apps/chromium/remove-strip_binary.patch
deleted file mode 100644
index 8b13c6a..0000000
--- a/repo/apps/chromium/remove-strip_binary.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/chrome/test/chromedriver/BUILD.gn.orig
-+++ b/chrome/test/chromedriver/BUILD.gn
-@@ -308,11 +308,7 @@
-   }
- }
- 
--if (is_linux) {
--  chromedriver_output = "chromedriver.unstripped"
--} else {
--  chromedriver_output = "chromedriver"
--}
-+chromedriver_output = "chromedriver"
- 
- executable("$chromedriver_output") {
-   testonly = true
-@@ -336,16 +332,6 @@
-   }
- }
- 
--if (is_linux) {
--  strip_binary("chromedriver") {
--    testonly = true
--    binary_input = "$root_out_dir/$chromedriver_output"
--    symbol_output = "$root_out_dir/chromedriver.debug"
--    stripped_binary_output = "$root_out_dir/chromedriver"
--    deps = [ ":$chromedriver_output" ]
--  }
--}
--
- python_library("chromedriver_py_tests") {
-   testonly = true
-   deps = [
diff --git a/repo/apps/chromium/resolver.patch b/repo/apps/chromium/resolver.patch
deleted file mode 100644
index 8dca36a..0000000
--- a/repo/apps/chromium/resolver.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- ./net/dns/host_resolver_manager.cc.orig
-+++ ./net/dns/host_resolver_manager.cc
-@@ -3014,8 +3014,7 @@
-   NetworkChangeNotifier::AddConnectionTypeObserver(this);
-   if (system_dns_config_notifier_)
-     system_dns_config_notifier_->AddObserver(this);
--#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \
--    !BUILDFLAG(IS_ANDROID)
-+#if defined(__GLIBC__)
-   EnsureDnsReloaderInit();
- #endif
- 
---- ./net/dns/dns_reloader.cc.orig
-+++ ./net/dns/dns_reloader.cc
-@@ -6,8 +6,7 @@
- 
- #include "build/build_config.h"
- 
--#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \
--    !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_FUCHSIA)
-+#if defined(__GLIBC__)
- 
- #include <resolv.h>
- 
---- ./net/dns/host_resolver_proc.cc.orig
-+++ ./net/dns/host_resolver_proc.cc
-@@ -176,8 +176,7 @@
-   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
-                                                 base::BlockingType::WILL_BLOCK);
- 
--#if BUILDFLAG(IS_POSIX) && \
--    !(BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_ANDROID))
-+#if defined(__GLIBC__)
-   DnsReloaderMaybeReload();
- #endif
-   absl::optional<AddressInfo> ai;
diff --git a/repo/apps/chromium/revert-use-ffile-compilation-dir.patch b/repo/apps/chromium/revert-use-ffile-compilation-dir.patch
deleted file mode 100644
index f0c110f..0000000
--- a/repo/apps/chromium/revert-use-ffile-compilation-dir.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index f442166..c325f72 100644
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -1248,19 +1248,12 @@ config("compiler_deterministic") {
-     # different build directory like "out/feature_a" and "out/feature_b" if
-     # we build same files with same compile flag.
-     # Other paths are already given in relative, no need to normalize them.
--    if (is_nacl) {
--      # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
--      cflags += [
--        "-Xclang",
--        "-fdebug-compilation-dir",
--        "-Xclang",
--        ".",
--      ]
--    } else {
--      # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
--      # and -fcoverage-compilation-dir=.
--      cflags += [ "-ffile-compilation-dir=." ]
--    }
-+    cflags += [
-+      "-Xclang",
-+      "-fdebug-compilation-dir",
-+      "-Xclang",
-+      ".",
-+    ]
-     if (!is_win) {
-       # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
-       asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
-diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
-index 008a386..89e7fdf 100644
---- a/build/config/compiler/compiler.gni
-+++ b/build/config/compiler/compiler.gni
-@@ -238,8 +238,11 @@ declare_args() {
- # deterministic builds to reduce compile times, so this is less relevant for
- # official builders.
- strip_absolute_paths_from_debug_symbols_default =
--    is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
--    is_chromeos || (is_apple && !enable_dsyms)
-+    # TODO(crbug.com/1010267): remove '!use_clang_coverage', coverage build has
-+    # dependency to absolute path of source files.
-+    !use_clang_coverage &&
-+    (is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
-+     is_chromeos || (is_apple && !enable_dsyms))
- 
- # If the platform uses stripped absolute paths by default, then we don't expose
- # it as a configuration option. If this is causing problems, please file a bug.
diff --git a/repo/apps/chromium/scoped-file.patch b/repo/apps/chromium/scoped-file.patch
deleted file mode 100644
index 34bf6eb..0000000
--- a/repo/apps/chromium/scoped-file.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- ./base/files/scoped_file_linux.cc.orig
-+++ ./base/files/scoped_file_linux.cc
-@@ -7,6 +7,7 @@
- #include <algorithm>
- #include <array>
- #include <atomic>
-+#include <dlfcn.h>
- 
- #include "base/compiler_specific.h"
- #include "base/debug/stack_trace.h"
-@@ -80,9 +81,18 @@
- 
- extern "C" {
- 
--int __close(int);
--
- __attribute__((visibility("default"), noinline)) int close(int fd) {
-+  static int (*__close)(int) = nullptr;
-+
-+  if (__close == nullptr) {
-+    __close = (int (*)(int))dlsym(RTLD_NEXT, "close");
-+
-+    if (__close == nullptr) {
-+      RAW_LOG(ERROR, "musl close not found\n");
-+      IMMEDIATE_CRASH();
-+    }
-+  }
-+
-   if (base::IsFDOwned(fd) && g_is_ownership_enforced)
-     CrashOnFdOwnershipViolation();
-   return __close(fd);
diff --git a/repo/apps/chromium/sql-make-VirtualCursor-standard-layout-type.patch b/repo/apps/chromium/sql-make-VirtualCursor-standard-layout-type.patch
deleted file mode 100644
index 3364d41..0000000
--- a/repo/apps/chromium/sql-make-VirtualCursor-standard-layout-type.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-From 144479ad7b4287bee4067f95e4218f614798a865 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Sun, 16 Jan 2022 19:15:26 +0000
-Subject: [PATCH] sql: make VirtualCursor standard layout type
-
-sql::recover::VirtualCursor needs to be a standard layout type, but
-has members of type std::unique_ptr. However, std::unique_ptr is not
-guaranteed to be standard layout. Compiling with clang combined with
-gcc-11 libstdc++ fails because of this.
-
-Bug: 1189788
-Change-Id: Ia6dc388cc5ef1c0f2afc75f8ca45b9f12687ca9c
----
- sql/recover_module/btree.cc  | 18 ++++++++++++------
- sql/recover_module/btree.h   | 21 +++++++++++++++------
- sql/recover_module/cursor.cc | 24 ++++++++++++------------
- sql/recover_module/cursor.h  |  2 +-
- sql/recover_module/pager.cc  |  5 ++---
- sql/recover_module/pager.h   |  6 +++---
- 6 files changed, 45 insertions(+), 31 deletions(-)
-
-diff --git a/sql/recover_module/btree.cc b/sql/recover_module/btree.cc
-index cc9420e5c05..f12d8fa32a2 100644
---- a/sql/recover_module/btree.cc
-+++ b/sql/recover_module/btree.cc
-@@ -136,16 +136,22 @@ static_assert(std::is_trivially_destructible<LeafPageDecoder>::value,
-               "Move the destructor to the .cc file if it's non-trival");
- #endif  // !DCHECK_IS_ON()
- 
--LeafPageDecoder::LeafPageDecoder(DatabasePageReader* db_reader) noexcept
--    : page_id_(db_reader->page_id()),
--      db_reader_(db_reader),
--      cell_count_(ComputeCellCount(db_reader)),
--      next_read_index_(0),
--      last_record_size_(0) {
-+LeafPageDecoder::LeafPageDecoder() noexcept = default;
-+
-+void LeafPageDecoder::Initialize(DatabasePageReader* db_reader) {
-+  page_id_ = db_reader->page_id();
-+  db_reader_ = db_reader;
-+  cell_count_ = ComputeCellCount(db_reader);
-+  next_read_index_ = 0;
-+  last_record_size_ = 0;
-   DCHECK(IsOnValidPage(db_reader));
-   DCHECK(DatabasePageReader::IsValidPageId(page_id_));
- }
- 
-+void LeafPageDecoder::Reset() {
-+  db_reader_ = nullptr;
-+}
-+
- bool LeafPageDecoder::TryAdvance() {
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-   DCHECK(CanAdvance());
-diff --git a/sql/recover_module/btree.h b/sql/recover_module/btree.h
-index eaa087a5c52..df0e0c937c0 100644
---- a/sql/recover_module/btree.h
-+++ b/sql/recover_module/btree.h
-@@ -101,9 +101,7 @@ class LeafPageDecoder {
-  public:
-   // Creates a decoder for a DatabasePageReader's last read page.
-   //
--  // |db_reader| must have been used to read an inner page of a table B-tree.
--  // |db_reader| must outlive this instance.
--  explicit LeafPageDecoder(DatabasePageReader* db_reader) noexcept;
-+  LeafPageDecoder() noexcept;
-   ~LeafPageDecoder() noexcept = default;
- 
-   LeafPageDecoder(const LeafPageDecoder&) = delete;
-@@ -151,6 +149,17 @@ class LeafPageDecoder {
-   // read as long as CanAdvance() returns true.
-   bool TryAdvance();
- 
-+  // Initialize with DatabasePageReader
-+  // |db_reader| must have been used to read an inner page of a table B-tree.
-+  // |db_reader| must outlive this instance.
-+  void Initialize(DatabasePageReader* db_reader);
-+
-+  // Reset internal DatabasePageReader
-+  void Reset();
-+
-+  // True if DatabasePageReader is valid
-+  bool IsValid() { return (db_reader_ != nullptr); }
-+
-   // True if the given reader may point to an inner page in a table B-tree.
-   //
-   // The last ReadPage() call on |db_reader| must have succeeded.
-@@ -164,14 +173,14 @@ class LeafPageDecoder {
-   static int ComputeCellCount(DatabasePageReader* db_reader);
- 
-   // The number of the B-tree page this reader is reading.
--  const int64_t page_id_;
-+  int64_t page_id_;
-   // Used to read the tree page.
-   //
-   // Raw pointer usage is acceptable because this instance's owner is expected
-   // to ensure that the DatabasePageReader outlives this.
--  DatabasePageReader* const db_reader_;
-+  DatabasePageReader* db_reader_;
-   // Caches the ComputeCellCount() value for this reader's page.
--  const int cell_count_ = ComputeCellCount(db_reader_);
-+  int cell_count_;
- 
-   // The reader's cursor state.
-   //
-diff --git a/sql/recover_module/cursor.cc b/sql/recover_module/cursor.cc
-index 4f827edf1b4..240de4999fe 100644
---- a/sql/recover_module/cursor.cc
-+++ b/sql/recover_module/cursor.cc
-@@ -28,7 +28,7 @@ VirtualCursor::~VirtualCursor() {
- int VirtualCursor::First() {
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-   inner_decoders_.clear();
--  leaf_decoder_ = nullptr;
-+  leaf_decoder_.Reset();
- 
-   AppendPageDecoder(table_->root_page_id());
-   return Next();
-@@ -38,18 +38,18 @@ int VirtualCursor::Next() {
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-   record_reader_.Reset();
- 
--  while (!inner_decoders_.empty() || leaf_decoder_.get()) {
--    if (leaf_decoder_.get()) {
--      if (!leaf_decoder_->CanAdvance()) {
-+  while (!inner_decoders_.empty() || leaf_decoder_.IsValid()) {
-+    if (leaf_decoder_.IsValid()) {
-+      if (!leaf_decoder_.CanAdvance()) {
-         // The leaf has been exhausted. Remove it from the DFS stack.
--        leaf_decoder_ = nullptr;
-+        leaf_decoder_.Reset();
-         continue;
-       }
--      if (!leaf_decoder_->TryAdvance())
-+      if (!leaf_decoder_.TryAdvance())
-         continue;
- 
--      if (!payload_reader_.Initialize(leaf_decoder_->last_record_size(),
--                                      leaf_decoder_->last_record_offset())) {
-+      if (!payload_reader_.Initialize(leaf_decoder_.last_record_size(),
-+                                      leaf_decoder_.last_record_offset())) {
-         continue;
-       }
-       if (!record_reader_.Initialize())
-@@ -101,13 +101,13 @@ int VirtualCursor::ReadColumn(int column_index,
- int64_t VirtualCursor::RowId() {
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-   DCHECK(record_reader_.IsInitialized());
--  DCHECK(leaf_decoder_.get());
--  return leaf_decoder_->last_record_rowid();
-+  DCHECK(leaf_decoder_.IsValid());
-+  return leaf_decoder_.last_record_rowid();
- }
- 
- void VirtualCursor::AppendPageDecoder(int page_id) {
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
--  DCHECK(leaf_decoder_.get() == nullptr)
-+  DCHECK(!leaf_decoder_.IsValid())
-       << __func__
-       << " must only be called when the current path has no leaf decoder";
- 
-@@ -115,7 +115,7 @@ void VirtualCursor::AppendPageDecoder(int page_id) {
-     return;
- 
-   if (LeafPageDecoder::IsOnValidPage(&db_reader_)) {
--    leaf_decoder_ = std::make_unique<LeafPageDecoder>(&db_reader_);
-+    leaf_decoder_.Initialize(&db_reader_);
-     return;
-   }
- 
-diff --git a/sql/recover_module/cursor.h b/sql/recover_module/cursor.h
-index 845b7852648..cc4e85f83f9 100644
---- a/sql/recover_module/cursor.h
-+++ b/sql/recover_module/cursor.h
-@@ -130,7 +130,7 @@ class VirtualCursor {
-   std::vector<std::unique_ptr<InnerPageDecoder>> inner_decoders_;
- 
-   // Decodes the leaf page containing records.
--  std::unique_ptr<LeafPageDecoder> leaf_decoder_;
-+  LeafPageDecoder leaf_decoder_;
- 
-   SEQUENCE_CHECKER(sequence_checker_);
- };
-diff --git a/sql/recover_module/pager.cc b/sql/recover_module/pager.cc
-index 58e75de2704..69d98cef98d 100644
---- a/sql/recover_module/pager.cc
-+++ b/sql/recover_module/pager.cc
-@@ -23,8 +23,7 @@ static_assert(DatabasePageReader::kMaxPageId <= std::numeric_limits<int>::max(),
-               "ints are not appropriate for representing page IDs");
- 
- DatabasePageReader::DatabasePageReader(VirtualTable* table)
--    : page_data_(std::make_unique<uint8_t[]>(table->page_size())),
--      table_(table) {
-+    : page_data_(table->page_size()), table_(table) {
-   DCHECK(table != nullptr);
-   DCHECK(IsValidPageSize(table->page_size()));
- }
-@@ -58,7 +57,7 @@ int DatabasePageReader::ReadPage(int page_id) {
-                 "The |read_offset| computation above may overflow");
- 
-   int sqlite_status =
--      RawRead(sqlite_file, read_size, read_offset, page_data_.get());
-+      RawRead(sqlite_file, read_size, read_offset, page_data_.data());
- 
-   // |page_id_| needs to be set to kInvalidPageId if the read failed.
-   // Otherwise, future ReadPage() calls with the previous |page_id_| value
-diff --git a/sql/recover_module/pager.h b/sql/recover_module/pager.h
-index 07cac3cb989..d08f0932fab 100644
---- a/sql/recover_module/pager.h
-+++ b/sql/recover_module/pager.h
-@@ -6,8 +6,8 @@
- #define SQL_RECOVER_MODULE_PAGER_H_
- 
- #include <cstdint>
--#include <memory>
- #include <ostream>
-+#include <vector>
- 
- #include "base/check_op.h"
- #include "base/memory/raw_ptr.h"
-@@ -72,7 +72,7 @@ class DatabasePageReader {
-     DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-     DCHECK_NE(page_id_, kInvalidPageId)
-         << "Successful ReadPage() required before accessing pager state";
--    return page_data_.get();
-+    return page_data_.data();
-   }
- 
-   // The number of bytes in the page read by the last ReadPage() call.
-@@ -139,7 +139,7 @@ class DatabasePageReader {
-   int page_id_ = kInvalidPageId;
-   // Stores the bytes of the last page successfully read by ReadPage().
-   // The content is undefined if the last call to ReadPage() did not succeed.
--  const std::unique_ptr<uint8_t[]> page_data_;
-+  std::vector<uint8_t> page_data_;
-   // Raw pointer usage is acceptable because this instance's owner is expected
-   // to ensure that the VirtualTable outlives this.
-   const raw_ptr<VirtualTable> table_;
diff --git a/repo/apps/chromium/system-opus.patch b/repo/apps/chromium/system-opus.patch
deleted file mode 100644
index dc85e80..0000000
--- a/repo/apps/chromium/system-opus.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Has been upstreamed in Chromium main branch, shouldn't be necessary
-when the commit gets pulled into a new release
-
-From 3bd46cb9a51773f103ef52b39d6407740eb0d60a Mon Sep 17 00:00:00 2001
-From: Eugene Zemtsov <eugene@chromium.org>
-Date: Thu, 24 Feb 2022 23:17:20 +0000
-Subject: [PATCH] webcodecs: Stop using AudioOpusEncoder as backed for mojo
- audio encoder
-
-AudioOpusEncoder was only used here for testing. Let's not let it get
-comfortable. We'll use MF AAC encoder here when we have it. (Soon...)
-
-Bug: 1259883
-Change-Id: Ia1819395c8c8fd6d403d4b8558c12f9a1bf7e761
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3489449
-Commit-Queue: Eugene Zemtsov <eugene@chromium.org>
-Auto-Submit: Eugene Zemtsov <eugene@chromium.org>
-Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
-Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#974895}
----
- media/mojo/services/gpu_mojo_media_client.cc | 10 +---------
- 1 file changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/media/mojo/services/gpu_mojo_media_client.cc b/media/mojo/services/gpu_mojo_media_client.cc
-index 8f83a4d6cf662..40cdaff8d3a00 100644
---- a/media/mojo/services/gpu_mojo_media_client.cc
-+++ b/media/mojo/services/gpu_mojo_media_client.cc
-@@ -13,7 +13,6 @@
- #include "build/chromeos_buildflags.h"
- #include "gpu/ipc/service/gpu_channel.h"
- #include "media/audio/audio_features.h"
--#include "media/audio/audio_opus_encoder.h"
- #include "media/base/audio_decoder.h"
- #include "media/base/cdm_factory.h"
- #include "media/base/media_switches.h"
-@@ -119,14 +118,7 @@ std::unique_ptr<AudioEncoder> GpuMojoMediaClient::CreateAudioEncoder(
-     scoped_refptr<base::SequencedTaskRunner> task_runner) {
-   if (!base::FeatureList::IsEnabled(features::kPlatformAudioEncoder))
-     return nullptr;
--  // TODO(crbug.com/1259883) Right now Opus encoder is all we have, later on
--  // we'll create a real platform encoder here.
--  auto opus_encoder = std::make_unique<AudioOpusEncoder>();
--  auto encoding_runner = base::ThreadPool::CreateSequencedTaskRunner(
--      {base::TaskPriority::USER_BLOCKING});
--  return std::make_unique<OffloadingAudioEncoder>(std::move(opus_encoder),
--                                                  std::move(encoding_runner),
--                                                  std::move(task_runner));
-+  return nullptr;
- }
- 
- VideoDecoderType GpuMojoMediaClient::GetDecoderImplementationType() {
diff --git a/repo/apps/chromium/unbundle-ffmpeg-av_stream_get_first_dts.patch b/repo/apps/chromium/unbundle-ffmpeg-av_stream_get_first_dts.patch
deleted file mode 100644
index dae1add..0000000
--- a/repo/apps/chromium/unbundle-ffmpeg-av_stream_get_first_dts.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/build/linux/unbundle/ffmpeg.gn b/build/linux/unbundle/ffmpeg.gn
-index 16e20744706..6a079b32221 100644
---- a/build/linux/unbundle/ffmpeg.gn
-+++ b/build/linux/unbundle/ffmpeg.gn
-@@ -12,6 +12,7 @@ pkg_config("system_ffmpeg") {
-     "libavformat",
-     "libavutil",
-   ]
-+  defines = [ "av_stream_get_first_dts(stream)=stream->first_dts" ]
- }
- 
- buildflag_header("ffmpeg_features") {
diff --git a/repo/apps/chromium/unbundle-ffmpeg-av_stream_get_first_dts.patch.1 b/repo/apps/chromium/unbundle-ffmpeg-av_stream_get_first_dts.patch.1
deleted file mode 100644
index dae1add..0000000
--- a/repo/apps/chromium/unbundle-ffmpeg-av_stream_get_first_dts.patch.1
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/build/linux/unbundle/ffmpeg.gn b/build/linux/unbundle/ffmpeg.gn
-index 16e20744706..6a079b32221 100644
---- a/build/linux/unbundle/ffmpeg.gn
-+++ b/build/linux/unbundle/ffmpeg.gn
-@@ -12,6 +12,7 @@ pkg_config("system_ffmpeg") {
-     "libavformat",
-     "libavutil",
-   ]
-+  defines = [ "av_stream_get_first_dts(stream)=stream->first_dts" ]
- }
- 
- buildflag_header("ffmpeg_features") {
diff --git a/repo/apps/chromium/use-deprecated-ffmpeg-api.patch b/repo/apps/chromium/use-deprecated-ffmpeg-api.patch
deleted file mode 100644
index f0ec736..0000000
--- a/repo/apps/chromium/use-deprecated-ffmpeg-api.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
-index ac4713b07268..492a9a37d096 100644
---- a/media/filters/ffmpeg_demuxer.cc
-+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -427,11 +427,11 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
-   scoped_refptr<DecoderBuffer> buffer;
- 
-   if (type() == DemuxerStream::TEXT) {
--    size_t id_size = 0;
-+    int id_size = 0;
-     uint8_t* id_data = av_packet_get_side_data(
-         packet.get(), AV_PKT_DATA_WEBVTT_IDENTIFIER, &id_size);
- 
--    size_t settings_size = 0;
-+    int settings_size = 0;
-     uint8_t* settings_data = av_packet_get_side_data(
-         packet.get(), AV_PKT_DATA_WEBVTT_SETTINGS, &settings_size);
- 
-@@ -443,7 +443,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
-     buffer = DecoderBuffer::CopyFrom(packet->data, packet->size,
-                                      side_data.data(), side_data.size());
-   } else {
--    size_t side_data_size = 0;
-+    int side_data_size = 0;
-     uint8_t* side_data = av_packet_get_side_data(
-         packet.get(), AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, &side_data_size);
- 
-@@ -504,7 +504,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
-                                        packet->size - data_offset);
-     }
- 
--    size_t skip_samples_size = 0;
-+    int skip_samples_size = 0;
-     const uint32_t* skip_samples_ptr =
-         reinterpret_cast<const uint32_t*>(av_packet_get_side_data(
-             packet.get(), AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size));
diff --git a/repo/apps/chromium/use-deprecated-ffmpeg-api.patch.1 b/repo/apps/chromium/use-deprecated-ffmpeg-api.patch.1
deleted file mode 100644
index f0ec736..0000000
--- a/repo/apps/chromium/use-deprecated-ffmpeg-api.patch.1
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
-index ac4713b07268..492a9a37d096 100644
---- a/media/filters/ffmpeg_demuxer.cc
-+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -427,11 +427,11 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
-   scoped_refptr<DecoderBuffer> buffer;
- 
-   if (type() == DemuxerStream::TEXT) {
--    size_t id_size = 0;
-+    int id_size = 0;
-     uint8_t* id_data = av_packet_get_side_data(
-         packet.get(), AV_PKT_DATA_WEBVTT_IDENTIFIER, &id_size);
- 
--    size_t settings_size = 0;
-+    int settings_size = 0;
-     uint8_t* settings_data = av_packet_get_side_data(
-         packet.get(), AV_PKT_DATA_WEBVTT_SETTINGS, &settings_size);
- 
-@@ -443,7 +443,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
-     buffer = DecoderBuffer::CopyFrom(packet->data, packet->size,
-                                      side_data.data(), side_data.size());
-   } else {
--    size_t side_data_size = 0;
-+    int side_data_size = 0;
-     uint8_t* side_data = av_packet_get_side_data(
-         packet.get(), AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, &side_data_size);
- 
-@@ -504,7 +504,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
-                                        packet->size - data_offset);
-     }
- 
--    size_t skip_samples_size = 0;
-+    int skip_samples_size = 0;
-     const uint32_t* skip_samples_ptr =
-         reinterpret_cast<const uint32_t*>(av_packet_get_side_data(
-             packet.get(), AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size));
diff --git a/repo/apps/chromium/use-oauth2-client-switches-as-default.patch b/repo/apps/chromium/use-oauth2-client-switches-as-default.patch
deleted file mode 100644
index 9d9c57b..0000000
--- a/repo/apps/chromium/use-oauth2-client-switches-as-default.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -upr chromium-89.0.4389.58.orig/google_apis/google_api_keys.cc chromium-89.0.4389.58/google_apis/google_api_keys.cc
---- chromium-89.0.4389.58.orig/google_apis/google_api_keys.cc	2021-02-24 22:37:18.494007649 +0000
-+++ chromium-89.0.4389.58/google_apis/google_api_keys.cc	2021-02-24 22:35:00.865777600 +0000
-@@ -154,11 +154,11 @@ class APIKeyCache {
- 
-     std::string default_client_id = CalculateKeyValue(
-         GOOGLE_DEFAULT_CLIENT_ID,
--        STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), nullptr,
-+        STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), ::switches::kOAuth2ClientID,
-         std::string(), environment.get(), command_line, gaia_config);
-     std::string default_client_secret = CalculateKeyValue(
-         GOOGLE_DEFAULT_CLIENT_SECRET,
--        STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), nullptr,
-+        STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), ::switches::kOAuth2ClientSecret,
-         std::string(), environment.get(), command_line, gaia_config);
- 
-     // We currently only allow overriding the baked-in values for the
diff --git a/repo/apps/chromium/wayland-egl.patch b/repo/apps/chromium/wayland-egl.patch
deleted file mode 100644
index 58a0798..0000000
--- a/repo/apps/chromium/wayland-egl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/ui/gl/gl_image_native_pixmap.cc	2020-05-18 11:40:06.000000000 -0700
-+++ b/ui/gl/gl_image_native_pixmap.cc	2020-05-22 02:07:16.007770442 -0700
-@@ -288,6 +288,8 @@
-                                std::move(scoped_fd));
-   }
- 
-+  handle.planes[0].size = size_.GetArea();
-+
-   return handle;
- #endif  // !defined(OS_FUCHSIA)
- }
---- a/gpu/command_buffer/service/error_state.cc	2020-05-18 11:39:22.000000000 -0700
-+++ b/gpu/command_buffer/service/error_state.cc	2020-05-22 13:43:09.181180388 -0700
-@@ -115,6 +115,8 @@
-     // buffer.
-     error = GL_NO_ERROR;
-   }
-+  if (error == GL_INVALID_ENUM)
-+    error = GL_NO_ERROR;
-   return error;
- }
- 
diff --git a/repo/apps/chromium/webcodecs-stop-using-AudioOpusEncoder.patch b/repo/apps/chromium/webcodecs-stop-using-AudioOpusEncoder.patch
deleted file mode 100644
index 32957d3..0000000
--- a/repo/apps/chromium/webcodecs-stop-using-AudioOpusEncoder.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 3bd46cb9a51773f103ef52b39d6407740eb0d60a Mon Sep 17 00:00:00 2001
-From: Eugene Zemtsov <eugene@chromium.org>
-Date: Thu, 24 Feb 2022 23:17:20 +0000
-Subject: [PATCH] webcodecs: Stop using AudioOpusEncoder as backed for mojo
- audio encoder
-
-AudioOpusEncoder was only used here for testing. Let's not let it get
-comfortable. We'll use MF AAC encoder here when we have it. (Soon...)
-
-Bug: 1259883
-Change-Id: Ia1819395c8c8fd6d403d4b8558c12f9a1bf7e761
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3489449
-Commit-Queue: Eugene Zemtsov <eugene@chromium.org>
-Auto-Submit: Eugene Zemtsov <eugene@chromium.org>
-Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
-Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#974895}
----
- media/mojo/services/gpu_mojo_media_client.cc | 10 +---------
- 1 file changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/media/mojo/services/gpu_mojo_media_client.cc b/media/mojo/services/gpu_mojo_media_client.cc
-index 8f83a4d6cf6..40cdaff8d3a 100644
---- a/media/mojo/services/gpu_mojo_media_client.cc
-+++ b/media/mojo/services/gpu_mojo_media_client.cc
-@@ -13,7 +13,6 @@
- #include "build/chromeos_buildflags.h"
- #include "gpu/ipc/service/gpu_channel.h"
- #include "media/audio/audio_features.h"
--#include "media/audio/audio_opus_encoder.h"
- #include "media/base/audio_decoder.h"
- #include "media/base/cdm_factory.h"
- #include "media/base/media_switches.h"
-@@ -119,14 +118,7 @@ std::unique_ptr<AudioEncoder> GpuMojoMediaClient::CreateAudioEncoder(
-     scoped_refptr<base::SequencedTaskRunner> task_runner) {
-   if (!base::FeatureList::IsEnabled(features::kPlatformAudioEncoder))
-     return nullptr;
--  // TODO(crbug.com/1259883) Right now Opus encoder is all we have, later on
--  // we'll create a real platform encoder here.
--  auto opus_encoder = std::make_unique<AudioOpusEncoder>();
--  auto encoding_runner = base::ThreadPool::CreateSequencedTaskRunner(
--      {base::TaskPriority::USER_BLOCKING});
--  return std::make_unique<OffloadingAudioEncoder>(std::move(opus_encoder),
--                                                  std::move(encoding_runner),
--                                                  std::move(task_runner));
-+  return nullptr;
- }
- 
- VideoDecoderType GpuMojoMediaClient::GetDecoderImplementationType() {
diff --git a/repo/apps/chromium/webrtc-check-existence-of-cursor-metadata.patch b/repo/apps/chromium/webrtc-check-existence-of-cursor-metadata.patch
deleted file mode 100644
index 0c7e731..0000000
--- a/repo/apps/chromium/webrtc-check-existence-of-cursor-metadata.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From c2cd814cdd8cbf8dda6ccec2266327a5321fbde8 Mon Sep 17 00:00:00 2001
-From: Jan Grulich <grulja@gmail.com>
-Date: Tue, 15 Mar 2022 14:31:55 +0100
-Subject: [PATCH] PipeWire capturer: check existence of cursor metadata
-
-Check whether there are any cursor metadata before we try to validate
-and use them, otherwise we might crash on this.
-
-Bug: webrtc:13429
-Change-Id: I365da59a189b6b974cebafc94fec49d5b942efae
-Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/255601
-Reviewed-by: Alexander Cooper <alcooper@chromium.org>
-Commit-Queue: Alexander Cooper <alcooper@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#36240}
----
- .../desktop_capture/linux/wayland/shared_screencast_stream.cc   | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc b/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
-index a8c86e26..9e81df4c 100644
---- a/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
-+++ b/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
-@@ -650,7 +650,7 @@ void SharedScreenCastStreamPrivate::ProcessBuffer(pw_buffer* buffer) {
-     const struct spa_meta_cursor* cursor =
-         static_cast<struct spa_meta_cursor*>(spa_buffer_find_meta_data(
-             spa_buffer, SPA_META_Cursor, sizeof(*cursor)));
--    if (spa_meta_cursor_is_valid(cursor)) {
-+    if (cursor && spa_meta_cursor_is_valid(cursor)) {
-       struct spa_meta_bitmap* bitmap = nullptr;
- 
-       if (cursor->bitmap_offset)
diff --git a/repo/apps/feh/feh.xibuild b/repo/apps/feh/feh.xibuild
deleted file mode 100644
index 0182a5e..0000000
--- a/repo/apps/feh/feh.xibuild
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-MAKEDEPS="make"
-DEPS="curl file imlib2 libexif libxinerama libpng"
-
-DESC="Fast and light imlib2-based image viewer"
-
-PKG_VER=3.8
-SOURCE=https://feh.finalrewind.org/feh-$PKG_VER.tar.bz2
-
-prepare () {
-    sed -i "s:doc/feh:&-3.8:" config.mk 
-}
-
-build () {
-    make PREFIX=/usr
-}
-
-package () {
-    make DESTDIR=$PKG_DEST PREFIX=/usr install
-}
diff --git a/repo/apps/firefox/allow-custom-rust-vendor.patch b/repo/apps/firefox/allow-custom-rust-vendor.patch
deleted file mode 100644
index 218650f..0000000
--- a/repo/apps/firefox/allow-custom-rust-vendor.patch
+++ /dev/null
@@ -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(());
-                 }
- 
diff --git a/repo/apps/firefox/avoid-redefinition.patch b/repo/apps/firefox/avoid-redefinition.patch
deleted file mode 100644
index af11c50..0000000
--- a/repo/apps/firefox/avoid-redefinition.patch
+++ /dev/null
@@ -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>
diff --git a/repo/apps/firefox/disable-moz-stackwalk.patch b/repo/apps/firefox/disable-moz-stackwalk.patch
deleted file mode 100644
index b6bc756..0000000
--- a/repo/apps/firefox/disable-moz-stackwalk.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/mozglue/misc/StackWalk.cpp b/mozglue/misc/StackWalk.cpp
-index 7d62921..adcfa44 100644
---- a/mozglue/misc/StackWalk.cpp
-+++ b/mozglue/misc/StackWalk.cpp
-@@ -33,13 +33,7 @@ using namespace mozilla;
- #  define MOZ_STACKWALK_SUPPORTS_MACOSX 0
- #endif
- 
--#if (defined(linux) &&                                            \
--     ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
--      defined(HAVE__UNWIND_BACKTRACE)))
--#  define MOZ_STACKWALK_SUPPORTS_LINUX 1
--#else
- #  define MOZ_STACKWALK_SUPPORTS_LINUX 0
--#endif
- 
- #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
- #  define HAVE___LIBC_STACK_END 1
diff --git a/repo/apps/firefox/disable-neon-in-aom.patch b/repo/apps/firefox/disable-neon-in-aom.patch
deleted file mode 100644
index 6df05a1..0000000
--- a/repo/apps/firefox/disable-neon-in-aom.patch
+++ /dev/null
@@ -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']
-
-
diff --git a/repo/apps/firefox/firefox-safe.desktop b/repo/apps/firefox/firefox-safe.desktop
deleted file mode 100644
index 1538fc6..0000000
--- a/repo/apps/firefox/firefox-safe.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=firefox -safe-mode %u
-Icon=firefox
-Type=Application
-Terminal=false
-MultipleArgs=false
-Name=Firefox - Safe Mode
-GenericName=Web Browser - Safe Mode
-StartupNotify=false
-Categories=Network;WebBrowser;
diff --git a/repo/apps/firefox/firefox.desktop b/repo/apps/firefox/firefox.desktop
deleted file mode 100644
index d048ce4..0000000
--- a/repo/apps/firefox/firefox.desktop
+++ /dev/null
@@ -1,81 +0,0 @@
-[Desktop Entry]
-Exec=firefox %u
-Icon=firefox
-Type=Application
-Terminal=false
-Name=Firefox
-Name[bn]=ফায়ারফক্স3
-Name[eo]=Fajrovulpo3
-Name[fi]=Firefox3
-Name[pa]=ਫਾਇਰਫੋਕਸ3
-Name[tg]=Рӯбоҳи оташин3
-GenericName=Web Browser
-GenericName[af]=Web Blaaier
-GenericName[ar]=متصفح ويب
-GenericName[az]=Veb Səyyahı
-GenericName[bg]=Браузър
-GenericName[bn]=ওয়েব ব্রাউজার
-GenericName[br]=Furcher ar Gwiad
-GenericName[bs]=WWW Preglednik
-GenericName[ca]=Fullejador web
-GenericName[cs]=WWW prohlížeč
-GenericName[cy]=Porydd Gwe
-GenericName[da]=Browser
-GenericName[de]=Web-Browser
-GenericName[el]=Περιηγητής Ιστού
-GenericName[eo]=TTT-legilo
-GenericName[es]=Navegador web
-GenericName[et]=Veebilehitseja
-GenericName[eu]=Web arakatzailea
-GenericName[fa]=مرورگر وب
-GenericName[fi]=WWW-selain
-GenericName[fo]=Alnótsfar
-GenericName[fr]=Navigateur web
-GenericName[gl]=Navegador Web
-GenericName[he]=דפדפן אינטרנט
-GenericName[hi]=वेब ब्राउज़र
-GenericName[hr]=Web preglednik
-GenericName[hu]=Webböngésző
-GenericName[is]=Vafri
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブブラウザ
-GenericName[ko]=웹 브라우저
-GenericName[lo]=ເວັບບຣາວເຊີ
-GenericName[lt]=Žiniatinklio naršyklė
-GenericName[lv]=Web Pārlūks
-GenericName[mk]=Прелистувач на Интернет 
-GenericName[mn]=Веб-Хөтөч
-GenericName[nb]=Nettleser
-GenericName[nds]=Nettkieker
-GenericName[nl]=Webbrowser
-GenericName[nn]=Nettlesar
-GenericName[nso]=Seinyakisi sa Web
-GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[ro]=Navigator de web
-GenericName[ru]=Веб-браузер
-GenericName[se]=Fierpmádatlogan
-GenericName[sk]=Webový prehliadač
-GenericName[sl]=Spletni brskalnik
-GenericName[sr]=Веб претраживач
-GenericName[sr@Latn]=Veb pretraživač
-GenericName[ss]=Ibrawuza yeWeb 
-GenericName[sv]=Webbläsare
-GenericName[ta]=வலை உலாவி
-GenericName[tg]=Тафсиргари вэб
-GenericName[th]=เว็บบราวเซอร์
-GenericName[tr]=Web Tarayıcı
-GenericName[uk]=Навігатор Тенет
-GenericName[uz]=Веб-браузер
-GenericName[ven]=Buronza ya Webu
-GenericName[vi]=Trình duyệt Web
-GenericName[wa]=Betchteu waibe
-GenericName[xh]=Umkhangeli zincwadi we Web
-GenericName[zh_CN]=网页浏览器
-GenericName[zh_TW]=網頁瀏覽器
-GenericName[zu]=Umcingi we-Web
-MimeType=text/html;
-StartupNotify=true
-Categories=Network;WebBrowser;
diff --git a/repo/apps/firefox/firefox.xibuild b/repo/apps/firefox/firefox.xibuild
deleted file mode 100644
index ac49349..0000000
--- a/repo/apps/firefox/firefox.xibuild
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/bin/sh
-
-NAME="firefox"
-DESC="Firefox web browser"
-
-MAKEDEPS="make rust cbindgen"
-DEPS="nodejs alsa-lib atk cairo dbus ffmpeg fontconfig freetype2 gdk-pixbuf glib gtk3 icu libevent libffi libpng libvpx libwebp libx11 libxcb libxcomposite libxdamage libxext libxfixes libxrandr musl nspr nss pango pixman zlib dbus-glib"
-
-PKG_VER=100.0.2
-
-SOURCE="https://ftp.mozilla.org/pub/firefox/releases/$PKG_VER/source/firefox-$PKG_VER.source.tar.xz"
-ADDITIONAL="
-allow-custom-rust-vendor.patch
-avoid-redefinition.patch
-disable-moz-stackwalk.patch
-disable-neon-in-aom.patch
-firefox-safe.desktop
-firefox.desktop
-fix-fortify-system-wrappers.patch
-fix-rust-target.patch
-fix-webrtc-glibcisms.patch
-mallinfo.patch
-sandbox-fork.patch
-sandbox-largefile.patch
-sandbox-sched_setscheduler.patch
-stab.h
-"
-
-prepare () {
-    apply_patches
-
-    cp stab.h toolkit/crashreporter/google-breakpad/src/
-
-    sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/audio_thread_priority/.cargo-checksum.json
-    sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/target-lexicon-0.9.0/.cargo-checksum.json
-}
-
-build () {
-    mkdir -p objdir
-    cd objdir
-    export SHELL=/bin/sh
-	export BUILD_OFFICIAL=1
-	export MOZILLA_OFFICIAL=1
-	export USE_SHORT_LIBNAME=1
-	export MACH_USE_SYSTEM_PYTHON=1
-	export MOZBUILD_STATE_PATH=$BUILD_ROOT/mozbuild
-	# disable desktop notifications
-	export MOZ_NOSPAM=1
-	# Find our triplet JSON
-	export RUST_TARGET="x86_64-unknown-linux-musl"
-	# Build with Clang, takes less RAM
-	export CC="clang"
-	export CXX="clang++"
-
-	export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/firefox"
-    ../mach configure \
-        --without-wasm-sandboxed-libraries \
-		--prefix=/usr \
-        --disable-elf-hack \
-        --enable-rust-simd \
-        --enable-sandbox \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-install-strip \
-		--disable-jemalloc \
-		--disable-minify \
-		--disable-profiling \
-		--disable-strip \
-		--disable-tests \
-		--disable-updater \
-		--enable-alsa \
-		--enable-dbus \
-		--enable-default-toolkit=cairo-gtk3-wayland \
-		--enable-dom-streams \
-		--enable-ffmpeg \
-		--enable-hardening \
-		--enable-necko-wifi \
-		--enable-official-branding \
-		--enable-optimize="$CFLAGS -O2" \
-		--enable-pulseaudio \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--with-distribution-id=xilinux \
-		--with-libclang-path=/usr/lib \
-		--with-system-ffi \
-		--with-system-icu \
-		--with-system-jpeg \
-		--with-system-libevent \
-		--with-system-libvpx \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-pixman \
-		--with-system-png \
-		--with-system-webp \
-		--with-system-zlib \
-		--with-unsigned-addon-scopes=app,system  &&
-	../mach build
-}
-
-package () {
-
-	DESTDIR="$PKG_DEST" MOZ_MAKE_FLAGS="$MAKEOPTS" ../mach install
-
-	install -m755 -d "$PKG_DEST"/usr/share/applications
-	install -m755 -d "$PKG_DEST"/usr/share/pixmaps
-
-	local _png
-	for _png in ../browser/branding/official/default*.png; do
-		local i=${_png%.png}
-		i=${i##*/default}
-		install -D -m644 "$_png" "$PKG_DEST"/usr/share/icons/hicolor/"$i"x"$i"/apps/firefox.png
-	done
-
-	install -m644 ../browser/branding/official/default48.png \
-		"$PKG_DEST"/usr/share/pixmaps/firefox.png
-	install -m644 ../firefox.desktop "$PKG_DEST"/usr/share/applications/org.mozilla.firefox.desktop
-	install -m644 ../firefox-safe.desktop "$PKG_DEST"/usr/share/applications/org.mozilla.firefox-safe.desktop
-
-	# Add StartupWMClass=firefox on the .desktop files so Desktop Environments
-	# correctly associate the window with their icon, the correct fix is to have
-	# firefox sets its own AppID but this will work for the meantime
-	# See: https://bugzilla.mozilla.org/show_bug.cgi?id=1607399
-	echo "StartupWMClass=firefox" >> $PKG_DEST/usr/share/applications/org.mozilla.firefox.desktop
-	echo "StartupWMClass=firefox" >> $PKG_DEST/usr/share/applications/org.mozilla.firefox-safe.desktop
-
-	# install our vendor prefs
-	install -d $PKG_DEST/usr/lib/firefox/browser/defaults/preferences
-
-	cat >> $PKG_DEST/usr/lib/firefox/browser/defaults/preferences/firefox-branding.js <<- EOF
-	// Use LANG environment variable to choose locale
-	pref("intl.locale.requested", "");
-
-	// Disable default browser checking.
-	pref("browser.shell.checkDefaultBrowser", false);
-
-	// Don't disable our bundled extensions in the application directory
-	pref("extensions.autoDisableScopes", 11);
-	pref("extensions.shownSelectionUI", true);
-	EOF
-}
diff --git a/repo/apps/firefox/fix-fortify-system-wrappers.patch b/repo/apps/firefox/fix-fortify-system-wrappers.patch
deleted file mode 100644
index 17cf7e3..0000000
--- a/repo/apps/firefox/fix-fortify-system-wrappers.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-The wrapper features.h gets pulled in by system headers causing thigns to
-break. We work around it by simply not wrap features.h
-
---- ./config/system-headers.mozbuild.orig
-+++ ./config/system-headers.mozbuild
-@@ -229,7 +229,6 @@
-     'execinfo.h',
-     'extras.h',
-     'fcntl.h',
--    'features.h',
-     'fenv.h',
-     'ffi.h',
-     'fibdef.h',
diff --git a/repo/apps/firefox/fix-rust-target.patch b/repo/apps/firefox/fix-rust-target.patch
deleted file mode 100644
index 9342063..0000000
--- a/repo/apps/firefox/fix-rust-target.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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')
diff --git a/repo/apps/firefox/fix-webrtc-glibcisms.patch b/repo/apps/firefox/fix-webrtc-glibcisms.patch
deleted file mode 100644
index 4f9043b..0000000
--- a/repo/apps/firefox/fix-webrtc-glibcisms.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/third_party/libwebrtc/system_wrappers/source/cpu_features_linux.cc
-+++ b/third_party/libwebrtc/system_wrappers/source/cpu_features_linux.cc
-@@ -18,7 +18,7 @@
- #define WEBRTC_GLIBC_PREREQ(a, b) 0
- #endif
- 
--#if WEBRTC_GLIBC_PREREQ(2, 16)
-+#if !__GLIBC__ || WEBRTC_GLIBC_PREREQ(2, 16)
- #include <sys/auxv.h>
- #else
- #include <errno.h>
-@@ -40,7 +40,7 @@
-   int architecture = 0;
-   uint64_t hwcap = 0;
-   const char* platform = NULL;
--#if WEBRTC_GLIBC_PREREQ(2, 16)
-+#if !__GLIBC__ || WEBRTC_GLIBC_PREREQ(2, 16)
-   hwcap = getauxval(AT_HWCAP);
-   platform = (const char*)getauxval(AT_PLATFORM);
- #else
diff --git a/repo/apps/firefox/mallinfo.patch b/repo/apps/firefox/mallinfo.patch
deleted file mode 100644
index 7916a20..0000000
--- a/repo/apps/firefox/mallinfo.patch
+++ /dev/null
@@ -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__)
diff --git a/repo/apps/firefox/sandbox-fork.patch b/repo/apps/firefox/sandbox-fork.patch
deleted file mode 100644
index c7222ab..0000000
--- a/repo/apps/firefox/sandbox-fork.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-make SYS_fork non-fatal, musl uses it for fork(2)
-
---- a/security/sandbox/linux/SandboxFilter.cpp
-+++ b/security/sandbox/linux/SandboxFilter.cpp
-@@ -1253,6 +1253,10 @@
-         // usually do something reasonable on error.
-       case __NR_clone:
-         return ClonePolicy(Error(EPERM));
-+#ifdef __NR_fork
-+      case __NR_fork:
-+        return Error(ENOSYS);
-+#endif
- 
- #  ifdef __NR_fadvise64
-       case __NR_fadvise64:
diff --git a/repo/apps/firefox/sandbox-largefile.patch b/repo/apps/firefox/sandbox-largefile.patch
deleted file mode 100644
index f1cf28b..0000000
--- a/repo/apps/firefox/sandbox-largefile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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
-+#if defined(__x86_64__) || defined(__i386__) || defined(__mips__)
-+#define O_LARGEFILE_REAL 0100000
-+#elif defined(__powerpc__)
-+#define O_LARGEFILE_REAL 0200000
-+#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
diff --git a/repo/apps/firefox/sandbox-sched_setscheduler.patch b/repo/apps/firefox/sandbox-sched_setscheduler.patch
deleted file mode 100644
index 3163c9e..0000000
--- a/repo/apps/firefox/sandbox-sched_setscheduler.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1657849
---- a/security/sandbox/linux/SandboxFilter.cpp
-+++ b/security/sandbox/linux/SandboxFilter.cpp
-@@ -1694,10 +1694,10 @@
-         return Allow();
-       case __NR_sched_get_priority_min:
-       case __NR_sched_get_priority_max:
-+      case __NR_sched_setscheduler:
-         return Allow();
-       case __NR_sched_getparam:
--      case __NR_sched_getscheduler:
--      case __NR_sched_setscheduler: {
-+      case __NR_sched_getscheduler: {
-         Arg<pid_t> pid(0);
-         return If(pid == 0, Allow()).Else(Trap(SchedTrap, nullptr));
-       }
diff --git a/repo/apps/firefox/stab.h b/repo/apps/firefox/stab.h
deleted file mode 100644
index 6f70af3..0000000
--- a/repo/apps/firefox/stab.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*	$OpenBSD: stab.h,v 1.3 2003/06/02 19:34:12 millert Exp $	*/
-/*	$NetBSD: stab.h,v 1.4 1994/10/26 00:56:25 cgd Exp $	*/
-
-/*-
- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)stab.h	5.2 (Berkeley) 4/4/91
- */
-
-#ifndef _STAB_H_
-#define _STAB_H_
-
-/*
- * The following are symbols used by various debuggers and by the Pascal
- * compiler.  Each of them must have one (or more) of the bits defined by
- * the N_STAB mask set.
- */
-
-#define	N_GSYM		0x20	/* global symbol */
-#define	N_FNAME		0x22	/* F77 function name */
-#define	N_FUN		0x24	/* procedure name */
-#define	N_STSYM		0x26	/* data segment variable */
-#define	N_LCSYM		0x28	/* bss segment variable */
-#define	N_MAIN		0x2a	/* main function name */
-#define	N_PC		0x30	/* global Pascal symbol */
-#define	N_RSYM		0x40	/* register variable */
-#define	N_SLINE		0x44	/* text segment line number */
-#define	N_DSLINE	0x46	/* data segment line number */
-#define	N_BSLINE	0x48	/* bss segment line number */
-#define	N_SSYM		0x60	/* structure/union element */
-#define	N_SO		0x64	/* main source file name */
-#define	N_LSYM		0x80	/* stack variable */
-#define	N_BINCL		0x82	/* include file beginning */
-#define	N_SOL		0x84	/* included source file name */
-#define	N_PSYM		0xa0	/* parameter variable */
-#define	N_EINCL		0xa2	/* include file end */
-#define	N_ENTRY		0xa4	/* alternate entry point */
-#define	N_LBRAC		0xc0	/* left bracket */
-#define	N_EXCL		0xc2	/* deleted include file */
-#define	N_RBRAC		0xe0	/* right bracket */
-#define	N_BCOMM		0xe2	/* begin common */
-#define	N_ECOMM		0xe4	/* end common */
-#define	N_ECOML		0xe8	/* end common (local name) */
-#define	N_LENG		0xfe	/* length of preceding entry */
-
-#endif /* !_STAB_H_ */
diff --git a/repo/apps/gimp/gimp.xibuild b/repo/apps/gimp/gimp.xibuild
deleted file mode 100644
index b11e920..0000000
--- a/repo/apps/gimp/gimp.xibuild
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-NAME="gimp"
-DESC="GNU Image Manipulation Program"
-
-MAKEDEPS="make gettext"
-DEPS="babl cairo fontconfig freetype2 gdk-pixbuf gexiv2 glib gtk2 harfbuzz json-glib lcms2 bzip2 libexecinfo intltool libjpeg-turbo libmypaint mypaint-brushes libpng librsvg libwebp libx11 libxext libxfixes libxmu libxpm musl pango poppler-glib gegl tiff xz zlib python glib-networking poppler-data"
-
-PKG_VER=2.10.28
-SOURCE="https://download.gimp.org/pub/gimp/v${PKG_VER%.*}/gimp-$PKG_VER.tar.bz2"
-
-build () {
-    ./configure \
-		--disable-dependency-tracking \
-		--sysconfdir=/etc \
-		--enable-mp \
-		--enable-gimp-console \
-        --disable-python \
-		--without-aa \
-		--disable-check-update
-
-    make
-}
-
-package () {
-    make DESTDIR=$PKG_DEST install
-}
diff --git a/repo/apps/links/links.xibuild b/repo/apps/links/links.xibuild
deleted file mode 100644
index bb2540d..0000000
--- a/repo/apps/links/links.xibuild
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-NAME="links"
-DESC="Web browser running in text mode only"
-
-MAKEDEPS="make "
-DEPS="bzip2 openssl libevent musl zlib zstd "
-
-PKG_VER=2.25
-SOURCE="http://links.twibright.com/download/links-$PKG_VER.tar.bz2"
-
-build () {
-    ./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--mandir=/usr/share/man 
-		--disable-javascript \
-		--disable-graphics \
-		--without-x \
-		--disable-nls
-    make
-}
-
-package () {
-    make DESTDIR=$PKG_DEST install
-}
diff --git a/repo/apps/lynx/lynx.xibuild b/repo/apps/lynx/lynx.xibuild
deleted file mode 100644
index 1b1592d..0000000
--- a/repo/apps/lynx/lynx.xibuild
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-MAKEDEPS="make "
-DEPS="libidn openssl"
-
-PKG_VER=2.8.9rel.1
-
-SOURCE=https://invisible-mirror.net/archives/lynx/tarballs/lynx$PKG_VER.tar.bz2
-ADDITIONAL="
-        https://www.linuxfromscratch.org/patches/blfs/svn/lynx-$PKG_VER-security_fix-1.patch
-    "
-
-DESC="A text only browser for the WWW"
-
-build () {
-    ./configure --prefix=/usr          \
-            --sysconfdir=/etc/lynx \
-            --datadir=/usr/share/doc/lynx-$PKG_VER \
-            --with-zlib            \
-            --with-bzlib           \
-            --with-ssl             \
-            --with-screen=ncursesw \
-            --enable-locale-charset &&
-    make
-
-}
-
-package () {
-    make DESTDIR=$PKG_DEST install-full
-    chgrp -R root $PKG_DEST/usr/share/doc/lynx-$PKG_VER/lynx_doc
-
-}
diff --git a/repo/apps/mpv/mpv.xibuild b/repo/apps/mpv/mpv.xibuild
deleted file mode 100644
index 6770c54..0000000
--- a/repo/apps/mpv/mpv.xibuild
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-NAME="mpv"
-DESC="Video player based on MPlayer/mplayer2"
-
-MAKEDEPS="make waf"
-DEPS="alsa-lib faac ffmpeg4 freetype2 lame aom libass libtheora libva libvdpau libxext libxinerama libxkbcommon libxrandr libxscrnsaver libxv libxvmc libxxf86dga lua mesa perl pulseaudio python-docutils python xvidcore zlib "
-
-PKG_VER=0.34.1
-SOURCE="https://github.com/mpv-player/mpv/archive/v$PKG_VER/mpv-$PKG_VER.tar.gz"
-
-prepare () {
-    ln -s /usr/bin/waf waf
-}
-
-build () {
-    python3 waf configure \
-        --prefix=/usr \
-        --bindir=/usr/bin \
-        --sysconfdir=/etc \
-        --disable-static \
-        --enable-alsa \
-        --enable-pulse \
-        --enable-libmpv-shared \
-        --enable-wayland \
-        --enable-lua \
-        --enable-test
-    python3 waf build
-}
-
-package () {
-    python3 waf install --destdir=$PKG_DEST
-}
diff --git a/repo/apps/ncmpcpp/ncmpcpp.xibuild b/repo/apps/ncmpcpp/ncmpcpp.xibuild
deleted file mode 100644
index a27264e..0000000
--- a/repo/apps/ncmpcpp/ncmpcpp.xibuild
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-NAME="ncmpcpp"
-DESC="Ncurses based MPD client inspired by ncmpc"
-
-MAKEDEPS="make "
-DEPS="boost icu curl libmpdclient musl ncurses readline"
-
-PKG_VER=0.9.2
-SOURCE="http://rybczak.net/ncmpcpp/stable/ncmpcpp-$PKG_VER.tar.bz2"
-
-build () {
-    ./configure \
-        BOOST_LIB_SUFFIX=-mt \
-        --prefix=/usr \
-        --bindir=/usr/bin \
-        --sysconfdir=/etc \
-        --disable-static \
-        --enable-clock \
-        --enable-visualizer 
-    make
-}
-
-package () {
-    make DESTDIR=$PKG_DEST install
-}
diff --git a/repo/apps/neovim/neovim.xibuild b/repo/apps/neovim/neovim.xibuild
deleted file mode 100644
index 389bc7e..0000000
--- a/repo/apps/neovim/neovim.xibuild
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-MAKEDEPS="make "
-DEPS="intltool libluv libtermkey libuv libvterm luajit msgpack-c musl tree-sitter unibilium lua-lpeg lua-mpack" 
-
-PKG_VER=0.6.1
-SOURCE=https://github.com/neovim/neovim/archive/v$PKG_VER.tar.gz
-DESC="Vim-fork focused on extensibility and agility"
-
-build () {
-    mkdir build
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=MinSizeRel \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_INSTALL_LIBDIR=lib \
-		-DENABLE_JEMALLOC=FALSE \
-		-DENABLE_LTO=TRUE \
-        -DUSE_BUNDLED=ON \
-		-DCMAKE_VERBOSE_MAKEFILE=TRUE 
-	cmake --build build
-}
-
-
-package () {
-    DESTDIR="$PKG_DEST" cmake --install build
-}
diff --git a/repo/apps/pcmanfm/pcmanfm.xibuild b/repo/apps/pcmanfm/pcmanfm.xibuild
deleted file mode 100644
index 35c3d52..0000000
--- a/repo/apps/pcmanfm/pcmanfm.xibuild
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-NAME="pcmanfm"
-DESC="Extremely fast and lightweight file manager"
-
-MAKEDEPS="make "
-DEPS="gtk3 libfm "
-
-PKG_VER=1.3.2
-SOURCE="https://downloads.sourceforge.net/pcmanfm/pcmanfm-$PKG_VER.tar.xz"
-
-prepare () {
-    # avoid errors building .po files with gettext-tiny
-    sed -e "s/^\(SUBDIRS =.*\)po\(.*\)$/\1\2/" -i Makefile.in 
-    echo "SUBDIRS=src data" > Makefile.am
-    aclocal
-    autoreconf 
-    automake --add-missing
-}
-
-build () {
-    ./configure \
-        --prefix=/usr \
-        --sysconfdir=/etc \
-        --with-gtk=3 
-    make
-}
-
-package () {
-    make DESTDIR=$PKG_DEST install
-    sed -i 's|x-directory/normal|inode/directory|' \
-        "$PKG_DEST"/usr/share/applications/pcmanfm.desktop
-}
diff --git a/repo/apps/polybar/fix-version.patch b/repo/apps/polybar/fix-version.patch
deleted file mode 100644
index 1548ce3..0000000
--- a/repo/apps/polybar/fix-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -33,7 +33,7 @@
-   OUTPUT_VARIABLE git_describe
-   OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)
- 
--if(git_result EQUAL "0")
-+if(0)
-   set(APP_VERSION "${git_describe}")
- else()
-   message(STATUS "Could not detect version with git, falling back to built-in version information.")
diff --git a/repo/apps/polybar/polybar.xibuild b/repo/apps/polybar/polybar.xibuild
deleted file mode 100644
index 16e07af..0000000
--- a/repo/apps/polybar/polybar.xibuild
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-NAME="polybar"
-DESC="fast and easy-to-use tool for creating status bars"
-
-MAKEDEPS="cmake "
-DEPS="alsa-lib sbase cairo fontconfig freetype2 jsoncpp curl libmpdclient pulseaudio libuv musl libxcb xcb-util-cursor xcb-util-wm "
-
-PKG_VER=3.6.1
-SOURCE="https://github.com/polybar/polybar/archive/$PKG_VER.tar.gz"
-
-xppver="044e69d05db7f89339bda1ccd1efe0263b01c8f6"
-i3ipcppver="86ddf7102c6903ae0cc543071e2d375403fc0727"
-
-ADDITIONAL="fix-version.patch 
-https://github.com/polybar/xpp/archive/$xppver.tar.gz
-https://github.com/polybar/i3ipcpp/archive/$i3ipcppver.tar.gz
-"
-
-prepare () {
-    tar -xf $xppver.tar.gz
-    tar -xf $i3ipcppver.tar.gz
-
-    mkdir build
-    rm -rf lib/xpp
-    mv xpp-$xppver lib/xpp
-    rm -rf lib/i3ipcpp
-    mv i3ipcpp-$i3ipcpp lib/i3ipcpp
-
-    apply_patches
-}
-
-build () {
-    cmake -B build \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
-		-DBUILD_SHARED_LIBS=True \
-        -DBUILD_STATIC_LIBS=OFF
-	cmake --build build
-}
-
-package () {
-	DESTDIR="$PKG_DEST" cmake --install build
-}
diff --git a/repo/apps/rxvt-unicode/rxvt-unicode.xibuild b/repo/apps/rxvt-unicode/rxvt-unicode.xibuild
deleted file mode 100644
index ddae254..0000000
--- a/repo/apps/rxvt-unicode/rxvt-unicode.xibuild
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-
-MAKEDEPS="make ncurses"
-DEPS="libxft perl startup-notification libnsl libptytty"
-
-DESC="Unicode fork of rxvt terminal emulator"
-
-PKG_VER=9.30
-SOURCE=http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-$PKG_VER.tar.bz2
-
-build () {
-    export TERMINFO=/usr/share/terminfo 
-      ./configure \
-        --prefix=/usr \
-        --enable-256-color \
-        --enable-combining \
-        --enable-fading \
-        --enable-font-styles \
-        --enable-iso14755 \
-        --enable-keepscrolling \
-        --enable-lastlog \
-        --enable-mousewheel \
-        --enable-next-scroll \
-        --enable-perl \
-        --enable-pointer-blank \
-        --enable-rxvt-scroll \
-        --enable-selectionscrolling \
-        --enable-slipwheeling \
-        --disable-smart-resize \
-        --enable-startup-notification \
-        --enable-transparency \
-        --enable-unicode3 \
-        --enable-utmp \
-        --enable-wtmp \
-        --enable-xft \
-        --enable-xim \
-        --enable-xterm-scroll \
-        --disable-pixbuf \
-        --with-terminfo \
-        --disable-frills
-    make
-}
-
-package () {
-    export TERMINFO="terminfo"
-    install -d "${TERMINFO}"
-    make DESTDIR=$PKG_DEST install
-
-    install -dm 755 "$PKG_DEST/usr/share/applications"
-    cat > $PKG_DEST/usr/share/applications/urxvt.desktop << "EOF"
-[Desktop Entry]
-Encoding=UTF-8
-Name=Rxvt-Unicode Terminal
-Comment=Use the command line
-GenericName=Terminal
-Exec=urxvt
-Terminal=false
-Type=Application
-Icon=utilities-terminal
-Categories=GTK;Utility;TerminalEmulator;
-#StartupNotify=true
-Keywords=console;command line;execute;
-EOF
-
-  install -dm 755 "${PKG_DEST}/usr/share/"
-  tic -o ${PKG_DEST}/usr/share/terminfo -s doc/etc/rxvt-unicode.terminfo
-
-}
diff --git a/repo/apps/sxiv/sxiv.xibuild b/repo/apps/sxiv/sxiv.xibuild
deleted file mode 100644
index a4afd5d..0000000
--- a/repo/apps/sxiv/sxiv.xibuild
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-NAME="sxiv"
-DESC="Simple X Image Viewer"
-
-MAKEDEPS="make"
-DEPS="fontconfig giflib imlib2 libexif libx11 libxft musl "
-
-PKG_VER=26
-SOURCE="https://github.com/muennich/sxiv/archive/v$PKG_VER.tar.gz"
-
-build () {
-    make PREFIX=/usr
-}
-
-package () {
-    make PREFIX=/usr DESTDIR=$PKG_DEST install
-}
diff --git a/repo/apps/vim/vim.xibuild b/repo/apps/vim/vim.xibuild
deleted file mode 100644
index 8f7adf4..0000000
--- a/repo/apps/vim/vim.xibuild
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-MAKEDEPS="make "
-DEPS="acl musl libgcrypt pcre2 zlib"
-
-PKG_VER=8.2.4656
-SOURCE=https://github.com/vim/vim/archive/refs/tags/v$PKG_VER.tar.gz
-DESC="Vi Improved"
-
-prepare () {
-    echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
-}
-
-build () {
-    ./configure --prefix=/usr --disable-gtk-check --disable-motif-check --disable-athena-check --disable-gui --disable-xsmp --without-x -disable-canberra --disable-libsodium --disable-gpm --disable-libsodium
-    make
-}
-
-
-package () {
-    make -j1 DESTDIR=$PKG_DEST install 
-    mkdir -p $PKG_DEST/etc
-    cat > $PKG_DEST/etc/vimrc << "EOF"
-" Begin /etc/vimrc
-" Ensure defaults are set before customizing settings, not after
-source $VIMRUNTIME/defaults.vim
-let skip_defaults_vim=1 
-set nocompatible
-set backspace=2
-set mouse=
-syntax on
-if (&term == "xterm") || (&term == "putty")
-  set background=dark
-endif
-" End /etc/vimrc
-EOF
-
-}
diff --git a/repo/apps/xclock-cat/xclock-cat.xibuild b/repo/apps/xclock-cat/xclock-cat.xibuild
deleted file mode 100644
index 0338096..0000000
--- a/repo/apps/xclock-cat/xclock-cat.xibuild
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-NAME="xclock-cat"
-DESC="xclock cat mode"
-
-MAKEDEPS="make"
-DEPS="libx11 motif"
-
-PKG_VER=master
-SOURCE="https://github.com/BarkyTheDog/catclock"
-
-build () {
-    make 
-}
-
-package () {
-    install -Dm755 xclock $PKG_DEST/usr/bin/xclock-cat
-}
diff --git a/repo/apps/xlinks/links.desktop b/repo/apps/xlinks/links.desktop
deleted file mode 100644
index 275d20f..0000000
--- a/repo/apps/xlinks/links.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Links
-Comment=Minimal web browser in graphical mode
-Exec=xlinks -g
-Icon=links-48x48.xpm
-Type=Application
-Terminal=false
-Categories=Network;WebBrowser;
diff --git a/repo/apps/xlinks/xlinks.xibuild b/repo/apps/xlinks/xlinks.xibuild
deleted file mode 100644
index 13ff3f7..0000000
--- a/repo/apps/xlinks/xlinks.xibuild
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-NAME="xlinks"
-DESC="Web browser running in both graphics and text mode"
-
-MAKEDEPS="make "
-DEPS="bzip2 openssl libevent musl zlib zstd libx11 tiff libpng "
-
-PKG_VER=2.25
-SOURCE="http://links.twibright.com/download/links-$PKG_VER.tar.bz2"
-ADDITIONAL="links.desktop"
-
-build () {
-    ./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-        --enable-graphics \
-        --with-x \
-        --with-fb
-		--disable-nls
-    make
-}
-
-package () {
-    make DESTDIR=$PKG_DEST install
-    mv $PKG_DEST/usr/bin/links $PKG_DEST/usr/bin/xlinks
-    install -D -m0644 "links.desktop" "$PKG_DEST/usr/share/applications/links.desktop"
-}
diff --git a/repo/apps/xterm/posix-ptys.patch b/repo/apps/xterm/posix-ptys.patch
deleted file mode 100644
index 596699f..0000000
--- a/repo/apps/xterm/posix-ptys.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -upr xterm-323.orig/main.c xterm-323/main.c
---- xterm-323.orig/main.c	2016-03-09 15:30:51.191053881 +0100
-+++ xterm-323/main.c	2016-03-09 15:31:17.961635229 +0100
-@@ -2654,7 +2654,7 @@ get_pty(int *pty, char *from GCC_UNUSED)
- 	close(opened_tty);
- 	opened_tty = -1;
-     }
--#elif defined(HAVE_POSIX_OPENPT) && defined(HAVE_PTSNAME) && defined(HAVE_GRANTPT_PTY_ISATTY)
-+#elif defined(HAVE_POSIX_OPENPT) && defined(HAVE_PTSNAME)
-     if ((*pty = posix_openpt(O_RDWR)) >= 0) {
- 	char *name = ptsname(*pty);
- 	if (name != 0) {
-@@ -3735,7 +3735,7 @@ spawnXTerm(XtermWidget xw)
- 	    /*
- 	     * now in child process
- 	     */
--#if defined(_POSIX_SOURCE) || defined(SVR4) || defined(__convex__) || defined(__SCO__) || defined(__QNX__)
-+#if defined(_POSIX_VERSION) || defined(SVR4) || defined(__convex__) || defined(__SCO__) || defined(__QNX__)
- 	    int pgrp = setsid();	/* variable may not be used... */
- #else
- 	    int pgrp = getpid();
diff --git a/repo/apps/xterm/xterm.xibuild b/repo/apps/xterm/xterm.xibuild
deleted file mode 100644
index 6350155..0000000
--- a/repo/apps/xterm/xterm.xibuild
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-
-MAKEDEPS="make"
-DEPS="libxft libxaw ncurses luit xbitmaps libxkbfile"
-
-DESC="X Terminal Emulator"
-
-PKG_VER=371
-SOURCE=ftp://ftp.invisible-island.net/xterm/xterm-$PKG_VER.tgz
-ADDITIONAL="
-    posix-ptys.patch
-"
-
-prepare () {
-    apply_pacthes
-    sed -i '/v0/{n;s/new:/new:kb=^?:/}' termcap &&
-    printf '\tkbs=\\177,\n' >> terminfo &&
-
-    export TERMINFO=/usr/share/terminfo 
-}
-
-build () {
-    ./configure \
-        $XORG_CONFIG \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--with-x \
-		--disable-full-tgetent \
-		--disable-imake \
-		--enable-ansi-color \
-		--enable-88-color \
-		--enable-256-color \
-		--enable-broken-osc \
-		--enable-broken-st \
-		--enable-load-vt-fonts \
-		--enable-i18n \
-		--enable-wide-chars \
-		--enable-doublechars \
-		--enable-warnings \
-		--enable-tcap-query \
-		--enable-logging \
-		--enable-dabbrev \
-		--enable-freetype \
-		--enable-luit \
-		--enable-mini-luit \
-		--enable-narrowproto \
-		--enable-exec-xterm \
-		--enable-sixel-graphics \
-		--with-tty-group=tty \
-		--with-utempter
-    make
-}
-
-package () {
-    make DESTDIR=$PKG_DEST install
-    make DESTDIR=$PKG_DEST install-ti
-
-    mkdir -p $PKG_DEST/usr/share/applications &&
-    cp *.desktop $PKG_DEST/usr/share/applications/
-}