diff -Nru node-stringprep-0.8.0/debian/changelog node-stringprep-0.8.0/debian/changelog
--- node-stringprep-0.8.0/debian/changelog	2017-01-10 18:41:40.000000000 +0000
+++ node-stringprep-0.8.0/debian/changelog	2018-05-31 12:14:23.000000000 +0000
@@ -1,3 +1,9 @@
+node-stringprep (0.8.0-3+rpi1) buster-staging; urgency=medium
+
+  * Apply upstream "gcc7" patch by James Bunton (Closes: 895029)
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 31 May 2018 12:14:23 +0000
+
 node-stringprep (0.8.0-3) unstable; urgency=medium
 
   * Update watch file: Use substitution string @PACKAGE@.
diff -Nru node-stringprep-0.8.0/debian/patches/gcc7.patch node-stringprep-0.8.0/debian/patches/gcc7.patch
--- node-stringprep-0.8.0/debian/patches/gcc7.patch	1970-01-01 00:00:00.000000000 +0000
+++ node-stringprep-0.8.0/debian/patches/gcc7.patch	2018-05-31 12:13:51.000000000 +0000
@@ -0,0 +1,70 @@
+Description: Fixed compilation errors by adding casts
+Forwarded: https://github.com/astro/node-stringprep/pull/96/commits/fa08ad0da41bfc11e82b703c4ba26fee9481591f
+Author: James Bunton <jbunton@atlassian.com>
+Last-Update: 2017-09-04
+
+--- a/node-stringprep.cc
++++ b/node-stringprep.cc
+@@ -119,7 +119,7 @@
+         error = U_ZERO_ERROR;
+         dest = new UChar[destLen];
+         size_t w = usprep_prepare(profile,
+-                                  *str, str.length(),
++                                  (const UChar*)*str, str.length(),
+                                   dest, destLen,
+                                   USPREP_DEFAULT, NULL, &error);
+ 
+@@ -141,7 +141,7 @@
+           destLen = w;
+       }
+ 
+-    Local<Value> result = Nan::New<String>(dest, destLen).ToLocalChecked();
++    Local<Value> result = Nan::New<String>((uint16_t*)dest, destLen).ToLocalChecked();
+     delete[] dest;
+     return scope.Escape(result);
+   }
+@@ -212,7 +212,7 @@
+         UIDNAInfo uinfo = UIDNA_INFO_INITIALIZER;
+         size_t w = uidna_nameToUnicode(
+           uidna,
+-          *str, str.length(),
++          (const UChar*)*str, str.length(),
+           dest, destLen,
+           &uinfo, &error);
+         
+@@ -235,7 +235,7 @@
+           destLen = w;
+       }
+ 
+-    Local<String> result = Nan::New<String>(dest, destLen).ToLocalChecked();
++    Local<String> result = Nan::New<String>((uint16_t*)dest, destLen).ToLocalChecked();
+     delete[] dest;
+     uidna_close(uidna);
+     info.GetReturnValue().Set(result);
+@@ -266,7 +266,7 @@
+     UIDNAInfo uinfo1 = UIDNA_INFO_INITIALIZER;
+     size_t destLen = uidna_nameToASCII(
+       uidna,
+-      *str, strLen,
++      (const UChar*)*str, strLen,
+       NULL, 0,
+       &uinfo1, &error);
+     UChar *dest = NULL;
+@@ -278,7 +278,7 @@
+         UIDNAInfo uinfo2 = UIDNA_INFO_INITIALIZER;
+         uidna_nameToASCII(
+           uidna,
+-          *str, strLen,
++          (const UChar*)*str, strLen,
+           dest, destLen,
+           &uinfo2, &error);
+         if (U_SUCCESS(error) && uinfo2.errors > 0)
+@@ -295,7 +295,7 @@
+         return;
+       }
+ 
+-    Local<String> result = Nan::New<String>(dest, destLen).ToLocalChecked();
++    Local<String> result = Nan::New<String>((uint16_t*)dest, destLen).ToLocalChecked();
+     delete[] dest;
+     uidna_close(uidna);
+     info.GetReturnValue().Set(result);
diff -Nru node-stringprep-0.8.0/debian/patches/series node-stringprep-0.8.0/debian/patches/series
--- node-stringprep-0.8.0/debian/patches/series	2015-05-19 17:23:11.000000000 +0000
+++ node-stringprep-0.8.0/debian/patches/series	2018-05-31 12:14:23.000000000 +0000
@@ -1 +1,2 @@
 2001_nodejs_not_node.patch
+gcc7.patch