[arch-commits] Commit in xfce4-diskperf-plugin/trunk (PKGBUILD glibc-2.25.patch)

Evangelos Foutras foutrelis at archlinux.org
Sat Nov 10 06:30:24 UTC 2018


    Date: Saturday, November 10, 2018 @ 06:30:24
  Author: foutrelis
Revision: 338926

Fix build with recent glibc

Added:
  xfce4-diskperf-plugin/trunk/glibc-2.25.patch
Modified:
  xfce4-diskperf-plugin/trunk/PKGBUILD

------------------+
 PKGBUILD         |   17 ++++++++++++++---
 glibc-2.25.patch |   40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-10 06:10:42 UTC (rev 338925)
+++ PKGBUILD	2018-11-10 06:30:24 UTC (rev 338926)
@@ -10,10 +10,21 @@
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin"
 groups=('xfce4-goodies')
 depends=('xfce4-panel')
-makedepends=('intltool')
-source=(https://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('212ddc742be3eecb6ad5554e1b1df03d5685cb71f48a558d5f895de37c57e4fa')
+makedepends=('intltool' 'xfce4-dev-tools')
+source=(https://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
+        glibc-2.25.patch)
+sha256sums=('212ddc742be3eecb6ad5554e1b1df03d5685cb71f48a558d5f895de37c57e4fa'
+            'e856cf7e77edff1db6046745e9a81e5c27ae40cadbdf57b377c49687527a3c7f')
 
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # https://bugzilla.xfce.org/show_bug.cgi?id=13940
+  patch -Np1 -i ../glibc-2.25.patch
+
+  NOCONFIGURE=1 xdt-autogen
+}
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 

Added: glibc-2.25.patch
===================================================================
--- glibc-2.25.patch	                        (rev 0)
+++ glibc-2.25.patch	2018-11-10 06:30:24 UTC (rev 338926)
@@ -0,0 +1,40 @@
+From 0787a8972be2b95fac26c502a82427299e7e48c0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny at gentoo.org>
+Date: Sat, 21 Oct 2017 00:14:32 +0200
+Subject: Support <sys/sysmacros.h> include required for glibc-2.25+ (Fixes
+ #13940)
+
+---
+ configure.ac.in        | 1 +
+ panel-plugin/devperf.c | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 5458dba..fd2d3eb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -46,6 +46,7 @@ dnl **********************************
+ dnl *** Check for standard headers ***
+ dnl **********************************
+ AC_HEADER_STDC()
++AC_CHECK_HEADERS([sys/sysmacros.h])
+ AC_CHECK_LIBM
+ AC_SUBST(LIBM)
+ 
+diff --git a/panel-plugin/devperf.c b/panel-plugin/devperf.c
+index 175fd44..29bcb87 100644
+--- a/panel-plugin/devperf.c
++++ b/panel-plugin/devperf.c
+@@ -35,6 +35,9 @@
+ #include <sys/time.h>
+ /* for major() and minor() */
+ #define _BSD_SOURCE
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>
++#endif
+ #include <sys/types.h>
+ 
+ 
+-- 
+cgit v1.2.1
+


More information about the arch-commits mailing list