summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2015-05-30 01:15:56 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2015-05-30 01:15:56 +0000
commit5067aad0edb791bbadad0893bfb6590f9ea3cf95 (patch)
treeba83cd67965ac1d8ed59ad09878aae027c5eae2a /sys-fs/udisks/files
parentVersion bump on 5.5 series. Only kept for upgrades (diff)
downloadgentoo-2-5067aad0edb791bbadad0893bfb6590f9ea3cf95.tar.gz
gentoo-2-5067aad0edb791bbadad0893bfb6590f9ea3cf95.tar.bz2
gentoo-2-5067aad0edb791bbadad0893bfb6590f9ea3cf95.zip
Fix udisks-1.0.5-r1 compile with glibc-2.20 (bug #550758, thanks to Leonid Kopylov). Clean up old.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)
Diffstat (limited to 'sys-fs/udisks/files')
-rw-r--r--sys-fs/udisks/files/udisks-1.0.5-stat-includes.patch25
-rw-r--r--sys-fs/udisks/files/udisks-2.1.0-W_define.patch15
2 files changed, 25 insertions, 15 deletions
diff --git a/sys-fs/udisks/files/udisks-1.0.5-stat-includes.patch b/sys-fs/udisks/files/udisks-1.0.5-stat-includes.patch
new file mode 100644
index 000000000000..85ef5208049d
--- /dev/null
+++ b/sys-fs/udisks/files/udisks-1.0.5-stat-includes.patch
@@ -0,0 +1,25 @@
+From 0aa652a7b257f98f9e8e7dc7b0ddc9bc62377d09 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Fri, 29 May 2015 21:09:39 -0400
+Subject: [PATCH] Bug 90778 - fix build with newer glibc versions
+
+https://bugs.freedesktop.org/show_bug.cgi?id=90778
+---
+ src/helpers/job-drive-detach.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/helpers/job-drive-detach.c b/src/helpers/job-drive-detach.c
+index eeafcab..d122a1f 100644
+--- a/src/helpers/job-drive-detach.c
++++ b/src/helpers/job-drive-detach.c
+@@ -18,6 +18,7 @@
+ *
+ */
+
++#include <sys/stat.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <errno.h>
+--
+2.4.2
+
diff --git a/sys-fs/udisks/files/udisks-2.1.0-W_define.patch b/sys-fs/udisks/files/udisks-2.1.0-W_define.patch
deleted file mode 100644
index fd82ba170b80..000000000000
--- a/sys-fs/udisks/files/udisks-2.1.0-W_define.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/462784
-
-udiskslinuxfilesystem.c:1294:11: error: implicit declaration of function 'WIFEXITED' [-Werror=implicit-function-declaration]
-udiskslinuxfilesystem.c:1294:11: error: implicit declaration of function 'WEXITSTATUS' [-Werror=implicit-function-declaration]
-
---- src/udiskslinuxfilesystem.c
-+++ src/udiskslinuxfilesystem.c
-@@ -22,6 +22,7 @@
- #include <glib/gi18n-lib.h>
-
- #include <sys/types.h>
-+#include <sys/wait.h>
- #include <pwd.h>
- #include <grp.h>
- #include <string.h>