Bug#799619: kio: diff for NMU version 5.16.0-1.1
Control: tags 799619 + patch
Control: tags 799619 + pending
Dear maintainer,
I've prepared an NMU for kio (versioned as 5.16.0-1.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.
PLEASE let me know if I can accelerate the NMU -- to push things forward.
Many thanks!
--
tobi
Regards.
diff -Nru kio-5.16.0/debian/changelog kio-5.16.0/debian/changelog
--- kio-5.16.0/debian/changelog 2015-11-30 12:12:50.000000000 +0100
+++ kio-5.16.0/debian/changelog 2016-04-26 13:54:17.000000000 +0200
@@ -1,3 +1,11 @@
+kio (5.16.0-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Add patch for hurd, the warning caused by posix_fadvise is failing the
+ build. (Closes:#799619)
+
+ -- Tobias Frost <tobi@debian.org> Tue, 26 Apr 2016 07:49:30 +0200
+
kio (5.16.0-1) unstable; urgency=medium
* New upstream release (5.16.0).
diff -Nru kio-5.16.0/debian/libkf5kiocore5.symbols kio-5.16.0/debian/libkf5kiocore5.symbols
--- kio-5.16.0/debian/libkf5kiocore5.symbols 2015-11-30 12:12:50.000000000 +0100
+++ kio-5.16.0/debian/libkf5kiocore5.symbols 2016-04-26 13:51:38.000000000 +0200
@@ -901,12 +901,12 @@
_ZN3KIO8UDSEntry6insertEjRK7QString@Base 4.96.0
_ZN3KIO8UDSEntry6insertEjx@Base 4.96.0
_ZN3KIO8UDSEntry7reserveEi@Base 5.5.0+git20141229.0049+15.04
- (arch=kfreebsd-any)_ZN3KIO8UDSEntryC1ERK4statRK7QString@Base 5.11.0
- (arch=!kfreebsd-any)_ZN3KIO8UDSEntryC1ERK6stat64RK7QString@Base 4.100.0
+ (arch=kfreebsd-any hurd-i386)_ZN3KIO8UDSEntryC1ERK4statRK7QString@Base 5.11.0
+ (arch=!kfreebsd-any !hurd-i386)_ZN3KIO8UDSEntryC1ERK6stat64RK7QString@Base 4.100.0
_ZN3KIO8UDSEntryC1ERKS0_@Base 4.96.0
_ZN3KIO8UDSEntryC1Ev@Base 4.96.0
- (arch=kfreebsd-any)_ZN3KIO8UDSEntryC2ERK4statRK7QString@Base 5.11.0
- (arch=!kfreebsd-any)_ZN3KIO8UDSEntryC2ERK6stat64RK7QString@Base 4.100.0
+ (arch=kfreebsd-any hurd-i386)_ZN3KIO8UDSEntryC2ERK4statRK7QString@Base 5.11.0
+ (arch=!kfreebsd-any !hurd-i386)_ZN3KIO8UDSEntryC2ERK6stat64RK7QString@Base 4.100.0
_ZN3KIO8UDSEntryC2ERKS0_@Base 4.96.0
_ZN3KIO8UDSEntryC2Ev@Base 4.96.0
_ZN3KIO8UDSEntryD1Ev@Base 4.96.0
diff -Nru kio-5.16.0/debian/patches/fix_hurd_build.patch kio-5.16.0/debian/patches/fix_hurd_build.patch
--- kio-5.16.0/debian/patches/fix_hurd_build.patch 1970-01-01 01:00:00.000000000 +0100
+++ kio-5.16.0/debian/patches/fix_hurd_build.patch 2016-04-26 13:51:38.000000000 +0200
@@ -0,0 +1,40 @@
+Description: fix FTBGS on hurd.
+ posix_fadvise64 is not available on hurd, will yield to an compiler warning and
+ aborting the build through --fatal-warnings
+Author: Tobias Frost <tobi@debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=799619
+Forwarded: no
+Last-Update: 2016-04-26
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/ioslaves/file/file.cpp
++++ b/src/ioslaves/file/file.cpp
+@@ -333,7 +333,7 @@
+ return;
+ }
+
+-#if HAVE_FADVISE
++#if HAVE_FADVISE && !defined(__GNU__)
+ //TODO check return code
+ posix_fadvise(f.handle(), 0, 0, POSIX_FADV_SEQUENTIAL);
+ #endif
+--- a/src/ioslaves/file/file_unix.cpp
++++ b/src/ioslaves/file/file_unix.cpp
+@@ -128,7 +128,7 @@
+ return;
+ }
+
+-#if HAVE_FADVISE
++#if HAVE_FADVISE && !defined(__GNU__)
+ posix_fadvise(src_file.handle(), 0, 0, POSIX_FADV_SEQUENTIAL);
+ #endif
+
+@@ -144,7 +144,7 @@
+ return;
+ }
+
+-#if HAVE_FADVISE
++#if HAVE_FADVISE && !defined(__GNU__)
+ posix_fadvise(dest_file.handle(), 0, 0, POSIX_FADV_SEQUENTIAL);
+ #endif
+
diff -Nru kio-5.16.0/debian/patches/series kio-5.16.0/debian/patches/series
--- kio-5.16.0/debian/patches/series 2015-11-30 12:12:50.000000000 +0100
+++ kio-5.16.0/debian/patches/series 2016-04-26 13:51:38.000000000 +0200
@@ -3,3 +3,4 @@
wait_for_a_bit_longer
kubuntu_kdelibs4-docs-path.diff
fix_kfreebsd_build
+fix_hurd_build.patch
Reply to: