[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#949352: x2goclient FTCBFS: builds for the build architecture



Source: x2goclient
Version: 4.1.2.1-4
Tags: patch
User: debian-cross@lists.debian.org
Usertags: ftcbfs

x2goclient fails to cross build from source, because it calls the build
architecture qmake via the upstream Makefile. It seems like the upstream
Makefile adds little value beyond handling the installation part. I
therefore propose moving that part into debian/rules and wrapping it up
in dh_auto_* such that dh_auto_configure can make cross building work.
You also need a dependency on qt5-qmake:native for running lrelease on a
.pro file. Please consider applying the attached patch.

Helmut
diff --minimal -Nru x2goclient-4.1.2.1/debian/changelog x2goclient-4.1.2.1/debian/changelog
--- x2goclient-4.1.2.1/debian/changelog	2019-12-21 17:56:23.000000000 +0100
+++ x2goclient-4.1.2.1/debian/changelog	2020-01-19 21:30:01.000000000 +0100
@@ -1,3 +1,12 @@
+x2goclient (4.1.2.1-4.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
+    + Let dh_auto_configure call qmake.
+    + Build-Depends: qt5-qmake:native for lrelease.
+
+ -- Helmut Grohne <helmut@subdivi.de>  Sun, 19 Jan 2020 21:30:01 +0100
+
 x2goclient (4.1.2.1-4) unstable; urgency=medium
 
   * debian/patches:
diff --minimal -Nru x2goclient-4.1.2.1/debian/control x2goclient-4.1.2.1/debian/control
--- x2goclient-4.1.2.1/debian/control	2019-12-11 15:31:36.000000000 +0100
+++ x2goclient-4.1.2.1/debian/control	2020-01-19 21:30:01.000000000 +0100
@@ -17,6 +17,7 @@
  libx11-dev,
  libxpm-dev,
  man2html-base | man2html,
+ qt5-qmake:native,
  qtbase5-dev,
  qttools5-dev-tools,
 Standards-Version: 4.4.1
diff --minimal -Nru x2goclient-4.1.2.1/debian/rules x2goclient-4.1.2.1/debian/rules
--- x2goclient-4.1.2.1/debian/rules	2019-12-11 15:33:16.000000000 +0100
+++ x2goclient-4.1.2.1/debian/rules	2020-01-19 21:30:01.000000000 +0100
@@ -10,10 +10,11 @@
 
 override_dh_auto_configure:
 	cp ChangeLog txt/changelog
-	dh_auto_configure
+	lrelease x2goclient.pro
+	dh_auto_configure --buildsystem=qmake --builddirectory=client_build -- ../x2goclient.pro
 
 override_dh_auto_build:
-	make PREFIX=/usr build_client
+	dh_auto_build --buildsystem=qmake --builddirectory=client_build
 	make PREFIX=/usr build_man
 
 override_dh_auto_install:

Reply to: