debian/changelog | 6 -
debian/patches/os-move-arpa-inet.h-for-any-win32-system.patch | 42 +++++++
debian/patches/series | 2
debian/patches/xfree86-hurd-include-hurd.h.patch | 53 ++++++++++
4 files changed, 101 insertions(+), 2 deletions(-)
New commits:
commit 4cf9fe0f18eb88e85eb01ca0e3a26c5f16ebef2d
Author: Julien Cristau <jcris...@debian.org>
Date: Fri Sep 20 00:21:49 2013 +0200
Upload to experimental
diff --git a/debian/changelog b/debian/changelog
index 7201546..112b9cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xorg-server (2:1.14.3-2) UNRELEASED; urgency=low
+xorg-server (2:1.14.3-2) experimental; urgency=low
* Delete test-driver on clean.
* Add a couple patches to fix FTBFS on hurd (closes: #720736). Thanks, Pino
Toscano!
- -- Julien Cristau <jcris...@debian.org> Mon, 16 Sep 2013 01:22:24 +0200
+ -- Julien Cristau <jcris...@debian.org> Fri, 20 Sep 2013 00:21:41 +0200
xorg-server (2:1.14.3-1) experimental; urgency=low
commit e9e6da833df164266653fc4f7585536281bab847
Author: Julien Cristau <jcris...@debian.org>
Date: Fri Sep 20 00:09:09 2013 +0200
Add a couple patches to fix FTBFS on hurd (closes: #720736).
Thanks, Pino Toscano!
diff --git a/debian/changelog b/debian/changelog
index c232113..7201546 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xorg-server (2:1.14.3-2) UNRELEASED; urgency=low
* Delete test-driver on clean.
+ * Add a couple patches to fix FTBFS on hurd (closes: #720736). Thanks, Pino
+ Toscano!
-- Julien Cristau <jcris...@debian.org> Mon, 16 Sep 2013 01:22:24 +0200
diff --git a/debian/patches/os-move-arpa-inet.h-for-any-win32-system.patch
b/debian/patches/os-move-arpa-inet.h-for-any-win32-system.patch
new file mode 100644
index 0000000..70b1862
--- /dev/null
+++ b/debian/patches/os-move-arpa-inet.h-for-any-win32-system.patch
@@ -0,0 +1,42 @@
+From 006b123a801afab44a9e1a3d6e2ff5e1c6415362 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <toscano.p...@tiscali.it>
+Date: Wed, 28 Aug 2013 17:15:03 +0200
+Subject: [PATCH] os: move <arpa/inet.h> for any !win32 system
+
+It is needed in IPv6 configurations (for inet_pton) also when
+SIOCGIFCONF is not defined.
+
+Signed-off-by: Pino Toscano <toscano.p...@tiscali.it>
+---
+ os/access.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/os/access.c b/os/access.c
+index 88a44d9..6d991b3 100644
+--- a/os/access.c
++++ b/os/access.c
+@@ -163,6 +163,10 @@ SOFTWARE.
+ /* #endif */
+ #endif
+
++#if defined(IPv6) && defined(AF_INET6)
++#include <arpa/inet.h>
++#endif
++
+ #endif /* WIN32 */
+
+ #define X_INCLUDE_NETDB_H
+@@ -461,10 +465,6 @@ DefineSelf(int fd)
+ #endif
+
+ #if defined(IPv6) && defined(AF_INET6)
+-#include <arpa/inet.h>
+-#endif
+-
+-#if defined(IPv6) && defined(AF_INET6)
+ static void
+ in6_fillscopeid(struct sockaddr_in6 *sin6)
+ {
+--
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index c42a991..a032067 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,5 @@
06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff
08_xfree86_fix_ia64_inx_outx.diff
10_Include-missing-selection-h.diff
+os-move-arpa-inet.h-for-any-win32-system.patch
+xfree86-hurd-include-hurd.h.patch
diff --git a/debian/patches/xfree86-hurd-include-hurd.h.patch
b/debian/patches/xfree86-hurd-include-hurd.h.patch
new file mode 100644
index 0000000..b36602d
--- /dev/null
+++ b/debian/patches/xfree86-hurd-include-hurd.h.patch
@@ -0,0 +1,53 @@
+From ef6a236cf9b795017c9c8c4447a6735fa04bb061 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <toscano.p...@tiscali.it>
+Date: Wed, 28 Aug 2013 17:04:48 +0200
+Subject: [PATCH] xfree86/hurd: include <hurd.h>
+
+Needed for using get_privileged_port.
+
+Signed-off-by: Pino Toscano <toscano.p...@tiscali.it>
+---
+ hw/xfree86/os-support/hurd/hurd_init.c | 1 +
+ hw/xfree86/os-support/hurd/hurd_mmap.c | 1 +
+ hw/xfree86/os-support/hurd/hurd_video.c | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/hw/xfree86/os-support/hurd/hurd_init.c
b/hw/xfree86/os-support/hurd/hurd_init.c
+index 185b2b9..fe1a764 100644
+--- a/hw/xfree86/os-support/hurd/hurd_init.c
++++ b/hw/xfree86/os-support/hurd/hurd_init.c
+@@ -42,6 +42,7 @@
+ #include <sys/file.h>
+ #include <assert.h>
+ #include <mach.h>
++#include <hurd.h>
+
+ int
+ xf86ProcessArgument(int argc, char **argv, int i)
+diff --git a/hw/xfree86/os-support/hurd/hurd_mmap.c
b/hw/xfree86/os-support/hurd/hurd_mmap.c
+index 6ac9efd..8e089ca 100644
+--- a/hw/xfree86/os-support/hurd/hurd_mmap.c
++++ b/hw/xfree86/os-support/hurd/hurd_mmap.c
+@@ -27,6 +27,7 @@
+ #include<mach.h>
+ #include<device/device.h>
+ #include<mach/machine/mach_i386.h>
++#include <hurd.h>
+
+ #include <X11/X.h>
+
+diff --git a/hw/xfree86/os-support/hurd/hurd_video.c
b/hw/xfree86/os-support/hurd/hurd_video.c
+index 72474ba..b3b94c9 100644
+--- a/hw/xfree86/os-support/hurd/hurd_video.c
++++ b/hw/xfree86/os-support/hurd/hurd_video.c
+@@ -28,6 +28,7 @@
+ #include <mach.h>
+ #include <device/device.h>
+ #include <mach/machine/mach_i386.h>
++#include <hurd.h>
+
+ #include <X11/X.h>
+ #include "input.h"
+--
+1.7.10.4
+
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vmn5a-0006cw...@vasks.debian.org
