[med-svn] [libundead] 03/03: Add upstream patches to fix build

[Matthias Klumpp]

This is an automated email from the git hooks/post-receive script.

mak pushed a commit to branch master
in repository libundead.

commit c7ecc37912aa88cb20c9f81c2595c20b2607e774
Author: Matthias Klumpp <matthias at tenstral.net>
Date:   Fri Mar 3 00:54:27 2017 +0100

    Add upstream patches to fix build
---
 debian/patches/02_fix-import-deprecations.patch | 36 ++++++++++++++++
 debian/patches/03_fix-imports.patch             | 55 +++++++++++++++++++++++++
 debian/patches/series                           |  2 +
 3 files changed, 93 insertions(+)

diff --git a/debian/patches/02_fix-import-deprecations.patch b/debian/patches/02_fix-import-deprecations.patch
new file mode 100644
index 0000000..ac86f44
--- /dev/null
+++ b/debian/patches/02_fix-import-deprecations.patch
@@ -0,0 +1,36 @@
+From e82d8b8df2e3889a10ae96c33f9de34cda6e5459 Mon Sep 17 00:00:00 2001
+From: John Colvin <john.loughran.colvin at gmail.com>
+Date: Mon, 5 Dec 2016 11:01:04 +0000
+Subject: [PATCH] fix import deprecations
+
+---
+ src/undead/cstream.d | 2 +-
+ src/undead/date.d    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/undead/cstream.d b/src/undead/cstream.d
+index 14ffaea..e20ed7c 100644
+--- a/src/undead/cstream.d
++++ b/src/undead/cstream.d
+@@ -149,7 +149,7 @@ class CFile : Stream {
+ 
+   // run a few tests
+   unittest {
+-    import undead.internal.file : deleteme;
++    import undead.internal.file;
+     import std.internal.cstring : tempCString;
+ 
+     auto stream_file = (undead.internal.file.deleteme ~ "-stream.txt").tempCString();
+diff --git a/src/undead/date.d b/src/undead/date.d
+index 663289b..d0052cb 100644
+--- a/src/undead/date.d
++++ b/src/undead/date.d
+@@ -821,7 +821,7 @@ d_time parse(string s)
+         auto result = makeDate(day,time);
+         return timeClip(result);
+     }
+-    catch
++    catch (Exception e)
+     {
+         return d_time_nan;                // erroneous date string
+     }
diff --git a/debian/patches/03_fix-imports.patch b/debian/patches/03_fix-imports.patch
new file mode 100644
index 0000000..54c194b
--- /dev/null
+++ b/debian/patches/03_fix-imports.patch
@@ -0,0 +1,55 @@
+From 56ee5dde18b3aac3ac919b6571eefe6cd22bc034 Mon Sep 17 00:00:00 2001
+From: John Colvin <john.loughran.colvin at gmail.com>
+Date: Mon, 5 Dec 2016 10:58:13 +0000
+Subject: [PATCH] fix import errors
+
+---
+ src/undead/stream.d | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/undead/stream.d b/src/undead/stream.d
+index e31b381..77941f9 100644
+--- a/src/undead/stream.d
++++ b/src/undead/stream.d
+@@ -83,7 +83,7 @@ private {
+   import std.utf;
+   import core.bitop; // for bswap
+   import core.vararg;
+-  import std.file;
++  static import std.file;
+   import undead.internal.file;
+   import undead.doformat;
+ }
+@@ -1433,11 +1433,11 @@ class Stream : InputStream, OutputStream {
+   unittest { // unit test for Issue 3363
+     import std.stdio;
+     immutable fileName = undead.internal.file.deleteme ~ "-issue3363.txt";
+-    auto w = File(fileName, "w");
+-    scope (exit) remove(fileName.ptr);
++    auto w = std.stdio.File(fileName, "w");
++    scope (exit) std.file.remove(fileName);
+     w.write("one two three");
+     w.close();
+-    auto r = File(fileName, "r");
++    auto r = std.stdio.File(fileName, "r");
+     const(char)[] constChar;
+     string str;
+     char[] chars;
+@@ -2208,7 +2208,7 @@ class File: Stream {
+     assert( lines[2] == "");
+     assert( lines[3] == "That was blank");
+     file.close();
+-    remove(stream_file.tempCString());
++    std.file.remove(stream_file);
+   }
+ }
+ 
+@@ -2303,7 +2303,7 @@ class BufferedFile: BufferedStream {
+     // we must be at the end of file
+     assert(file.eof);
+     file.close();
+-    remove(stream_file.tempCString());
++    std.file.remove(stream_file);
+   }
+ 
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 87f5ce5..966a977 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 01_meson-build.patch.patch
+02_fix-import-deprecations.patch
+03_fix-imports.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libundead.git