From 7ec185e98e62d7bf930530de95f79292e822be62 Mon Sep 17 00:00:00 2001
From: tengel <tengel@xyzzy.ee>
Date: Wed, 20 Mar 2024 08:41:22 -0500
Subject: [PATCH] replace with upstream patch
 https://lkml.org/lkml/2015/2/6/369

---
 trace-cmd/Makefile-2.5.2-hooks.patch | 28 +++++++++++++++++-----------
 trace-cmd/PKGBUILD                   | 11 +++++++----
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/trace-cmd/Makefile-2.5.2-hooks.patch b/trace-cmd/Makefile-2.5.2-hooks.patch
index 6665092..58beade 100644
--- a/trace-cmd/Makefile-2.5.2-hooks.patch
+++ b/trace-cmd/Makefile-2.5.2-hooks.patch
@@ -1,14 +1,20 @@
---- Makefile.orig	2015-02-05 08:53:22.000000000 -0600
-+++ Makefile	2015-02-06 08:04:14.357939500 -0600
-@@ -309,8 +309,9 @@
+--- a/Makefile
++++ b/Makefile
+@@ -308,7 +308,7 @@ TRACE_GUI_OBJS = trace-filter.o trace-compat.o trace-filter-hash.o trace-dialog.
+ 		trace-xml.o
  TRACE_CMD_OBJS = trace-cmd.o trace-record.o trace-read.o trace-split.o trace-listen.o \
  	 trace-stack.o trace-hist.o trace-mem.o trace-snapshot.o trace-stat.o \
- 	 trace-hash.o trace-profile.o trace-stream.o trace-hooks.o
--TRACE_VIEW_OBJS = trace-view.o trace-view-store.o
--TRACE_GRAPH_OBJS = trace-graph.o trace-plot.o trace-plot-cpu.o trace-plot-task.o
-+TRACE_VIEW_OBJS = trace-view.o trace-view-store.o trace-hooks.o
-+TRACE_GRAPH_OBJS = trace-graph.o trace-plot.o trace-plot-cpu.o \
-+	trace-plot-task.o trace-hooks.o
+-	 trace-hash.o trace-profile.o trace-stream.o trace-hooks.o
++	 trace-hash.o trace-profile.o trace-stream.o
+ TRACE_VIEW_OBJS = trace-view.o trace-view-store.o
+ TRACE_GRAPH_OBJS = trace-graph.o trace-plot.o trace-plot-cpu.o trace-plot-task.o
  TRACE_VIEW_MAIN_OBJS = trace-view-main.o $(TRACE_VIEW_OBJS) $(TRACE_GUI_OBJS)
- TRACE_GRAPH_MAIN_OBJS = trace-graph-main.o $(TRACE_GRAPH_OBJS) $(TRACE_GUI_OBJS)
- KERNEL_SHARK_OBJS = $(TRACE_VIEW_OBJS) $(TRACE_GRAPH_OBJS) $(TRACE_GUI_OBJS) \
+@@ -320,7 +320,7 @@ PEVENT_LIB_OBJS = event-parse.o trace-seq.o parse-filter.o parse-utils.o
+ TCMD_LIB_OBJS = $(PEVENT_LIB_OBJS) trace-util.o trace-input.o trace-ftrace.o \
+ 			trace-output.o trace-record.o trace-recorder.o \
+ 			trace-restore.o trace-usage.o trace-blk-hack.o \
+-			kbuffer-parse.o event-plugin.o
++			kbuffer-parse.o event-plugin.o trace-hooks.o
+ 
+ PLUGIN_OBJS =
+ PLUGIN_OBJS += plugin_jbd2.o
diff --git a/trace-cmd/PKGBUILD b/trace-cmd/PKGBUILD
index ed78fab..8792e07 100644
--- a/trace-cmd/PKGBUILD
+++ b/trace-cmd/PKGBUILD
@@ -1,8 +1,8 @@
 # Current Maintainer: Troy Engel <troyengel+arch@gmail.com>
 
 pkgname=trace-cmd
-pkgver=2.5.1
-pkgrel=3
+pkgver=2.5.2
+pkgrel=2
 pkgdesc="user-space front-end command-line tool for Ftrace, inclduing the GUI interface application kernelshark as well as trace-graph and trace-view."
 arch=('i686' 'x86_64')
 url="http://git.kernel.org/?p=linux/kernel/git/rostedt/trace-cmd.git"
@@ -11,12 +11,15 @@ depends=('python2' 'gtk2')
 makedepends=('pygtk' 'swig' 'docbook-xsl' 'asciidoc')
 provides=('trace-cmd')
 conflicts=('trace-cmd-git')
-source=("http://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git/snapshot/trace-cmd-v${pkgver}.tar.gz")
-sha256sums=("2cfb4470d20c05bc58431294464da3b7a88d3011f35a847dd25c40052eb2893a")
+source=("http://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git/snapshot/trace-cmd-v${pkgver}.tar.gz"
+        "Makefile-2.5.2-hooks.patch")
+sha256sums=('24eedc143bb9716fecac9479d7a2559cc6a35856901b73f94bd7ec3b49a03533'
+            '6bbfecf43d9464abc3f3976959f28924f11aca2d51855597b4c881e2f5744402')
 
 build() {
   cd "${srcdir}/${pkgname}-v${pkgver}"
   
+  patch -p1 < "${srcdir}/Makefile-2.5.2-hooks.patch"
   make PYTHON_VERS=python2 all gui doc
 }