commit: 8e4742a4aaf16615a8cb633c4b027b80fb1da81e Author: Christian Schmidt <schmidt <AT> digadd <DOT> de> AuthorDate: Sat Mar 19 19:47:34 2022 +0000 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> CommitDate: Thu Jun 16 16:57:44 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e4742a4
dev-util/kernelshark: bump to 2.1.0 Signed-off-by: Christian Schmidt <gentoo <AT> digadd.de> Bug: https://bugs.gentoo.org/824982 Closes: https://github.com/gentoo/gentoo/pull/24667 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> dev-util/kernelshark/Manifest | 1 + .../kernelshark-2.1.0-fix-desktop-version.patch | 11 ++++ .../files/kernelshark-2.1.0-no-ldconfig.patch | 16 ++++++ dev-util/kernelshark/kernelshark-2.1.0.ebuild | 60 ++++++++++++++++++++++ 4 files changed, 88 insertions(+) diff --git a/dev-util/kernelshark/Manifest b/dev-util/kernelshark/Manifest index 9bc0767aebc1..86ed6e3b7693 100644 --- a/dev-util/kernelshark/Manifest +++ b/dev-util/kernelshark/Manifest @@ -1 +1,2 @@ DIST kernelshark-1.2.tar.gz 4298175 BLAKE2B 2ebe70c2b7c0691b65b0251027f1c558fc2fc5ef9bf61512d3ddd554fbb6ec349e36fca4dd0060c6b7db49eca0ec81a2f1296d635459b91883e54e77146ea3ae SHA512 059ac0ced71fa00de34c30ece433430f1e2fc36acb1b3a3f15cb84ce74d7a4f115e4ee8fbf9a256d5a731050aee02823a90a024dca4b4f6a17061652b871b935 +DIST kernelshark-2.1.0.tar.gz 4098666 BLAKE2B 2798626c598ec2464f018b5808a6da460a552920c373dbf1eaba5d243e2f150da2a9a25668f8cb27e2ddc7dc286d4d5215d942893456de9339a63bde0e4d7381 SHA512 4b463cf06a919d67fa38ada8221e4702e2fac725d917e7abd12e1d69880ba964881ac549caf90bd7cb22edea4f28d7937494a05f75218f16fe2edcdff7161c3e diff --git a/dev-util/kernelshark/files/kernelshark-2.1.0-fix-desktop-version.patch b/dev-util/kernelshark/files/kernelshark-2.1.0-fix-desktop-version.patch new file mode 100644 index 000000000000..a6a93be0ea0d --- /dev/null +++ b/dev-util/kernelshark/files/kernelshark-2.1.0-fix-desktop-version.patch @@ -0,0 +1,11 @@ +diff --git a/build/ks.desktop.cmake b/build/ks.desktop.cmake +index 2b02c0d..9765e61 100644 +--- a/build/ks.desktop.cmake ++++ b/build/ks.desktop.cmake +@@ -1,5 +1,5 @@ + [Desktop Entry] +-Version=@KS_VERSION_STRING@ ++Version=1.0 + Type=Application + Name=Kernel Shark + GenericName=Kernel Shark diff --git a/dev-util/kernelshark/files/kernelshark-2.1.0-no-ldconfig.patch b/dev-util/kernelshark/files/kernelshark-2.1.0-no-ldconfig.patch new file mode 100644 index 000000000000..7a7ea5bd435e --- /dev/null +++ b/dev-util/kernelshark/files/kernelshark-2.1.0-no-ldconfig.patch @@ -0,0 +1,16 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9e0b4ae..732c14a 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -46,11 +46,6 @@ install(FILES "${KS_DIR}/libkshark.pc" + DESTINATION ${PKG_CONGIG_DIR} + COMPONENT libkshark-devel) + +-install(CODE "message(\"-- Executing: ldconfig ${_LIBDIR}\") +- execute_process(COMMAND bash \"-c\" \"ldconfig ${_INSTALL_PREFIX}\" +- ECHO_ERROR_VARIABLE)" +- COMPONENT libkshark-devel) +- + if (OPENGL_FOUND) + + message(STATUS "libkshark-plot") diff --git a/dev-util/kernelshark/kernelshark-2.1.0.ebuild b/dev-util/kernelshark/kernelshark-2.1.0.ebuild new file mode 100644 index 000000000000..ddf6b441a088 --- /dev/null +++ b/dev-util/kernelshark/kernelshark-2.1.0.ebuild @@ -0,0 +1,60 @@ +# Copyright 2019-2022 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://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/"; + inherit git-r3 + S="${WORKDIR}/${P}/kernel-shark" + +else + MY_P="kernel-shark-${PN}-v${PV}" + SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/snapshot/${MY_P}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${MY_P}" +fi + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +IUSE="custom-optimization doc" + +DEPEND=" + >=dev-util/trace-cmd-3.0.2 + 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:= + >=dev-libs/libtracefs-1.3 + >=dev-libs/libtraceevent-1.5 + media-fonts/freefont +" +RDEPEND="${DEPEND}" +BDEPEND=" + doc? ( + media-gfx/graphviz + app-doc/doxygen + )" + +PATCHES=( + "${FILESDIR}"/${P}-no-ldconfig.patch + "${FILESDIR}"/${P}-fix-desktop-version.patch +) + +src_configure() { + local mycmakeargs=( + -D_INSTALL_PREFIX="${EPREFIX}/usr" + -D_LIBDIR="${EPREFIX}/usr/$(get_libdir)" + -D_DOXYGEN_DOC=$(usex doc) + ) + use custom-optimization || replace-flags -O? -O3 + cmake_src_configure +}
