[SCM] KTorrent library Debian packaging branch, master, updated. debian/2.1-2

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/libktorrent.git;a=commitdiff;h=991634d

The following commit has been merged in the master branch:
commit 991634d19a82b35f910aa74d623b26814b0bf2e6
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jul 2 21:01:35 2016 +0200

    update the patches
    
    - upstream_don-t-include-circular_buffer-in-moc-run.patch: drop,
      backported from upstream
    - set-pathmax.diff: refresh
---
 debian/changelog                                   |  4 +++
 debian/patches/series                              |  1 -
 debian/patches/set-pathmax.diff                    |  8 +++---
 ..._don-t-include-circular_buffer-in-moc-run.patch | 31 ----------------------
 4 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7b7cf1c..e73ff7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ libktorrent (2.0.1-0r1) UNRELEASED; urgency=medium
     - switch from kde to kf5 dh addon
     - bump the pkg-kde-tools build dependency to >= 0.15.16
   * Rename libktorrent5 to libktorrent6, following the SONAME bump.
+  * Update the patches:
+    - upstream_don-t-include-circular_buffer-in-moc-run.patch: drop,
+      backported from upstream
+    - set-pathmax.diff: refresh
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sat, 02 Jul 2016 19:57:23 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 9095029..f36a47c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-upstream_don-t-include-circular_buffer-in-moc-run.patch
 set-pathmax.diff
diff --git a/debian/patches/set-pathmax.diff b/debian/patches/set-pathmax.diff
index 71f2fa7..808d41c 100644
--- a/debian/patches/set-pathmax.diff
+++ b/debian/patches/set-pathmax.diff
@@ -8,10 +8,10 @@ Origin: vendor
 Forwarded: no
 Last-Update: 2015-08-30
 
---- libktorrent-1.3.1.orig/src/util/fileops.cpp
-+++ libktorrent-1.3.1/src/util/fileops.cpp
-@@ -54,6 +54,10 @@
- #define NAME_MAX 255
+--- a/src/util/fileops.cpp
++++ b/src/util/fileops.cpp
+@@ -57,6 +57,10 @@
+ #define PATH_MAX 4096
  #endif
  
 +#ifndef PATH_MAX
diff --git a/debian/patches/upstream_don-t-include-circular_buffer-in-moc-run.patch b/debian/patches/upstream_don-t-include-circular_buffer-in-moc-run.patch
deleted file mode 100644
index 6e5c6d2..0000000
--- a/debian/patches/upstream_don-t-include-circular_buffer-in-moc-run.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From c6da334030f7865d67ee7d131f075087476fe00a Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter at kde.org>
-Date: Tue, 11 Aug 2015 14:48:14 +0200
-Subject: [PATCH] don't include circular_buffer in moc run
-
-boost 1.58 started including files with constructs moc cannot handle and
-buts out. since the boost includes are not required for metaobject
-compliation simply do not include the relevant header during moc runs.
-
-fixes build problems with qt4 and boost ~= 1.58
----
- src/utp/delaywindow.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/utp/delaywindow.h b/src/utp/delaywindow.h
-index 2c1abcf..93cf986 100644
---- a/src/utp/delaywindow.h
-+++ b/src/utp/delaywindow.h
-@@ -22,7 +22,9 @@
- #ifndef UTP_DELAYWINDOW_H
- #define UTP_DELAYWINDOW_H
- 
-+#ifndef Q_MOC_RUN
- #include <boost/circular_buffer.hpp>
-+#endif // Q_MOC_RUN
- #include <utp/utpprotocol.h>
- 
- namespace utp
--- 
-2.1.4
-

-- 
KTorrent library Debian packaging