summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO15
-rw-r--r--0001-include-sys-sysmacros.h-for-major-minor-makedev.patch27
-rw-r--r--PKGBUILD26
3 files changed, 13 insertions, 55 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ad798fd0a9c..7070880deb3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,17 @@
pkgbase = bootchart2
pkgdesc = Boot Process Performance Visualization
- pkgver = 0.14.8
- pkgrel = 3
+ pkgver = 0.14.9
+ pkgrel = 1
url = https://github.com/xrmx/bootchart
arch = i686
arch = x86_64
license = GPL
- depends = python2
+ depends = python
depends = busybox
- depends = pygtk
- provides = bootchart2
- conflicts = bootchart2-git
conflicts = bootchart
backup = etc/bootchartd2.conf
- source = https://github.com/xrmx/bootchart/archive/0.14.8.tar.gz
- source = 0001-include-sys-sysmacros.h-for-major-minor-makedev.patch
- sha512sums = 58303db91d22ccc44c0dc765e7a6672fb277840555fd87ce64b8987cba85250cfe3db17f3ec7e0e1e726ad59166a5d3d01a7a262c07b5690c595877b46c66bd0
- sha512sums = 3fd04183634f4406aab6fff5e77aaeb339f0705aeba2d193ad55fa297dbd9739e872f26c6feb225ff0b2cf953370e08bc82fa3bae69fac3832feaa4671cc406c
+ source = https://github.com/xrmx/bootchart/archive/0.14.9.tar.gz
+ sha512sums = 7ee1220b0add027fc39f710cc01119d7aaa22fe11736497b089c26955216cef10552216ed29ca55bf08aa848f92bb11d74deeb3aa69769dfecf3a55aa988e58b
pkgname = bootchart2
diff --git a/0001-include-sys-sysmacros.h-for-major-minor-makedev.patch b/0001-include-sys-sysmacros.h-for-major-minor-makedev.patch
deleted file mode 100644
index 3b81bad7f1b..00000000000
--- a/0001-include-sys-sysmacros.h-for-major-minor-makedev.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From add58c3b57064afd6f7d2fd5f09006d28a3e770e Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 21 Apr 2016 00:19:32 -0400
-Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev
-
-These funcs are defined in the sys/sysmacros.h header, not sys/types.h.
-Linux C libraries are updating to drop the implicit include, so we need
-to include it explicitly.
----
- collector/collector.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/collector/collector.c b/collector/collector.c
-index cfdcb26..2f3ce6b 100644
---- a/collector/collector.c
-+++ b/collector/collector.c
-@@ -33,6 +33,7 @@
- #include "common.h"
-
- #include <sys/mount.h>
-+#include <sys/sysmacros.h>
- #include <linux/fs.h>
- #include <linux/genetlink.h>
- #include <linux/taskstats.h>
---
-2.23.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 13ed5afe299..b9088d68955 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,27 +3,18 @@
# Contributor: Janne Heß <jannehess@gmail.com>
pkgname=bootchart2
-pkgver=0.14.8
-pkgrel=3
+pkgver=0.14.9
+pkgrel=1
pkgdesc='Boot Process Performance Visualization'
url='https://github.com/xrmx/bootchart'
license=('GPL')
-provides=('bootchart2')
-conflicts=('bootchart2-git' 'bootchart')
-depends=('python2' 'busybox' 'pygtk')
+conflicts=('bootchart')
+depends=('python' 'busybox')
backup=('etc/bootchartd2.conf')
-source=("https://github.com/xrmx/${pkgname%2}/archive/${pkgver}.tar.gz"
- "0001-include-sys-sysmacros.h-for-major-minor-makedev.patch")
-sha512sums=('58303db91d22ccc44c0dc765e7a6672fb277840555fd87ce64b8987cba85250cfe3db17f3ec7e0e1e726ad59166a5d3d01a7a262c07b5690c595877b46c66bd0'
- '3fd04183634f4406aab6fff5e77aaeb339f0705aeba2d193ad55fa297dbd9739e872f26c6feb225ff0b2cf953370e08bc82fa3bae69fac3832feaa4671cc406c')
+source=("https://github.com/xrmx/${pkgname%2}/archive/${pkgver}.tar.gz")
+sha512sums=('7ee1220b0add027fc39f710cc01119d7aaa22fe11736497b089c26955216cef10552216ed29ca55bf08aa848f92bb11d74deeb3aa69769dfecf3a55aa988e58b')
arch=('i686' 'x86_64')
-prepare() {
- cd "${srcdir}/${pkgname%2}-${pkgver}"
-
- patch -Np1 < ../0001-include-sys-sysmacros.h-for-major-minor-makedev.patch
-}
-
build() {
cd "${srcdir}/${pkgname%2}-${pkgver}"
@@ -32,15 +23,14 @@ build() {
-e 's:bootchartd $(DESTDIR)$(EARLY_PREFIX)/usr/:bootchartd $(DESTDIR)$(EARLY_PREFIX)/:g' \
-e 's:SYSTEMD_UNIT_DIR = .*:SYSTEMD_UNIT_DIR = /usr/lib/systemd/system:g' \
-e 's:/usr/share/docs:/usr/share/doc:g' Makefile
- sed -i -e 's:#!/usr/bin/python:#!/usr/bin/python2:g' pybootchartgui.py
sed -i -e 's:sbin:bin:g' *.service.in
- make PROGRAM_SUFFIX=2 PYTHON=python2 PY_LIBDIR=/usr/lib/python2.7 EARLY_PREFIX=/usr all
+ make PROGRAM_SUFFIX=2 EARLY_PREFIX=/usr all
}
package() {
cd "${srcdir}/${pkgname%2}-${pkgver}"
- make PROGRAM_SUFFIX=2 DESTDIR="${pkgdir}" PYTHON=python2 PY_LIBDIR=/usr/lib/python2.7 EARLY_PREFIX=/usr install
+ make PROGRAM_SUFFIX=2 DESTDIR="${pkgdir}" EARLY_PREFIX=/usr install
}