Merge lp:~bzoltan/kubuntu-packaging/qt5-qmake-cross-armhf into lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src

[Zoltan Balogh]

[ Zoltan Balogh ]
* Add qmake cross-compilation package qt5-qmake-cross-armhf
* debian/patches/qt5-qmake-cross-armhf:
  - Add mkspec needed for the cross-qmake
* debian/rules: on amd64+i386, build the second qmake first

Create a new qt5-qmake-cross-armhf package what distributes a binary with the same name to support qmake projects in x86 chroots with armhf target development environment.

[Zoltan Balogh (bzoltan)]

Create a new qt5-qmake-cross-armhf package what distributes a binary with the same name to support qmake projects in x86 chroots with armhf target development environment.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:199
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~bzoltan/kubuntu-packaging/qt5-qmake-cross-armhf/+merge/241568/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtbase-opensource-src-ci/44/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtbase-opensource-src-vivid-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtbase-opensource-src-vivid-armhf-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/kubuntu-packagers-kubuntu-packaging-qtbase-opensource-src-ci/44/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:199
http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtbase-opensource-src-ci/45/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtbase-opensource-src-vivid-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtbase-opensource-src-vivid-armhf-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/kubuntu-packagers-kubuntu-packaging-qtbase-opensource-src-ci/45/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2014-10-09 05:07:08 +0000
+++ debian/control	2014-11-12 15:38:21 +0000
@@ -364,6 +364,33 @@
  .
  This package contains also these platform specifications.
 
+Package: qt5-qmake-cross-armhf
+Architecture: amd64 i386 
+Multi-Arch: same
+Section: devel
+Depends: qtchooser, ${misc:Depends}, ${shlibs:Depends}
+Description: Qt 5 qmake-cross-armhf Makefile generator tool
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains the Qt 5 qmake-cross-armhf, a tool that helps 
+ simplify the build process for development project across different 
+ platforms.
+ qmake-cross-armhf automates the generation of Makefiles so that only 
+ a few lines of information are needed to create each Makefile. 
+ qmake can be used for any software project, whether it is written 
+ using Qt or not.
+ .
+ Qt 5 qmake-cross-armhf requires a platform and compiler description 
+ file which contains many default values used to generate appropriate 
+ Makefiles.
+ .
+ This package contains also these platform specifications.
+ .
+ The qmake-cross-armhf is made for creating Makefile in multiarch build 
+ environment. It can be used for example in a i386 chroot with armhf 
+ development packages.
+
 Package: qtbase5-examples
 Architecture: any
 Multi-Arch: foreign

