dev-util/kernelshark: Bump to 1.2

* Fix build with gcc-10
* Fix building against >dev-util/trace-cmd-2.8.3

Closes: https://bugs.gentoo.org/738828
Closes: https://bugs.gentoo.org/726402
Closes: https://bugs.gentoo.org/726686

Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
Signed-off-by: David Seifert <soap@gentoo.org>

4 files changed, 105 insertions, 0 deletions

diff --git a/dev-util/kernelshark/Manifest b/dev-util/kernelshark/Manifest
index dcdebcda1201..7477b72b297f 100644
--- a/dev-util/kernelshark/Manifest
+++ b/dev-util/kernelshark/Manifest
@@ -1 +1,2 @@
 DIST kernelshark-1.0.tar.gz 4238163 BLAKE2B edae4bcaf646a8c430e64205cd5d137d8df7eb839075b4bb5da459852e1bb887eaa98de51afd1884cfd27833d3513fc26995fba6964220eb8b95a317d3e4e057 SHA512 ff9f0846ba7105813742bb56887870eff8af4f525864ab75d37dcb2dd6c2222fbd500fd08140d605c3f0021d88991c114e0ffeb7da9ada979bdd78defaa1c266
+DIST kernelshark-1.2.tar.gz 4298175 BLAKE2B 2ebe70c2b7c0691b65b0251027f1c558fc2fc5ef9bf61512d3ddd554fbb6ec349e36fca4dd0060c6b7db49eca0ec81a2f1296d635459b91883e54e77146ea3ae SHA512 059ac0ced71fa00de34c30ece433430f1e2fc36acb1b3a3f15cb84ce74d7a4f115e4ee8fbf9a256d5a731050aee02823a90a024dca4b4f6a17061652b871b935
diff --git a/dev-util/kernelshark/files/kernelshark-1.2-build.patch b/dev-util/kernelshark/files/kernelshark-1.2-build.patch
new file mode 100644
index 000000000000..c7fcd0d8d33f
--- /dev/null
+++ b/dev-util/kernelshark/files/kernelshark-1.2-build.patch
@@ -0,0 +1,39 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -67,11 +67,11 @@ set(KS_LOGO_LABEL  KS_logo_horizontal.svg)
+ 
+ set(CMAKE_INSTALL_RPATH "${_LIBDIR}/${KS_APP_NAME}/")
+ 
+-if (CMAKE_BUILD_TYPE MATCHES Package)
++if (NOT CMAKE_BUILD_TYPE MATCHES Package)
+ 
+     set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+ 
+-else (CMAKE_BUILD_TYPE MATCHES Package)
++else (CMAKE_BUILD_TYPE MATCHES Gentoo)
+ 
+     set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+ 
+--- a/build/FindTraceCmd.cmake
++++ b/build/FindTraceCmd.cmake
+@@ -38,17 +38,17 @@ find_path(TRACEFS_INCLUDE_DIR   NAMES  tracefs/tracefs.h
+                                        ${CMAKE_SOURCE_DIR}/../include/
+                                 NO_DEFAULT_PATH)
+ 
+-find_library(TRACECMD_LIBRARY   NAMES  trace-cmd/libtracecmd.a
++find_library(TRACECMD_LIBRARY   NAMES  trace-cmd/libtracecmd.so
+                                 PATHS  $ENV{TRACE_CMD}/lib/
+                                        ${CMAKE_SOURCE_DIR}/../lib/
+                                 NO_DEFAULT_PATH)
+ 
+-find_library(TRACEFS_LIBRARY    NAMES  tracefs/libtracefs.a
++find_library(TRACEFS_LIBRARY    NAMES  tracefs/libtracefs.so
+                                 PATHS  $ENV{TRACE_CMD}/lib/
+                                        ${CMAKE_SOURCE_DIR}/../lib/
+                                 NO_DEFAULT_PATH)
+ 
+-find_library(TRACEEVENT_LIBRARY NAMES  traceevent/libtraceevent.a
++find_library(TRACEEVENT_LIBRARY NAMES  traceevent/libtraceevent.so
+                                 PATHS  $ENV{TRACE_CMD}/lib/
+                                        ${CMAKE_SOURCE_DIR}/../lib/
+                                 NO_DEFAULT_PATH)
diff --git a/dev-util/kernelshark/files/kernelshark-1.2-desktop-version.patch b/dev-util/kernelshark/files/kernelshark-1.2-desktop-version.patch
new file mode 100644
index 000000000000..5f469b199547
--- /dev/null
+++ b/dev-util/kernelshark/files/kernelshark-1.2-desktop-version.patch
@@ -0,0 +1,9 @@
+--- a/build/ks.desktop.cmake
++++ b/build/ks.desktop.cmake
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Version=@KS_VERSION_STRING@
++Version=1.2
+ Type=Application
+ Name=Kernel Shark
+ GenericName=Kernel Shark
diff --git a/dev-util/kernelshark/kernelshark-1.2.ebuild b/dev-util/kernelshark/kernelshark-1.2.ebuild
new file mode 100644
index 000000000000..f3406107a78a
--- /dev/null
+++ b/dev-util/kernelshark/kernelshark-1.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic cmake
+
+DESCRIPTION="Graphical reader for trace-cmd output"
+HOMEPAGE="https://kernelshark.org/"
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	EGIT_REPO_URI="https://github.com/rostedt/trace-cmd.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}/kernel-shark"
+
+else
+	MY_P="${PN}-v${PV}"
+	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-${MY_P}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/trace-cmd-${MY_P}/kernel-shark"
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="custom-optimization doc"
+
+DEPEND="
+	>=dev-util/trace-cmd-2.8.3:=
+	dev-libs/json-c:=
+	dev-qt/qtcore:5=
+	dev-qt/qtnetwork:5=
+	dev-qt/qtwidgets:5=
+	>=media-libs/freeglut-3.0.0:=
+	x11-libs/libXmu:=
+	x11-libs/libXi:="
+RDEPEND="${DEPEND}"
+BDEPEND="
+	doc? (
+		media-gfx/graphviz
+		app-doc/doxygen
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-desktop-version.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-D_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DTRACECMD_INCLUDE_DIR="${EPREFIX}/usr/include/trace-cmd"
+		-D_DOXYGEN_DOC=$(usex doc)
+	)
+	use custom-optimization || replace-flags -O? -O3
+	cmake_src_configure
+}