Source: waylandpp
Version: 0.2.5-1
Severity: serious
Tags: patch ftbfs
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

waylandpp fails to cross build from source, because it requires passing
a native wayland-scanner++ for cross building. It also fails to build
from source, because a template symbol isn't marked as optional. Thus
severity serious, but I was too lazy to file two bugs. The attached
patch fixes both issues. Please consider applying it.

Helmut
diff --minimal -Nru waylandpp-0.2.5/debian/changelog 
waylandpp-0.2.5/debian/changelog
--- waylandpp-0.2.5/debian/changelog    2019-06-04 13:39:25.000000000 +0200
+++ waylandpp-0.2.5/debian/changelog    2019-12-03 19:54:19.000000000 +0100
@@ -1,3 +1,11 @@
+waylandpp (0.2.5-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Pass a WAYLAND_SCANNERPP to cmake. (Closes: #-1)
+  * Fix FTBFS: Mark a template symbol as optional.
+
+ -- Helmut Grohne <hel...@subdivi.de>  Tue, 03 Dec 2019 19:54:19 +0100
+
 waylandpp (0.2.5-1) unstable; urgency=medium
 
   * debian/control: Setting myself as the Maintainer to get notified about 
bugs.
diff --minimal -Nru waylandpp-0.2.5/debian/control 
waylandpp-0.2.5/debian/control
--- waylandpp-0.2.5/debian/control      2019-06-04 13:39:25.000000000 +0200
+++ waylandpp-0.2.5/debian/control      2019-12-03 19:54:18.000000000 +0100
@@ -9,7 +9,8 @@
                libpugixml-dev,
                libwayland-dev,
                libwayland-egl1-mesa,
-               libegl1-mesa-dev
+               libegl1-mesa-dev,
+               wayland-scanner++:any <cross>,
 Standards-Version: 4.3.0
 Vcs-Browser: https://salsa.debian.org/rbalint/waylandpp
 Vcs-Git: https://salsa.debian.org/rbalint/waylandpp.git
diff --minimal -Nru waylandpp-0.2.5/debian/libwayland-client++0.symbols 
waylandpp-0.2.5/debian/libwayland-client++0.symbols
--- waylandpp-0.2.5/debian/libwayland-client++0.symbols 2019-06-04 
13:39:25.000000000 +0200
+++ waylandpp-0.2.5/debian/libwayland-client++0.symbols 2019-12-03 
19:54:19.000000000 +0100
@@ -389,7 +389,7 @@
  
_ZN7wayland7proxy_t14marshal_singleEjPK12wl_interfaceSt6vectorINS_6detail10argument_tESaIS6_EEj@Base
 0.2.5
  _ZN7wayland7proxy_t18set_destroy_opcodeEj@Base 0.2.5
  
(optional=templinst)_ZN7wayland7proxy_t19marshal_constructorIJDnEEES0_jPK12wl_interfaceDpT_@Base
 0.2.5
- _ZN7wayland7proxy_t7marshalIJEEEvjDpT_@Base 0.2.5
+ (optional=templinst)_ZN7wayland7proxy_t7marshalIJEEEvjDpT_@Base 0.2.5
  (optional=templinst)_ZN7wayland7proxy_t7marshalIJP9wl_objectEEEvjDpT_@Base 
0.2.5
  (optional=templinst)_ZN7wayland7proxy_t7marshalIJiiiiEEEvjDpT_@Base 0.2.5
  _ZN7wayland7proxy_t9set_queueENS_13event_queue_tE@Base 0.2.5
diff --minimal -Nru waylandpp-0.2.5/debian/rules waylandpp-0.2.5/debian/rules
--- waylandpp-0.2.5/debian/rules        2019-06-04 13:39:25.000000000 +0200
+++ waylandpp-0.2.5/debian/rules        2019-12-03 19:54:19.000000000 +0100
@@ -6,3 +6,8 @@
 
 %:
        dh $@ --with pkgkde_symbolshelper
+
+ifneq (,$(filter cross,$(DEB_BUILD_PROFILES)))
+override_dh_auto_configure:
+       dh_auto_configure -- -DWAYLAND_SCANNERPP=$(shell which 
wayland-scanner++)
+endif

Reply via email to