[packages/udisks] - add missing headers to fix build breakage - rel 4

baggins baggins at pld-linux.org
Thu Mar 19 08:51:28 CET 2020


commit 91933f3cb1d0cf4c26bc1cb4c54099345034a0d8
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Mar 19 08:48:49 2020 +0100

    - add missing headers to fix build breakage
    - rel 4

 headers.patch | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 udisks.spec   |  4 +++-
 2 files changed, 71 insertions(+), 1 deletion(-)
---
diff --git a/udisks.spec b/udisks.spec
index dd32c8f..f78b6ac 100644
--- a/udisks.spec
+++ b/udisks.spec
@@ -2,7 +2,7 @@ Summary:	Disk Management Service
 Summary(pl.UTF-8):	Usługa zarządzania dyskami
 Name:		udisks
 Version:	1.0.5
-Release:	3
+Release:	4
 License:	GPL v2+
 Group:		Libraries
 Source0:	http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
@@ -10,6 +10,7 @@ Source0:	http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
 Source1:	%{name}.tmpfiles
 Patch0:		drop-pci-db.patch
 Patch1:		%{name}-ac.patch
+Patch2:		headers.patch
 URL:		http://www.freedesktop.org/wiki/Software/udisks
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -115,6 +116,7 @@ Konfiguracja usługi udisks dla avahi.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__intltoolize}
diff --git a/headers.patch b/headers.patch
new file mode 100644
index 0000000..93b3ca8
--- /dev/null
+++ b/headers.patch
@@ -0,0 +1,68 @@
+diff -ur udisks-1.0.5/src/daemon.c udisks-1.0.5-headers/src/daemon.c
+--- udisks-1.0.5/src/daemon.c	2014-03-10 09:57:48.000000000 +0100
++++ udisks-1.0.5-headers/src/daemon.c	2020-03-19 08:42:13.880014281 +0100
+@@ -48,6 +48,7 @@
+ #include <net/if_arp.h>
+ #include <fcntl.h>
+ #include <signal.h>
++#include <sys/sysmacros.h>
+ 
+ #include <glib.h>
+ #include <glib/gi18n-lib.h>
+diff -ur udisks-1.0.5/src/device.c udisks-1.0.5-headers/src/device.c
+--- udisks-1.0.5/src/device.c	2014-03-10 09:57:48.000000000 +0100
++++ udisks-1.0.5-headers/src/device.c	2020-03-19 08:41:41.483347182 +0100
+@@ -41,6 +41,7 @@
+ #include <sys/ioctl.h>
+ #include <linux/cdrom.h>
+ #include <linux/loop.h>
++#include <sys/sysmacros.h>
+ 
+ #include <glib.h>
+ #include <glib/gstdio.h>
+diff -ur udisks-1.0.5/src/helpers/job-drive-detach.c udisks-1.0.5-headers/src/helpers/job-drive-detach.c
+--- udisks-1.0.5/src/helpers/job-drive-detach.c	2014-03-10 09:57:48.000000000 +0100
++++ udisks-1.0.5-headers/src/helpers/job-drive-detach.c	2020-03-19 08:39:48.430012306 +0100
+@@ -23,6 +23,9 @@
+ #include <errno.h>
+ #include <stdlib.h>
+ #include <time.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <unistd.h>
+ 
+ #include <scsi/sg_lib.h>
+ #include <scsi/sg_cmds.h>
+diff -ur udisks-1.0.5/src/mount-monitor.c udisks-1.0.5-headers/src/mount-monitor.c
+--- udisks-1.0.5/src/mount-monitor.c	2014-03-10 09:58:42.000000000 +0100
++++ udisks-1.0.5-headers/src/mount-monitor.c	2020-03-19 08:42:04.806680837 +0100
+@@ -30,6 +30,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <mntent.h>
++#include <sys/sysmacros.h>
+ 
+ #include <glib.h>
+ #include <glib/gi18n-lib.h>
+diff -ur udisks-1.0.5/tools/udisks.c udisks-1.0.5-headers/tools/udisks.c
+--- udisks-1.0.5/tools/udisks.c	2014-03-10 09:57:48.000000000 +0100
++++ udisks-1.0.5-headers/tools/udisks.c	2020-03-19 08:43:03.220014923 +0100
+@@ -35,6 +35,7 @@
+ #include <pwd.h>
+ #include <grp.h>
+ #include <locale.h>
++#include <sys/sysmacros.h>
+ 
+ #include <glib.h>
+ #include <glib/gi18n-lib.h>
+diff -ur udisks-1.0.5/tools/umount-udisks.c udisks-1.0.5-headers/tools/umount-udisks.c
+--- udisks-1.0.5/tools/umount-udisks.c	2014-03-10 09:57:48.000000000 +0100
++++ udisks-1.0.5-headers/tools/umount-udisks.c	2020-03-19 08:43:18.110015108 +0100
+@@ -30,6 +30,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <fcntl.h>
+ #include <pwd.h>
+ #include <grp.h>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/udisks.git/commitdiff/91933f3cb1d0cf4c26bc1cb4c54099345034a0d8



More information about the pld-cvs-commit mailing list