Source: guymager
Version: 0.8.8-2
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

guymager fails to cross build from source, because it uses the wrong
qmake. For cross building we need to use <hosttriplet>-qmake on Debian
and that's what dh_auto_configure does. I note that the guymager
packaging uses an in-tree build. A lot of debian/rules' complexity (in
particular clean rules) could go away if dropping the --builddirectory
(in my patch).  It also fails running lrelease due to missing a
dependency on qt5-qmake:native. The attached patch fixes both (but
leaves the in-tree build). Please consider applying it.

Helmut
diff --minimal -Nru guymager-0.8.8/debian/changelog 
guymager-0.8.8/debian/changelog
--- guymager-0.8.8/debian/changelog     2018-08-30 13:38:17.000000000 +0200
+++ guymager-0.8.8/debian/changelog     2019-02-10 16:42:36.000000000 +0100
@@ -1,3 +1,12 @@
+guymager (0.8.8-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
+    + Let dh_auto_configure use a cross qmake.
+    + Missing Build-Depends: qt5-qmake:native for using lrelease.
+
+ -- Helmut Grohne <hel...@subdivi.de>  Sun, 10 Feb 2019 16:42:36 +0100
+
 guymager (0.8.8-2) unstable; urgency=medium
 
   * [7ffc3b5] Include patch to fix ftbfs with GCC-8. Thanks to Hilko
diff --minimal -Nru guymager-0.8.8/debian/control guymager-0.8.8/debian/control
--- guymager-0.8.8/debian/control       2018-03-22 10:15:15.000000000 +0100
+++ guymager-0.8.8/debian/control       2019-02-10 16:42:36.000000000 +0100
@@ -13,6 +13,7 @@
  libprocps-dev,
  libssl-dev,
  libudev-dev,
+ qt5-qmake:native,
  qtbase5-dev,
  qttools5-dev-tools,
  quilt,
diff --minimal -Nru guymager-0.8.8/debian/rules guymager-0.8.8/debian/rules
--- guymager-0.8.8/debian/rules 2018-05-18 10:27:32.000000000 +0200
+++ guymager-0.8.8/debian/rules 2019-02-10 16:42:34.000000000 +0100
@@ -3,6 +3,7 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+export QT_SELECT=qt5
 
 %:
        dh $@
@@ -10,7 +11,7 @@
 override_dh_auto_configure:
        dh_quilt_patch
        dh_testdir
-       qmake -qt5 DEFINES+="SPLASH_DIR=\'\\\"/usr/share/guymager\\\"\' 
LANGUAGE_DIR=\'\\\"/usr/share/guymager\\\"\' 
LANGUAGE_DIR_QT=\'\\\"/usr/share/qt5/translations\\\"\'"
+       dh_auto_configure --builddirectory=. -- 
DEFINES+="SPLASH_DIR=\'\\\"/usr/share/guymager\\\"\' 
LANGUAGE_DIR=\'\\\"/usr/share/guymager\\\"\' 
LANGUAGE_DIR_QT=\'\\\"/usr/share/qt5/translations\\\"\'"
        touch configure-stamp
 
 override_dh_auto_build:
@@ -27,7 +28,7 @@
        rm -f build-stamp configure-stamp
        # dpkg-buildpackage starts with cleaning, so we have to be sure that 
there's a
        # Makefile (and thus call qmake):
-       qmake -qt5
+       dh_auto_configure --builddirectory=.
        $(MAKE) clean
        # remove leftover files:
        rm -f .qmake.stash compileinfo.cpp manuals/guymager.1

Reply via email to