Rebuild to export GSK_RENDERER=cairo in CentOS only for Vulkan

Resolves: RHEL-66126 spec file lacks some xinit conditional judgments
This commit is contained in:
Takao Fujiwara 2024-11-14 09:56:35 +09:00
parent c1c4be9007
commit b8a898bb3a

View File

@ -62,7 +62,7 @@
Name: ibus
Version: 1.5.31
# https://github.com/fedora-infra/rpmautospec/issues/101
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Intelligent Input Bus for Linux OS
License: LGPL-2.1-or-later
URL: https://github.com/ibus/%name/wiki
@ -436,6 +436,26 @@ HAS_PREFIX=$(grep prefix $RPM_BUILD_ROOT%{_bindir}/ibus-setup | wc -l)
[ x"$HAS_PREFIX" == x1 ] && \
sed -i -e '/prefix/d' $RPM_BUILD_ROOT%{_bindir}/ibus-setup
# Export GSK_RENDERER=cairo in CentOS only as a workaround.
# Not sure but seems mesa-vulkan-drivers is not configured correctly in
# CentOS and GTK is failed in CentOS CI:
# ibus-compose:10228: Gdk-WARNING **:
# Vulkan: ../src/imagination/vulkan/pvr_device.c:854:
# Failed to enumerate drm devices
# (errno 2: Δεν υπάρχει τέτοιο αρχείο ή κατάλογος)
# (VK_ERROR_INITIALIZATION_FAILED)
# https://www.linux.org.ru/forum/desktop/17554505
%if 0%{?rhel} > 9
if [ -f /etc/centos-release ] ; then
sed -i.bak -e '/^TESTING_RUNNER=/a\
export GSK_RENDERER=cairo' \
$RPM_BUILD_ROOT%{_libexecdir}/ibus-desktop-testing-autostart
diff $RPM_BUILD_ROOT%{_libexecdir}/ibus-desktop-testing-autostart* || :
ls -l $RPM_BUILD_ROOT%{_libexecdir}/ibus-desktop-testing-autostart*
rm $RPM_BUILD_ROOT%{_libexecdir}/ibus-desktop-testing-autostart.bak
fi
%endif
desktop-file-install --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applications/*
@ -617,6 +637,9 @@ dconf update || :
%{_datadir}/installed-tests/ibus
%changelog
* Thu Nov 14 2024 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.31-3
- Rebuild to export GSK_RENDERER=cairo in CentOS but not RHEL for Vulkan
* Wed Nov 13 2024 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.31-2
- Move gnome-calendar & gnome-epub-thumbnailer to Fedora specific in CI