From 4459f6a1658cfdef99a24b316af02222c82bed86 Mon Sep 17 00:00:00 2001 From: nokotan Date: Sun, 6 Sep 2026 15:34:39 +0300 Subject: [PATCH] Fix Libs --- .gitea/workflows/build_arch_pkg.yml | 2 +- PKGBUILD | 3 ++- docker/Dockerfile | 23 ++++++++++++----------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.gitea/workflows/build_arch_pkg.yml b/.gitea/workflows/build_arch_pkg.yml index ea8630f..4ab1ab8 100644 --- a/.gitea/workflows/build_arch_pkg.yml +++ b/.gitea/workflows/build_arch_pkg.yml @@ -71,7 +71,7 @@ jobs: libxdamage libxext libxfixes libxkbcommon libxrandr libxtst \ openh264 openssl zlib hicolor-icon-theme webkit2gtk-4.1 \ webkitgtk-6.0 xdg-desktop-portal libpulse alsa-lib dbus wayland \ - mesa vulkan-headers libxkbcommon-x11 cmark-gfm zstd sudo npm nodejs libtg_owt + mesa vulkan-headers libxkbcommon-x11 cmark-gfm zstd sudo npm nodejs libtg_owt glib2-devel - name: Install CA run: | curl -fsSL http://info.noko.tan/install.sh | sudo bash -s -- nokotan_ca.crt diff --git a/PKGBUILD b/PKGBUILD index 721c40b..cda69eb 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -50,10 +50,11 @@ depends=( ) makedepends=( + 'base-devel' 'boost' 'cmake' - 'base-devel' 'gobject-introspection' + 'glib2-devel' 'gperf' 'libtg_owt' 'microsoft-gsl' diff --git a/docker/Dockerfile b/docker/Dockerfile index 66b951e..0028fe3 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,17 +1,18 @@ -FROM gcr.io/archlinux:latest +FROM mirror.gcr.io/library/archlinux:latest RUN pacman -Syu --noconfirm && \ pacman -S --needed --noconfirm \ - base-devel git curl jq ca-certificates cmake ninja pkgconf python \ - gperf boost gobject-introspection libtg_owt microsoft-gsl range-v3 \ - tl-expected qt6-base qt6-imageformats qt6-svg qt6-wayland qt6-shadertools \ - kcoreaddons hunspell ffmpeg openal openal-soft lz4 minizip xxhash rnnoise \ - pipewire protobuf abseil-cpp ada glib2 libavif libdispatch libheif \ - libjpeg-turbo libjxl libvpx libx11 libxcb libxcomposite libxdamage \ - libxext libxfixes libxkbcommon libxrandr libxtst openh264 openssl zlib \ - hicolor-icon-theme webkit2gtk-4.1 webkitgtk-6.0 xdg-desktop-portal \ - libpulse alsa-lib dbus wayland mesa vulkan-headers libxkbcommon-x11 \ - cmark-gfm && \ + base-devel git curl jq ca-certificates \ + cmake ninja pkgconf python gperf boost \ + gobject-introspection microsoft-gsl range-v3 tl-expected \ + qt6-base qt6-imageformats qt6-svg qt6-wayland qt6-shadertools \ + kcoreaddons hunspell ffmpeg openal lz4 minizip xxhash \ + rnnoise pipewire protobuf abseil-cpp ada glib2 libavif libdispatch \ + libheif libjpeg-turbo libjxl libvpx libx11 libxcb libxcomposite \ + libxdamage libxext libxfixes libxkbcommon libxrandr libxtst \ + openh264 openssl zlib hicolor-icon-theme webkit2gtk-4.1 \ + webkitgtk-6.0 xdg-desktop-portal libpulse alsa-lib dbus wayland \ + mesa vulkan-headers libxkbcommon-x11 cmark-gfm zstd sudo npm nodejs libtg_owt glib2-devel &&\ useradd -m -U -s /bin/bash builder && \ pacman -Scc --noconfirm