From df7daf946868ae59d65ce2edcb5d5b11371da017 Mon Sep 17 00:00:00 2001
From: Jerome Marchand <jmarchan@redhat.com>
Date: Tue, 11 Jun 2024 19:31:05 +0200
Subject: [PATCH] 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>
---
 .gitignore       |  1 +
 kernelshark.spec | 24 +++++++++++++++---------
 sources          |  2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5cb4172..ac00fb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/kernelshark.spec b/kernelshark.spec
index c5b5e52..c6e747f 100644
--- a/kernelshark.spec
+++ b/kernelshark.spec
@@ -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
 
diff --git a/sources b/sources
index dbf4da5..1c14abd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kernel-shark-kernelshark-v2.3.0.tar.gz) = b4070ab8eeb21ff1ba49922f34452bde116d969a11ab893afa6085c567af6fbc7beaca9fd8d6e458492a1fe9d41182b751c59864a1e990ceaaa99538af633c5d
+SHA512 (kernel-shark-kernelshark-v2.3.1.tar.gz) = ba5e7ebc713d296bef211174869445ccb3dffb8a96d0634776bd28c183487225e7c8082c8be5957795973833d6ac67851fb46f75cf68aae66eb3e5e06c081f5f