Update kernelshark to v2.3.1

This allow kernelshark to work with Qt6.

Also build with NotoSans font instead of FreeSans. That allow to
remove the gnu-free-sans-fonts dependency.

Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
This commit is contained in:
Jerome Marchand 2024-06-11 19:31:05 +02:00
parent a584e9b66c
commit df7daf9468
3 changed files with 17 additions and 10 deletions

1
.gitignore vendored
View File

@ -5,3 +5,4 @@
/kernel-shark-kernelshark-v2.1.1.tar.gz
/kernel-shark-kernelshark-v2.2.0.tar.gz
/kernel-shark-kernelshark-v2.3.0.tar.gz
/kernel-shark-kernelshark-v2.3.1.tar.gz

View File

@ -1,6 +1,6 @@
Name: kernelshark
Version: 2.3.0
Release: 4%{?dist}
Version: 2.3.1
Release: 1%{?dist}
Epoch: 1
# As of 1.1, only kernelshark.cpp, kshark-record.cpp and examples are GPL-2.0. The rest of kernel-shark is LGPL-2.1.
@ -38,12 +38,13 @@ BuildRequires: xmlto
BuildRequires: make
BuildRequires: chrpath
BuildRequires: freeglut-devel
BuildRequires: gnu-free-sans-fonts
BuildRequires: font(notosans)
BuildRequires: fontconfig
BuildRequires: docbook-style-xsl
BuildRequires: texlive-epstopdf
BuildRequires: ghostscript
Requires: polkit
Requires: gnu-free-sans-fonts
Requires: font(notosans)
%description
@ -57,9 +58,11 @@ view of its data.
%build
cd build
tt_font=`fc-list NotoSans:style=Regular | cut -d':' -f 1 -z`
# To fix error: for_each is not a member of std
sed -i '/iostream/a #include <algorithm>' ../src/plugins/LatencyPlot.cpp
cmake .. -DCMAKE_BUILD_TYPE=Package -D_INSTALL_PREFIX=%{_prefix} -D_LIBDIR=%{_libdir} -DCMAKE_C_FLAGS_PACKAGE="%{optflags}" -DCMAKE_EXE_LINKER_FLAGS="%{build_ldflags}" -D_DOXYGEN_DOC=1
cmake .. -DCMAKE_BUILD_TYPE=Package -D_INSTALL_PREFIX=%{_prefix} -D_LIBDIR=%{_libdir} -DCMAKE_C_FLAGS_PACKAGE="%{optflags}" -DCMAKE_EXE_LINKER_FLAGS="%{build_ldflags}" -D_DOXYGEN_DOC=1 -DTT_FONT_FILE=${tt_font}
make V=1 all doc
%install
@ -88,15 +91,18 @@ chrpath --delete %{buildroot}/%{_bindir}/kshark-record
%{_datadir}/icons/kernelshark/*
%{_datadir}/polkit-1/actions/org.freedesktop.kshark-record.policy
%{_metainfodir}/%{name}.appdata.xml
%{_libdir}/libkshark-gui.so.2.3.0
%{_libdir}/libkshark-plot.so.2.3.0
%{_libdir}/libkshark-gui.so.*
%{_libdir}/libkshark-plot.so.*
%{_libdir}/libkshark.so
%{_libdir}/libkshark.so.2
%{_libdir}/libkshark.so.2.3.0
%{_libdir}/libkshark.so.*
%{_libdir}/pkgconfig/libkshark.pc
%{_includedir}/%{name}
%changelog
* Tue Jun 11 2024 Jerome Marchand <jmarchan@redhat.com> - 1:2.3.1-1
- Update to 2.3.1
- Build with NotoSans font and remove gnu-free-sans-fonts dependency
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.3.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (kernel-shark-kernelshark-v2.3.0.tar.gz) = b4070ab8eeb21ff1ba49922f34452bde116d969a11ab893afa6085c567af6fbc7beaca9fd8d6e458492a1fe9d41182b751c59864a1e990ceaaa99538af633c5d
SHA512 (kernel-shark-kernelshark-v2.3.1.tar.gz) = ba5e7ebc713d296bef211174869445ccb3dffb8a96d0634776bd28c183487225e7c8082c8be5957795973833d6ac67851fb46f75cf68aae66eb3e5e06c081f5f