[SCM] kio packaging branch, master, updated. debian/5.19.0-1-25-g45cb894

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kio.git;a=commitdiff;h=45cb894

The following commit has been merged in the master branch:
commit 45cb8941666e78dd5aedb95027304400881b69d7
Author: Tobias Frost <tobi at debian.org>
Date:   Sat Apr 30 09:44:23 2016 +0200

    Add patch for hurd, the warning caused by posix_fadvise is failing the build.
    
    Closes: #799619
---
 debian/libkf5kiocore5.symbols       |  8 ++++----
 debian/patches/fix_hurd_build.patch | 40 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/debian/libkf5kiocore5.symbols b/debian/libkf5kiocore5.symbols
index 1dc1b0c..cb70eaf 100644
--- a/debian/libkf5kiocore5.symbols
+++ b/debian/libkf5kiocore5.symbols
@@ -931,12 +931,12 @@ libKF5KIOCore.so.5 libkf5kiocore5 #MINVER#
  _ZN3KIO8UDSEntry6insertEjRK7QString at Base 4.96.0
  _ZN3KIO8UDSEntry6insertEjx at Base 4.96.0
  _ZN3KIO8UDSEntry7reserveEi at Base 5.5.0+git20141229.0049+15.04
- (arch=kfreebsd-any)_ZN3KIO8UDSEntryC1ERK4statRK7QString at Base 5.11.0
- (arch=!kfreebsd-any)_ZN3KIO8UDSEntryC1ERK6stat64RK7QString at Base 4.100.0
+ (arch=kfreebsd-any hurd-i386)_ZN3KIO8UDSEntryC1ERK4statRK7QString at Base 5.11.0
+ (arch=!kfreebsd-any !hurd-i386)_ZN3KIO8UDSEntryC1ERK6stat64RK7QString at Base 4.100.0
  _ZN3KIO8UDSEntryC1ERKS0_ at Base 4.96.0
  _ZN3KIO8UDSEntryC1Ev at Base 4.96.0
- (arch=kfreebsd-any)_ZN3KIO8UDSEntryC2ERK4statRK7QString at Base 5.11.0
- (arch=!kfreebsd-any)_ZN3KIO8UDSEntryC2ERK6stat64RK7QString at Base 4.100.0
+ (arch=kfreebsd-any hurd-i386)_ZN3KIO8UDSEntryC2ERK4statRK7QString at Base 5.11.0
+ (arch=!kfreebsd-any !hurd-i386)_ZN3KIO8UDSEntryC2ERK6stat64RK7QString at Base 4.100.0
  _ZN3KIO8UDSEntryC2ERKS0_ at Base 4.96.0
  _ZN3KIO8UDSEntryC2Ev at Base 4.96.0
  _ZN3KIO8UDSEntryD1Ev at Base 4.96.0
diff --git a/debian/patches/fix_hurd_build.patch b/debian/patches/fix_hurd_build.patch
new file mode 100644
index 0000000..7a43335
--- /dev/null
+++ b/debian/patches/fix_hurd_build.patch
@@ -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 at 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 --git a/debian/patches/series b/debian/patches/series
index a8d2efa..5d79514 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ report_error_removing_dirs
 wait_for_a_bit_longer
 kubuntu_kdelibs4-docs-path.diff
 fix_kfreebsd_build
+fix_hurd_build.patch

-- 
kio packaging