Bug#906776: kxstitch: diff for NMU version 2.1.1-1.1

2018-09-17 Thread Adrian Bunk 
On Mon, Sep 17, 2018 at 11:25:50AM -0700, Scarlett Clark wrote:
> I applied your patch.
> https://salsa.debian.org/qt-kde-team/extras/kxstitch/commit/1014d38d07928d40e9594fd5dfd55d7e77f7f9bc
> I am still working on maintainer/developer and cannot yet upload, if you
> can great, otherwise I need to reach out to my mentor.

Thanks, I've rescheduled to 0-day.

> Thanks!
> Scarlett

cu
Adrian

-- 

   "Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
   "Only a promise," Lao Er said.
   Pearl S. Buck - Dragon Seed

Bug#906776: kxstitch: diff for NMU version 2.1.1-1.1

2018-09-17 Thread Scarlett Clark 
I applied your patch.
https://salsa.debian.org/qt-kde-team/extras/kxstitch/commit/1014d38d07928d40e9594fd5dfd55d7e77f7f9bc
I am still working on maintainer/developer and cannot yet upload, if you
can great, otherwise I need to reach out to my mentor.
Thanks!
Scarlett

On Mon, Sep 17, 2018 at 10:57 AM Adrian Bunk  wrote:

> Control: tags 906776 + patch
> Control: tags 906776 + pending
>
> Dear maintainer,
>
> I've prepared an NMU for kxstitch (versioned as 2.1.1-1.1) and uploaded
> it to DELAYED/14. Please feel free to tell me if I should cancel it.
>
> cu
> Adrian
>
> --
>
>"Is there not promise of rain?" Ling Tan asked suddenly out
> of the darkness. There had been need of rain for many days.
>"Only a promise," Lao Er said.
>Pearl S. Buck - Dragon Seed
>
>

Bug#906776: kxstitch: diff for NMU version 2.1.1-1.1

2018-09-17 Thread Adrian Bunk 
Control: tags 906776 + patch
Control: tags 906776 + pending

Dear maintainer,

I've prepared an NMU for kxstitch (versioned as 2.1.1-1.1) and uploaded 
it to DELAYED/14. Please feel free to tell me if I should cancel it.

cu
Adrian

-- 

   "Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
   "Only a promise," Lao Er said.
   Pearl S. Buck - Dragon Seed

diff -Nru kxstitch-2.1.1/debian/changelog kxstitch-2.1.1/debian/changelog
--- kxstitch-2.1.1/debian/changelog	2018-03-28 02:36:07.0 +0300
+++ kxstitch-2.1.1/debian/changelog	2018-09-17 20:47:24.0 +0300
@@ -1,3 +1,10 @@
+kxstitch (2.1.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add upstream fix for FTBFS with Qt 5.11. (Closes: #906776)
+
+ -- Adrian Bunk   Mon, 17 Sep 2018 20:47:24 +0300
+
 kxstitch (2.1.1-1) unstable; urgency=medium
 
   [ Scarlett Clark ]
diff -Nru kxstitch-2.1.1/debian/patches/0001-fix-build-with-Qt-5.11.patch kxstitch-2.1.1/debian/patches/0001-fix-build-with-Qt-5.11.patch
--- kxstitch-2.1.1/debian/patches/0001-fix-build-with-Qt-5.11.patch	1970-01-01 02:00:00.0 +0200
+++ kxstitch-2.1.1/debian/patches/0001-fix-build-with-Qt-5.11.patch	2018-09-17 20:46:58.0 +0300
@@ -0,0 +1,38 @@
+From 9db3fcf9cd367681c0864238dc5009a604f3896c Mon Sep 17 00:00:00 2001
+From: Jonathan Riddell 
+Date: Wed, 27 Jun 2018 16:45:16 +0100
+Subject: fix build with Qt 5.11
+
+---
+ src/LibraryPatternPropertiesDlg.cpp | 2 ++
+ src/TextElementDlg.cpp  | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/src/LibraryPatternPropertiesDlg.cpp b/src/LibraryPatternPropertiesDlg.cpp
+index 8d2e24c..c10da3f 100644
+--- a/src/LibraryPatternPropertiesDlg.cpp
 b/src/LibraryPatternPropertiesDlg.cpp
+@@ -11,6 +11,8 @@
+ 
+ #include "LibraryPatternPropertiesDlg.h"
+ 
++#include 
++
+ #include 
+ #include 
+ #include 
+diff --git a/src/TextElementDlg.cpp b/src/TextElementDlg.cpp
+index 4d88b1e..fb545d1 100644
+--- a/src/TextElementDlg.cpp
 b/src/TextElementDlg.cpp
+@@ -16,6 +16,7 @@
+ #include "TextElementDlg.h"
+ 
+ #include 
++#include 
+ 
+ #include 
+ #include 
+-- 
+2.11.0
+
diff -Nru kxstitch-2.1.1/debian/patches/series kxstitch-2.1.1/debian/patches/series
--- kxstitch-2.1.1/debian/patches/series	1970-01-01 02:00:00.0 +0200
+++ kxstitch-2.1.1/debian/patches/series	2018-09-17 20:47:24.0 +0300
@@ -0,0 +1 @@
+0001-fix-build-with-Qt-5.11.patch