From de557487623369caa13fb4248d7c18f3e92afac5 Mon Sep 17 00:00:00 2001 From: Tsubajashi Date: Fri, 8 Sep 2023 01:22:52 +0200 Subject: [PATCH 1/5] fix: Add proper cjk fonts to avoid issues of certain flatpaks (like steam) not showing CJK fonts properly. --- packages.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages.json b/packages.json index 6c735ce0a36..cfa28a0f71b 100644 --- a/packages.json +++ b/packages.json @@ -30,7 +30,8 @@ "wireguard-tools", "xprop", "yaru-theme", - "zsh" + "zsh", + "google-noto-sans-cjk-fonts" ], "bluefin-dx": [ "adobe-source-code-pro-fonts", @@ -89,7 +90,8 @@ "firefox-langpacks", "firefox", "gnome-software-rpm-ostree", - "gnome-tour" + "gnome-tour", + "google-noto-sans-cjk-vf-fonts" ], "bluefin-dx": [], "bluefin-framework": [ From b24ffc4631b94a9e07d8ea53e2e4ca01973fb46f Mon Sep 17 00:00:00 2001 From: Tsubajashi Date: Fri, 8 Sep 2023 00:01:51 +0000 Subject: [PATCH 2/5] fix: link cjk fonts to hardcoded paths of steam --- Containerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Containerfile b/Containerfile index ac9e25b7291..b35b4f92a78 100644 --- a/Containerfile +++ b/Containerfile @@ -101,6 +101,7 @@ RUN rm -f /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo RUN rm -f /etc/yum.repos.d/vscode.repo RUN rm -f /etc/yum.repos.d/_copr:copr.fedorainfracloud.org:phracek:PyCharm.repo RUN rm -f /etc/yum.repos.d/fedora-cisco-openh264.repo +RUN ln -s "/usr/share/fonts/google-noto-sans-cjk-fonts" "/usr/share/fonts/noto-cjk" RUN rm -rf /tmp/* /var/* RUN ostree container commit From 535c88e48d529743ba171ca5cd1884156fc1e127 Mon Sep 17 00:00:00 2001 From: Tsubajashi Date: Fri, 8 Sep 2023 00:04:24 +0000 Subject: [PATCH 3/5] fix: update comment regarding cjk font linking --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index b35b4f92a78..c1660d39ea5 100644 --- a/Containerfile +++ b/Containerfile @@ -95,7 +95,7 @@ RUN systemctl disable pmlogger.service RUN /tmp/workarounds.sh -# Clean up repos, everything is on the image so we don't need them +# Clean up repos, everything is on the image so we don't need them. Also link cjk fonts to hardcoded steam paths. RUN rm -f /etc/yum.repos.d/terra.repo RUN rm -f /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo RUN rm -f /etc/yum.repos.d/vscode.repo From 95806dceac29e55b8315bd1c5e4cc8b66342efe4 Mon Sep 17 00:00:00 2001 From: Tsubajashi Date: Fri, 8 Sep 2023 13:56:39 +0000 Subject: [PATCH 4/5] fix: change position of steam cjk font symlink --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index c1660d39ea5..5bc333b50df 100644 --- a/Containerfile +++ b/Containerfile @@ -72,6 +72,7 @@ COPY --from=cgr.dev/chainguard/helm:latest /usr/bin/helm /usr/bin/helm COPY --from=cgr.dev/chainguard/ko:latest /usr/bin/ko /usr/bin/ko COPY --from=cgr.dev/chainguard/minio-client:latest /usr/bin/mc /usr/bin/mc COPY --from=cgr.dev/chainguard/kubectl:latest /usr/bin/kubectl /usr/bin/kubectl +RUN ln -s "/usr/share/fonts/google-noto-sans-cjk-fonts" "/usr/share/fonts/noto-cjk" RUN curl -Lo ./kind "https://github.com/kubernetes-sigs/kind/releases/latest/download/kind-$(uname)-amd64" RUN chmod +x ./kind @@ -101,7 +102,6 @@ RUN rm -f /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo RUN rm -f /etc/yum.repos.d/vscode.repo RUN rm -f /etc/yum.repos.d/_copr:copr.fedorainfracloud.org:phracek:PyCharm.repo RUN rm -f /etc/yum.repos.d/fedora-cisco-openh264.repo -RUN ln -s "/usr/share/fonts/google-noto-sans-cjk-fonts" "/usr/share/fonts/noto-cjk" RUN rm -rf /tmp/* /var/* RUN ostree container commit From 4868b28c141292ed63eacde87ed051a2b3504712 Mon Sep 17 00:00:00 2001 From: Tsubajashi Date: Fri, 8 Sep 2023 15:47:38 +0000 Subject: [PATCH 5/5] fix: moving cjk fonts (again) --- Containerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Containerfile b/Containerfile index 5bc333b50df..ee6c2d3f8e7 100644 --- a/Containerfile +++ b/Containerfile @@ -33,6 +33,7 @@ RUN /tmp/build.sh && \ systemctl enable dconf-update.service && \ fc-cache -f /usr/share/fonts/ubuntu && \ fc-cache -f /usr/share/fonts/inter && \ + ln -s "/usr/share/fonts/google-noto-sans-cjk-fonts" "/usr/share/fonts/noto-cjk" && \ rm -f /etc/yum.repos.d/tailscale.repo && \ rm -f /usr/share/applications/fish.desktop && \ rm -f /usr/share/applications/htop.desktop && \ @@ -72,7 +73,6 @@ COPY --from=cgr.dev/chainguard/helm:latest /usr/bin/helm /usr/bin/helm COPY --from=cgr.dev/chainguard/ko:latest /usr/bin/ko /usr/bin/ko COPY --from=cgr.dev/chainguard/minio-client:latest /usr/bin/mc /usr/bin/mc COPY --from=cgr.dev/chainguard/kubectl:latest /usr/bin/kubectl /usr/bin/kubectl -RUN ln -s "/usr/share/fonts/google-noto-sans-cjk-fonts" "/usr/share/fonts/noto-cjk" RUN curl -Lo ./kind "https://github.com/kubernetes-sigs/kind/releases/latest/download/kind-$(uname)-amd64" RUN chmod +x ./kind @@ -96,7 +96,7 @@ RUN systemctl disable pmlogger.service RUN /tmp/workarounds.sh -# Clean up repos, everything is on the image so we don't need them. Also link cjk fonts to hardcoded steam paths. +# Clean up repos, everything is on the image so we don't need them. RUN rm -f /etc/yum.repos.d/terra.repo RUN rm -f /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo RUN rm -f /etc/yum.repos.d/vscode.repo