qemu-git: Eliminate local patches

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Thu Jul 20 19:29:13 2017 +0200
Changeset:	55193d317af05400d6a28dc280955b6d1485e299

Modified Files:
	qemu-git/distinfo
Removed Files:
	qemu-git/patches/patch-configure
	qemu-git/patches/patch-contrib_ivshmem-client_Makefile.objs
	qemu-git/patches/patch-contrib_ivshmem-server_Makefile.objs
	qemu-git/patches/patch-qemu-nbd.c
	qemu-git/patches/patch-util_main-loop.c
	qemu-git/patches/patch-util_systemd.c

Log Message:
qemu-git: Eliminate local patches

Build failures addressed upstream.
"%m" -> "%s",strerror(errno) will be redone in future.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=55193d317af05400d6a28dc280955b6d1485e299

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 qemu-git/distinfo                                         |  6 ------
 qemu-git/patches/patch-configure                          | 13 -------------
 .../patches/patch-contrib_ivshmem-client_Makefile.objs    |  7 -------
 .../patches/patch-contrib_ivshmem-server_Makefile.objs    |  7 -------
 qemu-git/patches/patch-qemu-nbd.c                         | 14 --------------
 qemu-git/patches/patch-util_main-loop.c                   | 13 -------------
 qemu-git/patches/patch-util_systemd.c                     | 15 ---------------
 7 files changed, 75 deletions(-)

diffs:
diff --git a/qemu-git/distinfo b/qemu-git/distinfo
index fe64d53510..59a5133180 100644
--- a/qemu-git/distinfo
+++ b/qemu-git/distinfo
@@ -4,9 +4,3 @@ SHA1 (qemu-2.8.1.tar.bz2) = 224289c5e568e400920363820a0647e2aca569e7
 RMD160 (qemu-2.8.1.tar.bz2) = 93f71138d19c871195c9e0b1a7ba66275773f93a
 SHA512 (qemu-2.8.1.tar.bz2) = 0397b4029cdcb77ed053c44b3579a3f34894038e6fc6b4aa88de14515f5a78bf2f41c5e865f37111529f567c85d2f1c4deefae47dde54f76eac79410e5b2bdda
 Size (qemu-2.8.1.tar.bz2) = 28366270 bytes
-SHA1 (patch-configure) = cf9e3c45ab229da2766c7216999b07e3d9353232
-SHA1 (patch-contrib_ivshmem-client_Makefile.objs) = 84c86619bba6ff1b6ca3875e176c5e0b084ed853
-SHA1 (patch-contrib_ivshmem-server_Makefile.objs) = 146a59da648864ff43d6e5807e8e3f94c2242338
-SHA1 (patch-qemu-nbd.c) = 191b4082aedd0e5b8cc03aa20bc13b415a9df5b4
-SHA1 (patch-util_main-loop.c) = 06ef4669bd63cf05b0c57ceda639b09101471e12
-SHA1 (patch-util_systemd.c) = 85cd7fbfd064c05d31c1bc64ff9485ae57615ca0
diff --git a/qemu-git/patches/patch-configure b/qemu-git/patches/patch-configure
deleted file mode 100644
index 12bdf8336e..0000000000
--- a/qemu-git/patches/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- configure.orig	2017-05-26 04:41:16.000000000 +0000
-+++ configure
-@@ -4928,6 +4927,8 @@ if test "$want_tools" = "yes" ; then
-   tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
-   if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
-     tools="qemu-nbd\$(EXESUF) $tools"
-+  fi
-+  if [ "$eventfd" = "yes" ]; then
-     tools="ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools"
-   fi
- fi
diff --git a/qemu-git/patches/patch-contrib_ivshmem-client_Makefile.objs b/qemu-git/patches/patch-contrib_ivshmem-client_Makefile.objs
deleted file mode 100644
index 9ea45e9a7a..0000000000
--- a/qemu-git/patches/patch-contrib_ivshmem-client_Makefile.objs
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD$
-
---- contrib/ivshmem-client/Makefile.objs.orig	2017-04-25 12:42:53.000000000 +0000
-+++ contrib/ivshmem-client/Makefile.objs
-@@ -1 +1 @@
--ivshmem-client-obj-y = ivshmem-client.o main.o
-+ivshmem-client-obj-$(CONFIG_IVSHMEM) = ivshmem-client.o main.o
diff --git a/qemu-git/patches/patch-contrib_ivshmem-server_Makefile.objs b/qemu-git/patches/patch-contrib_ivshmem-server_Makefile.objs
deleted file mode 100644
index 286f0e80d8..0000000000
--- a/qemu-git/patches/patch-contrib_ivshmem-server_Makefile.objs
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD$
-
---- contrib/ivshmem-server/Makefile.objs.orig	2017-04-25 12:42:53.000000000 +0000
-+++ contrib/ivshmem-server/Makefile.objs
-@@ -1 +1 @@
--ivshmem-server-obj-y = ivshmem-server.o main.o
-+ivshmem-server-obj-$(CONFIG_IVSHMEM) = ivshmem-server.o main.o
diff --git a/qemu-git/patches/patch-qemu-nbd.c b/qemu-git/patches/patch-qemu-nbd.c
deleted file mode 100644
index ed6bc9aeb8..0000000000
--- a/qemu-git/patches/patch-qemu-nbd.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
---- qemu-nbd.c.orig	2017-05-12 22:04:02.000000000 +0000
-+++ qemu-nbd.c
-@@ -283,8 +283,7 @@ static void *nbd_client_thread(void *arg
- 
-     fd = open(device, O_RDWR);
-     if (fd < 0) {
--        /* Linux-only, we can use %m in printf.  */
--        error_report("Failed to open %s: %m", device);
-+        error_report("Failed to open %s: %s", device, strerror(errno));
-         goto out_socket;
-     }
- 
diff --git a/qemu-git/patches/patch-util_main-loop.c b/qemu-git/patches/patch-util_main-loop.c
deleted file mode 100644
index 741c10b416..0000000000
--- a/qemu-git/patches/patch-util_main-loop.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- util/main-loop.c.orig	2017-04-25 12:42:53.000000000 +0000
-+++ util/main-loop.c
-@@ -56,7 +56,7 @@ static void sigfd_handler(void *opaque)
-         }
- 
-         if (len != sizeof(info)) {
--            printf("read from sigfd returned %zd: %m\n", len);
-+            printf("read from sigfd returned %zd: %s\n", len, strerror(errno));
-             return;
-         }
- 
diff --git a/qemu-git/patches/patch-util_systemd.c b/qemu-git/patches/patch-util_systemd.c
deleted file mode 100644
index 3dadf67267..0000000000
--- a/qemu-git/patches/patch-util_systemd.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
---- util/systemd.c.orig	2017-04-25 12:42:53.000000000 +0000
-+++ util/systemd.c
-@@ -60,8 +60,8 @@ unsigned int check_socket_activation(voi
-              * and we should exit.
-              */
-             error_report("Socket activation failed: "
--                         "invalid file descriptor fd = %d: %m",
--                         fd);
-+                         "invalid file descriptor fd = %d: %s",
-+                         fd, strerror(errno));
-             exit(EXIT_FAILURE);
-         }
-     }