diff --git a/customize.sh b/customize.sh index 2cbab45..ce25c06 100755 --- a/customize.sh +++ b/customize.sh @@ -5,18 +5,6 @@ O=$1 -emerge --root=/mnt/gentoo --config-root="${O}"/portage \ - -kvnuUDj \ - --rebuilt-binaries=y \ - --onlydeps \ - www-client/firefox - -set -x - -command -v clang -command -v "${target}"-clang -command -v "${target}"-clang-19 - passwd -R /mnt/gentoo -d root systemctl --root=/mnt/gentoo enable wpa_supplicant@wlan0 diff --git a/install.packages b/install.packages index 31638b0..5c67a29 100644 --- a/install.packages +++ b/install.packages @@ -1 +1,2 @@ net-wireless/wpa_supplicant +www-client/firefox diff --git a/portage/make.conf/wayland.conf b/portage/make.conf/wayland.conf index 71d123e..624b840 100644 --- a/portage/make.conf/wayland.conf +++ b/portage/make.conf/wayland.conf @@ -1 +1 @@ -USE="${USE} -X wayland" +USE="${USE} wayland" diff --git a/portage/package.accept_keywords/firefox b/portage/package.accept_keywords/firefox deleted file mode 100644 index f0cbd3b..0000000 --- a/portage/package.accept_keywords/firefox +++ /dev/null @@ -1 +0,0 @@ -dev-libs/nss ~amd64 diff --git a/portage/package.use/firefox b/portage/package.use/firefox index 3580b88..d877364 100644 --- a/portage/package.use/firefox +++ b/portage/package.use/firefox @@ -2,5 +2,14 @@ media-libs/harfbuzz -cairo media-libs/libvpx postproc media-libs/mesa -llvm wayland media-video/ffmpeg openssl -gnutls -www-client/firefox -telemetry dbus wayland + +# Must match USE flags of the www-client/firefox package on the +# offical Gentoo binhost +www-client/firefox X clang dbus gmp-autoupdate gnome-shell jumbo-build pulseaudio system-av1 system-harfbuzz system-icu system-jpeg system-libevent system-libvpx system-webp telemetry wayland LLVM_SLOT: 19 -17 -18 +x11-libs/cairo X x11-libs/gtk+ wayland +media-libs/libglvnd X + +# Firefox requires a PulseAudio-compatible sound server; we use Pipewire +media-video/pipewire sound-server +media-libs/libcanberra udev alsa diff --git a/prepare.sh b/prepare.sh index 919d248..75c9fed 100644 --- a/prepare.sh +++ b/prepare.sh @@ -1,5 +1,7 @@ #!/bin/sh +. "${CONFIGDIR:=${PWD}}"/config + if [ ! -f /var/db/repos/gentoo/metadata/timestamp ]; then emerge-webrsync fi @@ -9,6 +11,7 @@ fi mkdir -p /etc/portage/package.use mkdir -p /etc/portage/make.conf +echo 'virtual/libudev systemd' >> /etc/portage/package.use/systemd cp portage/package.use/firefox /etc/portage/package.use/ cp portage/make.conf/introspection.conf /etc/portage/make.conf/ cp portage/make.conf/wayland.conf /etc/portage/make.conf/ @@ -17,3 +20,7 @@ echo 'VIDEO_CARDS=""' > /etc/portage/make.conf/videocards.conf xargs -r emerge -vbknuUj --rebuilt-binaries=y --color=y <