Merge ~paelzer/ubuntu/+source/navit:focal-fix-FTBFS-lp1855993 into ~paelzer/ubuntu/+source/navit:importer/ubuntu/focal-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3868/

Not upstreaming to Debian as we can drop the change on we either:
a) get a fix on cmake added by the package maintainers
b) update to a 3.16 cmake which has the fix

That would be enough to get it re-built and pick up libgps25

[Christian Ehrhardt  (paelzer)]

Note: this is again not in git-ubuntu, so the MP is against my own import. But otherwise works as usual.

[Lucas Kanashiro (lucaskanashiro)]

Just noticed that if you add the flag to include the needed directory only in -DCMAKE_C_FLAGS_DEBIAN already fixes the build. Did you add it in -DCMAKE_CXX_FLAGS_DEBIAN for consistency? Or there are other reason?

review: Needs Information

[Christian Ehrhardt  (paelzer)]

>
> Just noticed that if you add the flag to include the needed directory only
> in -DCMAKE_C_FLAGS_DEBIAN already fixes the build. Did you add it in
> -DCMAKE_CXX_FLAGS_DEBIAN for consistency? Or there are other reason?
>

I added it to CXX for consistency
also because the upstream discussion on cmake said "if project contains cpp
files also set CXX"

[Lucas Kanashiro (lucaskanashiro)]

After a discussion with Christian on IRC he pointed me out to this upstream cmake discussion: https://gitlab.kitware.com/cmake/cmake/issues/19531

"That project is written in C++ along with C. You need to set CXXFLAGS to the same value as well."

So they recommend to also add the flag in CXXFLAGS.

review: Approve

[Christian Ehrhardt  (paelzer)]

Clarified on IRC and declared good for upload.
Doing that now ...

diff --git a/debian/changelog b/debian/changelog
index 7495d0b..f53f854 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+navit (0.5.3+dfsg.1-2ubuntu1) focal; urgency=medium
+
+  * d/rules: until resolved in cmake append the harfbuzz include directory
+    directly to fix FTBFS (LP: #1855993)
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 11 Dec 2019 12:03:05 +0100
+
 navit (0.5.3+dfsg.1-2build2) focal; urgency=medium
 
   * No-change rebuild against libgps25
diff --git a/debian/rules b/debian/rules
index b25a4d3..971d307 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,8 +18,8 @@ CMAKEFLAGS += -DCMAKE_LIBRARY_PATH="/usr/$(DEB_HOST_MULTIARCH)/lib" -DCMAKE_REQU
 else
 export CC=gcc
 export CXX=g++
-CMAKEFLAGS += -DCMAKE_C_FLAGS_DEBIAN="$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)" \
-	-DCMAKE_CXX_FLAGS_DEBIAN="$(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)"
+CMAKEFLAGS += -DCMAKE_C_FLAGS_DEBIAN="$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) -isystem /usr/include/harfbuzz" \
+	-DCMAKE_CXX_FLAGS_DEBIAN="$(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) -isystem /usr/include/harfbuzz"
 endif
 CMAKEFLAGS += -DCMAKE_MODULE_LINKER_FLAGS="$(shell dpkg-buildflags --get LDFLAGS)"
 CMAKEFLAGS += -DCMAKE_SHARED_LINKER_FLAGS="$(shell dpkg-buildflags --get LDFLAGS)"