From 9a86a9d558d8c2c271dbe5a6a3c8b54e87ab7b0c Mon Sep 17 00:00:00 2001 From: Darcy Shen Date: Thu, 21 Nov 2024 16:48:04 +0800 Subject: [PATCH] wip --- .github/workflows/ci-xmake-fedora.yml | 2 +- xmake/packages.lua | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-xmake-fedora.yml b/.github/workflows/ci-xmake-fedora.yml index a74434b1e..e516f12a0 100644 --- a/.github/workflows/ci-xmake-fedora.yml +++ b/.github/workflows/ci-xmake-fedora.yml @@ -37,7 +37,7 @@ jobs: run: | sudo dnf update -y sudo dnf install -y git xmake unzip gcc g++ curl-devel libgit2-devel fontconfig-devel \ - qt6-qtbase-devel qt6-qtsvg-devel mimalloc-devel + qt6-qtbase-devel qt6-qtsvg-devel mimalloc-devel libpng-devel - uses: actions/checkout@v3 with: fetch-depth: 1 diff --git a/xmake/packages.lua b/xmake/packages.lua index f6dfd1e26..cc87136d0 100644 --- a/xmake/packages.lua +++ b/xmake/packages.lua @@ -106,6 +106,9 @@ function add_requires_of_mogan() elseif is_plat("linux") and using_pacman () then add_requires("pacman::libpng", {alias="libpng"}) add_requireconfs("pdfhummus.libpng", {system = true, override=true}) + elseif is_plat("linux") and linuxos.name() == "fedora" then + add_requires("pkgconfig::libpng", {alias="libpng"}) + add_requireconfs("pdfhummus.libpng", {system = true, override=true}) else add_requireconfs("pdfhummus.libpng", {version = LIBPNG_VERSION, system = false, override=true}) end