Source: qpdfview
Version: 0.5.0+ds-4
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

qpdfview fails to cross build from source. The immediate failure is
running lrelease, which requires a build dependency on qmake6:native.
While at it, I also enabled the use of the qmake6 build system that was
recently added to debhelper. I note that this does not make a cross
build succeed as it fails to locate a working moc. I think this is a
problem with the toolchain rather than qpdfview.

Helmut
diff --minimal -Nru qpdfview-0.5.0+ds/debian/changelog 
qpdfview-0.5.0+ds/debian/changelog
--- qpdfview-0.5.0+ds/debian/changelog  2024-01-19 21:28:53.000000000 +0100
+++ qpdfview-0.5.0+ds/debian/changelog  2024-03-05 18:08:04.000000000 +0100
@@ -1,3 +1,11 @@
+qpdfview (0.5.0+ds-4.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Improve cross building: Depend on qmake6:native and use qmake6
+    buildsystem. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Tue, 05 Mar 2024 18:08:04 +0100
+
 qpdfview (0.5.0+ds-4) unstable; urgency=medium
 
   * d/control, rules: build using QT6.
diff --minimal -Nru qpdfview-0.5.0+ds/debian/control 
qpdfview-0.5.0+ds/debian/control
--- qpdfview-0.5.0+ds/debian/control    2024-01-19 21:22:25.000000000 +0100
+++ qpdfview-0.5.0+ds/debian/control    2024-03-05 18:08:04.000000000 +0100
@@ -3,6 +3,7 @@
 Priority: optional
 Maintainer: Louis-Philippe VĂ©ronneau <po...@debian.org>
 Build-Depends:
+ debhelper (>= 13.11.9~),
  debhelper-compat (= 13),
  libcups2-dev,
  libdjvulibre-dev,
@@ -14,6 +15,7 @@
  libsynctex-dev,
  pkg-config,
  qmake6,
+ qmake6:native,
  qt6-base-dev,
  qt6-tools-dev-tools,
  zlib1g-dev,
diff --minimal -Nru qpdfview-0.5.0+ds/debian/rules 
qpdfview-0.5.0+ds/debian/rules
--- qpdfview-0.5.0+ds/debian/rules      2024-01-19 21:28:45.000000000 +0100
+++ qpdfview-0.5.0+ds/debian/rules      2024-03-05 18:07:43.000000000 +0100
@@ -6,13 +6,11 @@
 export QT_SELECT := 6
 
 %:
-       dh $@ --buildsystem=qmake
+       dh $@ --buildsystem=qmake6
 
 override_dh_auto_configure:
        /usr/lib/qt6/bin/lrelease qpdfview.pro
-       ln -s /usr/bin/qmake6 ./qmake
-       PATH=`pwd`:$(PATH) dh_auto_configure --buildsystem=qmake -- \
-               DEFINES+="_FILE_OFFSET_BITS=64" qpdfview.pro
+       dh_auto_configure -- DEFINES+="_FILE_OFFSET_BITS=64" qpdfview.pro
 
 override_dh_installchangelogs:
        dh_installchangelogs CHANGES

Reply via email to