Source: qupzilla
Version: 2.2.3~dfsg1-1
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
qupzilla fails to cross build from source, because debian/rules invokes
qmake without cross flags. It supposedly runs qmake directly to select
qt5, but that's much easier achieved by setting QT_SELECT. Then it fails
because some .pro file manages to run (the build architecture)
pkg-config directly rather than using the (host architecture) pkg-config
passed to the build. After fixing both, qupzilla cross builds
successfully. Please consider applying the attached patch.
Helmut
diff --minimal -Nru qupzilla-2.2.3~dfsg1/debian/changelog
qupzilla-2.2.3~dfsg1/debian/changelog
--- qupzilla-2.2.3~dfsg1/debian/changelog 2018-01-08 11:46:02.000000000
+0100
+++ qupzilla-2.2.3~dfsg1/debian/changelog 2018-01-09 21:11:14.000000000
+0100
@@ -1,3 +1,12 @@
+qupzilla (2.2.3~dfsg1-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: Closes: #-1
+ + Select qt5 via QT_SELECT.
+ + Use the right pkg-config.
+
+ -- Helmut Grohne <hel...@subdivi.de> Tue, 09 Jan 2018 21:11:14 +0100
+
qupzilla (2.2.3~dfsg1-1) unstable; urgency=medium
* New upstream release
diff --minimal -Nru qupzilla-2.2.3~dfsg1/debian/patches/cross.patch
qupzilla-2.2.3~dfsg1/debian/patches/cross.patch
--- qupzilla-2.2.3~dfsg1/debian/patches/cross.patch 1970-01-01
01:00:00.000000000 +0100
+++ qupzilla-2.2.3~dfsg1/debian/patches/cross.patch 2018-01-09
21:11:14.000000000 +0100
@@ -0,0 +1,16 @@
+Index:
qupzilla-2.2.3~dfsg1/src/plugins/GnomeKeyringPasswords/GnomeKeyringPasswords.pro
+===================================================================
+---
qupzilla-2.2.3~dfsg1.orig/src/plugins/GnomeKeyringPasswords/GnomeKeyringPasswords.pro
++++
qupzilla-2.2.3~dfsg1/src/plugins/GnomeKeyringPasswords/GnomeKeyringPasswords.pro
+@@ -55,8 +55,9 @@
+ translations/zh_HK.ts \
+ translations/zh_TW.ts \
+
+-LIBS += $$system(pkg-config --libs gnome-keyring-1)
+-QMAKE_CXXFLAGS += $$system(pkg-config --cflags gnome-keyring-1)
++PKG_CONFIG = $$pkgConfigExecutable()
++LIBS += $$system($$PKG_CONFIG --libs gnome-keyring-1)
++QMAKE_CXXFLAGS += $$system($$PKG_CONFIG --cflags gnome-keyring-1)
+
+ PLUGIN_DIR = $$PWD
+ include(../../plugins.pri)
diff --minimal -Nru qupzilla-2.2.3~dfsg1/debian/patches/series
qupzilla-2.2.3~dfsg1/debian/patches/series
--- qupzilla-2.2.3~dfsg1/debian/patches/series 2018-01-08 11:46:02.000000000
+0100
+++ qupzilla-2.2.3~dfsg1/debian/patches/series 2018-01-09 21:11:14.000000000
+0100
@@ -2,3 +2,4 @@
gnome-integration.patch
kde-integration.patch
appdata.xml.patch
+cross.patch
diff --minimal -Nru qupzilla-2.2.3~dfsg1/debian/rules
qupzilla-2.2.3~dfsg1/debian/rules
--- qupzilla-2.2.3~dfsg1/debian/rules 2018-01-08 11:46:02.000000000 +0100
+++ qupzilla-2.2.3~dfsg1/debian/rules 2018-01-09 21:11:12.000000000 +0100
@@ -9,6 +9,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+export QT_SELECT=qt5
+
%:
dh $@
@@ -16,7 +18,7 @@
# E: qupzilla source: source-is-missing src/lib/data/html/jquery-ui.js
# E: qupzilla source: source-is-missing src/lib/data/html/jquery.js
override_dh_auto_configure:
- qmake -qt5 # enforce Qt5 build
+ dh_auto_configure
# copies uglified libraries for jquery and jquery-ui
cp /usr/share/javascript/jquery/jquery.js src/lib/data/html
cp /usr/share/javascript/jquery-ui/jquery-ui.js src/lib/data/html
