Bug#873152: utopia-documents: Fails to build with qt5.9

[Gianfranco Costamagna]

Control: tags 873152 + pending

Dear maintainer,

I've prepared an NMU for utopia-documents (versioned as 3.0.2-1.1) and
uploaded it to unstable. Please feel free to tell me if I
should delay it longer.

Regards.
diff -Nru utopia-documents-3.0.2/debian/changelog 
utopia-documents-3.0.2/debian/changelog
--- utopia-documents-3.0.2/debian/changelog 2017-04-10 14:13:10.0 
+0200
+++ utopia-documents-3.0.2/debian/changelog 2017-09-06 08:45:38.0 
+0200
@@ -1,3 +1,13 @@
+utopia-documents (3.0.2-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Steve Langasek ]
+  * debian/patches/fix-namespace-declaration.patch: add required
+Q_NAMESPACE macro to namespace. LP: #1710317. Closes: #873152
+
+ -- Gianfranco Costamagna   Wed, 06 Sep 2017 
08:45:38 +0200
+
 utopia-documents (3.0.2-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru utopia-documents-3.0.2/debian/patches/fix-namespace-declaration.patch 
utopia-documents-3.0.2/debian/patches/fix-namespace-declaration.patch
--- utopia-documents-3.0.2/debian/patches/fix-namespace-declaration.patch   
1970-01-01 01:00:00.0 +0100
+++ utopia-documents-3.0.2/debian/patches/fix-namespace-declaration.patch   
2017-09-06 08:45:38.0 +0200
@@ -0,0 +1,17 @@
+Description: add required Q_NAMESPACE macro to namespace
+ Qt 5.9 doesn't like namespaces without Q_NAMESPACE macro.
+Author: Steve Langasek 
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1710317
+
+Index: utopia-documents-3.0.2/libutopia2_qt/utopia2/qt/bubble.h
+===
+--- utopia-documents-3.0.2.orig/libutopia2_qt/utopia2/qt/bubble.h
 utopia-documents-3.0.2/libutopia2_qt/utopia2/qt/bubble.h
+@@ -55,6 +55,7 @@
+ 
+ namespace Utopia
+ {
++Q_NAMESPACE
+ 
+ typedef enum
+ {
diff -Nru utopia-documents-3.0.2/debian/patches/series 
utopia-documents-3.0.2/debian/patches/series
--- utopia-documents-3.0.2/debian/patches/series2017-04-10 
14:13:10.0 +0200
+++ utopia-documents-3.0.2/debian/patches/series2017-09-06 
08:45:38.0 +0200
@@ -1 +1,2 @@
 remove-utopia-update-check.diff
+fix-namespace-declaration.patch


signature.asc
Description: OpenPGP digital signature

Bug#873152: utopia-documents: Fails to build with qt5.9

[Steve Langasek]

Package: utopia-documents
Version: 3.0.2-1
Severity: serious
Tags: patch
Justification: FTBFS
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu artful ubuntu-patch

Hi James,

In Ubuntu, we've found that utopia-documents fails to build against Qt5.9
with the following error:

[ 16%] Generating moc_bubble.cpp
cd /<>/utopia-build/libutopia2_qt/utopia2/qt && 
/usr/lib/x86_64-linux-gnu/qt5/bin/moc 
@/<>/utopia-build/libutopia2_qt/utopia2/qt/moc_bubble.cpp_parameters
/<>/libutopia2_qt/utopia2/qt/bubble.h:56: Error: Namespace 
declaration lacks Q_NAMESPACE macro.
libutopia2_qt/utopia2/qt/CMakeFiles/utopia2_qt_autogen.dir/build.make:80: 
recipe for target 'libutopia2_qt/utopia2/qt/moc_bubble.cpp' failed

Full build logs can be found at 
https://launchpad.net/ubuntu/+source/utopia-documents/3.0.2-1

Since the Qt stack is nearly identical between artful and Debian unstable, I
believe (but have not tested) that this build failure applies to Debian as
well.

I have attached the attached patch to fix the build failure in Ubuntu.

Thanks,
-- 
Steve Langasek   Give me a lever long enough and a Free OS
Debian Developer   to set it on, and I can move the world.
Ubuntu Developerhttp://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
diff -Nru utopia-documents-3.0.2/debian/patches/fix-namespace-declaration.patch 
utopia-documents-3.0.2/debian/patches/fix-namespace-declaration.patch
--- utopia-documents-3.0.2/debian/patches/fix-namespace-declaration.patch   
1969-12-31 16:00:00.0 -0800
+++ utopia-documents-3.0.2/debian/patches/fix-namespace-declaration.patch   
2017-08-24 17:05:58.0 -0700
@@ -0,0 +1,17 @@
+Description: add required Q_NAMESPACE macro to namespace
+ Qt 5.9 doesn't like namespaces without Q_NAMESPACE macro.
+Author: Steve Langasek 
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1710317
+
+Index: utopia-documents-3.0.2/libutopia2_qt/utopia2/qt/bubble.h
+===
+--- utopia-documents-3.0.2.orig/libutopia2_qt/utopia2/qt/bubble.h
 utopia-documents-3.0.2/libutopia2_qt/utopia2/qt/bubble.h
+@@ -55,6 +55,7 @@
+ 
+ namespace Utopia
+ {
++Q_NAMESPACE
+ 
+ typedef enum
+ {
diff -Nru utopia-documents-3.0.2/debian/patches/series 
utopia-documents-3.0.2/debian/patches/series
--- utopia-documents-3.0.2/debian/patches/series2017-04-10 
05:13:10.0 -0700
+++ utopia-documents-3.0.2/debian/patches/series2017-08-24 
16:58:24.0 -0700
@@ -1 +1,2 @@
 remove-utopia-update-check.diff
+fix-namespace-declaration.patch