Attachment 22325 Details for Bug 60774 – Патч на использование системных libturbojpeg и libheif при сборке (только на spec)

[patch] Патч на использование системных libturbojpeg и libheif при сборке (только на spec)

libturbojpeg-libheif.patch (text/plain), 1.13 KB, created by k0tran@altlinux.org on 2026-10-01 15:51:01 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: k0tran@altlinux.org

Created: 2026-10-01 15:51:01 MSK

Size: 1.13 KB

patch

obsolete

>diff --git a/cosmic-viewer.spec b/cosmic-viewer.spec
>index 5ef91e74..16d0fd89 100644
>--- a/cosmic-viewer.spec
>+++ b/cosmic-viewer.spec
>@@ -29,8 +29,7 @@ ExcludeArch: %ix86 armh
> 
> BuildRequires(pre): rpm-build-rust
> BuildRequires: just
>-# for turbojpeg
>-BuildRequires: cmake gcc-c++ nasm
>+BuildRequires: pkgconfig(libturbojpeg)
> BuildRequires: pkgconfig(xkbcommon)
> BuildRequires: pkgconfig(libheif)
> BuildRequires: pkgconfig(zlib)
>@@ -45,10 +44,13 @@ BuildRequires: /usr/bin/appstreamcli /usr/bin/desktop-file-validate
> [ ! -d .cargo ] && mkdir .cargo
> cargo vendor | sed 's/^directory = ".*"/directory = "vendor"/g' > .cargo/config.toml
> tar -cf %_sourcedir/%name-%version%beta-cargo.tar .cargo/ vendor/}
>+# Disable feature that enforces vendored libheif use:
>+sed -i '/"embedded-libheif",/d' Cargo.toml
> 
> %build
> export VERGEN_GIT_SHA=%version
> export VERGEN_GIT_COMMIT_DATE=%(date --iso-8601)
>+export TURBOJPEG_SOURCE=pkg-config
> %rust_build
> 
> %install
>@@ -59,6 +61,7 @@ just rootdir=%buildroot install
> %check
> export VERGEN_GIT_SHA=%version
> export VERGEN_GIT_COMMIT_DATE=%(date --iso-8601)
>+export TURBOJPEG_SOURCE=pkg-config
> %rust_test
> 
> %files

Actions: View | Diff

Attachments on bug 60774: 22325