[gentoo-commits] repo/gentoo:master commit in: sys-fs/udisks/files/, sys-fs/udisks/
commit: fdf00e407a5e6a674a07e983a8f2ce3f3b04185e
Author: Mike Frysinger gentoo org>
AuthorDate: Wed Nov 16 20:19:32 2016 +
Commit: Mike Frysinger gentoo org>
CommitDate: Wed Nov 16 20:20:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdf00e40
sys-fs/udisks: fix old SLOT=0 building w/newer glibc too #580230
sys-fs/udisks/files/udisks-1.0.5-sysmacros.patch | 72
sys-fs/udisks/udisks-1.0.5-r1.ebuild | 3 +-
2 files changed, 74 insertions(+), 1 deletion(-)
diff --git a/sys-fs/udisks/files/udisks-1.0.5-sysmacros.patch
b/sys-fs/udisks/files/udisks-1.0.5-sysmacros.patch
new file mode 100644
index ..96ce943
--- /dev/null
+++ b/sys-fs/udisks/files/udisks-1.0.5-sysmacros.patch
@@ -0,0 +1,72 @@
+https://bugs.gentoo.org/580230
+https://bugs.freedesktop.org/95028
+
+From 245093a15abe985b1746603c00084cb972fb71ae Mon Sep 17 00:00:00 2001
+From: Mike Frysinger
+Date: Tue, 19 Apr 2016 23:04:32 -0400
+Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev
+
+Linux C libraries are moving away from implicit includes of
+sys/sysmacros.h, so pull in this header directly in the files
+that use these funcs.
+
+--- a/src/daemon.c
b/src/daemon.c
+@@ -38,6 +38,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
+--- a/src/device.c
b/src/device.c
+@@ -28,6 +28,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
+--- a/src/mount-monitor.c
b/src/mount-monitor.c
+@@ -27,6 +27,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
+--- a/src/probers/part-id.c
b/src/probers/part-id.c
+@@ -23,6 +23,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
+--- a/tools/udisks.c
b/tools/udisks.c
+@@ -28,6 +28,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
+--- a/tools/umount-udisks.c
b/tools/umount-udisks.c
+@@ -28,6 +28,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
diff --git a/sys-fs/udisks/udisks-1.0.5-r1.ebuild
b/sys-fs/udisks/udisks-1.0.5-r1.ebuild
index 5273b24..5404e75 100644
--- a/sys-fs/udisks/udisks-1.0.5-r1.ebuild
+++ b/sys-fs/udisks/udisks-1.0.5-r1.ebuild
@@ -53,7 +53,8 @@ src_prepare() {
epatch \
"${FILESDIR}"/${PN}-1.0.2-ntfs-3g.patch \
"${FILESDIR}"/${PN}-1.0.4-revert-floppy.patch \
- "${FILESDIR}"/${PN}-1.0.5-stat-includes.patch
+ "${FILESDIR}"/${PN}-1.0.5-stat-includes.patch \
+ "${FILESDIR}"/${PN}-1.0.5-sysmacros.patch
sed -i -e "s:/lib/udev:$(get_udevdir):" data/80-udisks.rules || die
[gentoo-commits] repo/gentoo:master commit in: sys-fs/udisks/files/, sys-fs/udisks/
commit: 8354698243e8f0318234ebcdc7749c0cde355679
Author: Mike Frysinger gentoo org>
AuthorDate: Wed Apr 20 03:10:15 2016 +
Commit: Mike Frysinger gentoo org>
CommitDate: Wed Apr 20 03:10:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83546982
sys-fs/udisks: fix build w/newer glibc #580230
sys-fs/udisks/files/udisks-2.1.7-sysmacros.patch | 83
sys-fs/udisks/udisks-2.1.7.ebuild| 1 +
2 files changed, 84 insertions(+)
diff --git a/sys-fs/udisks/files/udisks-2.1.7-sysmacros.patch
b/sys-fs/udisks/files/udisks-2.1.7-sysmacros.patch
new file mode 100644
index 000..a353835
--- /dev/null
+++ b/sys-fs/udisks/files/udisks-2.1.7-sysmacros.patch
@@ -0,0 +1,83 @@
+https://bugs.gentoo.org/580230
+https://bugs.freedesktop.org/95028
+
+From 245093a15abe985b1746603c00084cb972fb71ae Mon Sep 17 00:00:00 2001
+From: Mike Frysinger
+Date: Tue, 19 Apr 2016 23:04:32 -0400
+Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev
+
+Linux C libraries are moving away from implicit includes of
+sys/sysmacros.h, so pull in this header directly in the files
+that use these funcs.
+---
+ src/udiskslinuxfilesystem.c | 2 +-
+ src/udiskslinuxpartition.c | 1 +
+ src/udisksmountmonitor.c| 1 +
+ src/udisksstate.c | 1 +
+ tools/umount-udisks.c | 1 +
+ 5 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/udiskslinuxfilesystem.c b/src/udiskslinuxfilesystem.c
+index 68f7c4d..67132ab 100644
+--- a/src/udiskslinuxfilesystem.c
b/src/udiskslinuxfilesystem.c
+@@ -29,7 +29,7 @@
+ #include
+ #include
+ #include
+-#include
++#include
+ #ifdef HAVE_ACL
+ #include
+ #endif
+diff --git a/src/udiskslinuxpartition.c b/src/udiskslinuxpartition.c
+index bfee216..12b73bc 100644
+--- a/src/udiskslinuxpartition.c
b/src/udiskslinuxpartition.c
+@@ -26,6 +26,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+
+ #include
+diff --git a/src/udisksmountmonitor.c b/src/udisksmountmonitor.c
+index 891d118..eae6c02 100644
+--- a/src/udisksmountmonitor.c
b/src/udisksmountmonitor.c
+@@ -28,6 +28,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+
+ #include
+diff --git a/src/udisksstate.c b/src/udisksstate.c
+index fc7451a..2eeaf44 100644
+--- a/src/udisksstate.c
b/src/udisksstate.c
+@@ -25,6 +25,7 @@
+ #include
+
+ #include
++#include
+ #include
+ #include
+ #include
+diff --git a/tools/umount-udisks.c b/tools/umount-udisks.c
+index 8ce5fea..73ddea7 100644
+--- a/tools/umount-udisks.c
b/tools/umount-udisks.c
+@@ -25,6 +25,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+
+--
+2.7.4
+
diff --git a/sys-fs/udisks/udisks-2.1.7.ebuild
b/sys-fs/udisks/udisks-2.1.7.ebuild
index 71183f7..d91155c 100644
--- a/sys-fs/udisks/udisks-2.1.7.ebuild
+++ b/sys-fs/udisks/udisks-2.1.7.ebuild
@@ -65,6 +65,7 @@ pkg_setup() {
src_prepare() {
use systemd || { sed -i -e 's:libsystemd-login:&disable:' configure ||
die; }
+ epatch "${FILESDIR}"/${PN}-2.1.7-sysmacros.patch #580230
epatch_user
}
