From 24b4fdcf7a97f89808968ef6eb4fd04d3dd49e3b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 10 May 2015 10:17:06 +0200 Subject: [PATCH] udisks2: portability fixes from Alpine. --- srcpkgs/udisks2/patches/O_CLOEXEC.patch | 10 ++++++++++ srcpkgs/udisks2/patches/fix-stdio.patch | 13 +++++++++++++ srcpkgs/udisks2/patches/sys-wait.patch | 10 ++++++++++ srcpkgs/udisks2/template | 3 ++- 4 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/udisks2/patches/O_CLOEXEC.patch create mode 100644 srcpkgs/udisks2/patches/fix-stdio.patch create mode 100644 srcpkgs/udisks2/patches/sys-wait.patch diff --git a/srcpkgs/udisks2/patches/O_CLOEXEC.patch b/srcpkgs/udisks2/patches/O_CLOEXEC.patch new file mode 100644 index 0000000000..69785f5224 --- /dev/null +++ b/srcpkgs/udisks2/patches/O_CLOEXEC.patch @@ -0,0 +1,10 @@ +--- src/udiskslinuxblock.c.orig ++++ src/udiskslinuxblock.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#define __USE_GNU + #include + #include + #include diff --git a/srcpkgs/udisks2/patches/fix-stdio.patch b/srcpkgs/udisks2/patches/fix-stdio.patch new file mode 100644 index 0000000000..3fa27ea135 --- /dev/null +++ b/srcpkgs/udisks2/patches/fix-stdio.patch @@ -0,0 +1,13 @@ +--- tools/udisksctl.c ++++ tools/udisksctl.c +@@ -229,8 +229,8 @@ + } + else + { +- fclose (stdout); +- stdout = _color_pager_out; ++ fflush (stdout); ++ dup2 (fileno(_color_pager_out), fileno(stdout)); + } + + out: diff --git a/srcpkgs/udisks2/patches/sys-wait.patch b/srcpkgs/udisks2/patches/sys-wait.patch new file mode 100644 index 0000000000..e89c0d8a6e --- /dev/null +++ b/srcpkgs/udisks2/patches/sys-wait.patch @@ -0,0 +1,10 @@ +--- src/udiskslinuxfilesystem.c.orig ++++ src/udiskslinuxfilesystem.c +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + + #include diff --git a/srcpkgs/udisks2/template b/srcpkgs/udisks2/template index 983672319d..ce849eb413 100644 --- a/srcpkgs/udisks2/template +++ b/srcpkgs/udisks2/template @@ -1,11 +1,12 @@ # Template file for 'udisks2' pkgname=udisks2 version=2.1.5 -revision=2 +revision=3 wrksrc="udisks-${version}" build_pie=yes build_style=gnu-configure configure_args="--disable-static --with-udevdir=/usr/lib/udev + --enable-compile-warnings=minimum $(vopt_enable gir introspection) $(vopt_enable systemd)" hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel" makedepends="acl-devel device-mapper-devel liblvm2app-devel libparted-devel