summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Weiss2019-09-26 14:58:18 +0200
committerLuca Weiss2019-09-26 14:58:18 +0200
commit2affe9e3e3760d0e086d837f5f4dc8584a49d269 (patch)
tree72368d4da254cad14c025a71bea6c1e96ff46360
parentcb20930b7d1a636f1f7895a87bfe184586e69176 (diff)
downloadaur-2affe9e3e3760d0e086d837f5f4dc8584a49d269.tar.gz
upgpkg: bootchart2 0.14.8-3
fix compilation
-rw-r--r--.SRCINFO6
-rw-r--r--0001-include-sys-sysmacros.h-for-major-minor-makedev.patch27
-rw-r--r--PKGBUILD14
3 files changed, 41 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cee04979625..ad798fd0a9c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Mon Jul 25 17:45:27 UTC 2016
pkgbase = bootchart2
pkgdesc = Boot Process Performance Visualization
pkgver = 0.14.8
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/xrmx/bootchart
arch = i686
arch = x86_64
@@ -16,7 +14,9 @@ pkgbase = bootchart2
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
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
new file mode 100644
index 00000000000..3b81bad7f1b
--- /dev/null
+++ b/0001-include-sys-sysmacros.h-for-major-minor-makedev.patch
@@ -0,0 +1,27 @@
+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 896d16cac99..13ed5afe299 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=bootchart2
pkgver=0.14.8
-pkgrel=2
+pkgrel=3
pkgdesc='Boot Process Performance Visualization'
url='https://github.com/xrmx/bootchart'
license=('GPL')
@@ -12,10 +12,18 @@ provides=('bootchart2')
conflicts=('bootchart2-git' 'bootchart')
depends=('python2' 'busybox' 'pygtk')
backup=('etc/bootchartd2.conf')
-source=("https://github.com/xrmx/${pkgname%2}/archive/${pkgver}.tar.gz")
-sha512sums=('58303db91d22ccc44c0dc765e7a6672fb277840555fd87ce64b8987cba85250cfe3db17f3ec7e0e1e726ad59166a5d3d01a7a262c07b5690c595877b46c66bd0')
+source=("https://github.com/xrmx/${pkgname%2}/archive/${pkgver}.tar.gz"
+ "0001-include-sys-sysmacros.h-for-major-minor-makedev.patch")
+sha512sums=('58303db91d22ccc44c0dc765e7a6672fb277840555fd87ce64b8987cba85250cfe3db17f3ec7e0e1e726ad59166a5d3d01a7a262c07b5690c595877b46c66bd0'
+ '3fd04183634f4406aab6fff5e77aaeb339f0705aeba2d193ad55fa297dbd9739e872f26c6feb225ff0b2cf953370e08bc82fa3bae69fac3832feaa4671cc406c')
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}"