=== added file 'debian/patches/qt5-qmake-cross-armhf'
--- debian/patches/qt5-qmake-cross-armhf	1970-01-01 00:00:00 +0000
+++ debian/patches/qt5-qmake-cross-armhf	2014-11-12 15:38:21 +0000
@@ -0,0 +1,100 @@
+Description: Add mkspec for the qt5-qmake-cross-armhf build
+ .
+ qtbase-opensource-src (5.3.0+dfsg-3ubuntu1) utopic; urgency=medium
+ .
+   * Add qt5-qmake-cross-armhf to support qmake projects in multiarch
+     crossbuilders
+Author: Zoltán Balogh <[e-mail]>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- /dev/null
++++ qtbase-opensource-src/mkspecs/ubuntu-arm-gnueabihf-g++/qmake.conf
+@@ -0,0 +1,31 @@
++#
++# qmake configuration for building with arm-linux-gnueabi-g++
++#
++
++MAKEFILE_GENERATOR      = UNIX
++CONFIG                 += incremental
++QMAKE_INCREMENTAL_STYLE = sublib
++
++include(../common/linux.conf)
++include(../common/gcc-base-unix.conf)
++include(../common/g++-unix.conf)
++
++# modifications to g++.conf
++QMAKE_CC                = arm-linux-gnueabihf-gcc
++QMAKE_CXX               = arm-linux-gnueabihf-g++
++QMAKE_LINK              = arm-linux-gnueabihf-g++
++QMAKE_LINK_SHLIB        = arm-linux-gnueabihf-g++
++QMAKE_CFLAGS_APP       -= -fPIE
++QMAKE_CFLAGS_APP       += -fPIC
++QMAKE_CXXFLAGS_APP     -= -fPIE
++QMAKE_CXXFLAGS_APP     += -fPIC
++
++# modifications to linux.conf
++QMAKE_AR                = arm-linux-gnueabihf-ar cqs
++QMAKE_OBJCOPY           = arm-linux-gnueabihf-objcopy
++QMAKE_NM                = arm-linux-gnueabihf-nm -P
++QMAKE_STRIP             = arm-linux-gnueabihf-strip
++QMAKE_LIBDIR            = /usr/lib/arm-linux-gnueabihf
++
++load(qt_config)
++QMAKE_DEFAULT_INCDIRS   = /usr/include/arm-linux-gnueabihf/c++/4.9 /usr/include/arm-linux-gnueabihf/c++/4.9/backward /usr/include/arm-linux-gnueabihf
+--- /dev/null
++++ qtbase-opensource-src/mkspecs/ubuntu-arm-gnueabihf-g++/qplatformdefs.h
+@@ -0,0 +1,42 @@
++/****************************************************************************
++**
++** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the qmake spec of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia.  For licensing terms and
++** conditions see http://qt.digia.com/licensing.  For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights.  These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#include "../linux-g++/qplatformdefs.h"

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-10-09 05:07:08 +0000
+++ debian/patches/series	2014-11-12 15:38:21 +0000
@@ -14,6 +14,7 @@
 # Ubuntu specific.
 disable_overlay_scrollbars.diff
 load_testability_from_env_var.patch
+qt5-qmake-cross-armhf
 
 Add-workaround-for-GL-on-Android-emulator.patch
 

=== added file 'debian/qt5-qmake-cross-armhf.install'
--- debian/qt5-qmake-cross-armhf.install	1970-01-01 00:00:00 +0000
+++ debian/qt5-qmake-cross-armhf.install	2014-11-12 15:38:21 +0000
@@ -0,0 +1,1 @@
+usr/bin/qt5-qmake-cross-armhf

=== modified file 'debian/rules'
--- debian/rules	2014-09-26 07:51:46 +0000
+++ debian/rules	2014-11-12 15:38:21 +0000
@@ -94,7 +94,45 @@
 %:
 	dh $@ --parallel --with pkgkde_symbolshelper
 
+x86_architectures := i386 amd64
+
 override_dh_auto_configure:
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(x86_architectures)))
+	./configure -v -confirm-license \
+            -prefix "/usr" \
+            -bindir "/usr/lib/x86_64-linux-gnu/qt5/bin" \
+            -libdir "/usr/lib/arm-linux-gnueabihf" \
+            -docdir "/usr/share/qt5/doc" \
+            -headerdir "/usr/include/arm-linux-gnueabihf/qt5" \
+            -datadir "/usr/share/qt5" \
+            -archdatadir "/usr/lib/arm-linux-gnueabihf/qt5" \
+            -hostdatadir "/usr/share/qt5" \
+            -plugindir "/usr/lib/arm-linux-gnueabihf/qt5/plugins" \
+            -importdir "/usr/lib/arm-linux-gnueabihf/qt5/imports" \
+            -translationdir "/usr/share/qt5/translations" \
+            -hostdatadir "/usr/lib/arm-linux-gnueabihf/qt5" \
+            -sysconfdir "/etc/xdg" \
+            -examplesdir "/usr/lib/arm-linux-gnueabihf/qt5/examples" \
+            -opensource \
+            --no-dbus \
+            --no-libjpeg \
+            --no-glib \
+            -platform linux-g++ \
+            -qt-zlib \
+            -no-rpath \
+            -verbose \
+            -optimized-qmake \
+            -no-strip \
+            -no-separate-debug-info \
+            -qpa xcb \
+            -xcb \
+            -no-icu \
+            -accessibility \
+            -no-directfb \
+            -no-sql-ibase -no-pch -no-opengl \
+            -xplatform ubuntu-arm-gnueabihf-g++ || file $(CURDIR)/bin/qmake;
+	mv $(CURDIR)/bin/qmake  $(CURDIR)/bin/qt5-qmake-cross-armhf
+endif
 	./configure -confirm-license \
 	            -prefix "/usr" \
 	            -bindir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin" \
@@ -266,6 +304,12 @@
 	ln -s /usr/share/qtchooser/qt5-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/qt5.conf
 	ln -s /usr/share/qtchooser/qt5-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/default.conf
 
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(x86_architectures)))
+	# ship the qt5-qmake-cross-armhf in /usr/bin
+	mkdir -p $(CURDIR)/debian/tmp/usr/bin
+	cp $(CURDIR)/bin/qt5-qmake-cross-armhf $(CURDIR)/debian/tmp/usr/bin
+endif
+
 	# Remove leftover directories
 	find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5 -depth -type d \( -false \
 	  -o -name .moc\* \