Qt3D: 0001-Modified-debian-files-to-create-working-debian-packa.patch

File 0001-Modified-debian-files-to-create-working-debian-packa.patch, 4.7 KB (added by FrederikHeber, 9 years ago)

patch file to Qt3D for fixing creation of debian packages with Qt4.8.1, under Ubuntu 12.04.5 (sha256sum: 35c8b5d912c9e85e5beb5ae50fdbbaecdd52b7c5ee00370def713c6223f41a13)

  • debian/control 

    From 1baeea5cc38b9f5010949cd655b3d9746f4dff00 Mon Sep 17 00:00:00 2001
From: Frederik Heber <heber@ins.uni-bonn.de>
Date: Sat, 15 Aug 2015 09:06:22 +0200
Subject: [PATCH] Modified debian files to create working debian packages.

- basically, I needed to rework the installs in debian/rules and modify the
  dependencies in debian/control.
---
 debian/control |    4 ++--
 debian/rules   |   47 ++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/debian/control b/debian/control
index 6fae1a5..a3d8c27 100644
    a b Source: libqt4-3d  
    22Section: libdevel
    33Priority: extra
    44Maintainer: Sarah Smith <sarah.j.smith@nokia.com>
    5 Build-Depends: debhelper (>= 7), libqtcore4 (>= 4.7.3), libqtgui4 (>= 4.7.3), libqt4-opengl (>= 4.7.3), libqt4-declarative-dev (>= 4.7.3), cdbs (>= 0.4.87+maemo2+0m6)
     5Build-Depends: debhelper (>= 7), libqtcore4 (>= 4.7.3), libqtgui4 (>= 4.7.3), libqt4-opengl (>= 4.7.3), cdbs (>= 0.4.87+maemo2+0m6)
    66Standards-Version: 3.8.4
    77
    88Package: libqt4-3d
    99Architecture: any
    10 Depends: libqtcore4 (>= 4.7.3), libqtgui4  (>= 4.7.3), libqt4-opengl (>= 4.7.3), libqt4-declarative (>= 4.7.3)
     10Depends: libqtcore4 (>= 4.7.3), libqtgui4  (>= 4.7.3), libqt4-opengl (>= 4.7.3)
    1111Description: Qt4 3D module
    1212 Qt is a cross-platform C++ application framework. Qt's primary feature
    1313 is its rich set of widgets that provide standard GUI functionality.

  • debian/rules 

    diff --git a/debian/rules b/debian/rules
index bfd3e9b..e9b5279 100755
    a b  
    11#!/usr/bin/make -f
    22# -*- makefile -*-
    33
    4 # This rules file is for new Nokia devices using maemo6/meego.
    5 # For fremantle / N900 see the file devices/maemo5/debian/rules.
    6 # For ubuntu desktop see the file devices/ubuntu/debian/rules.
    7 
    84# To build using this rules file:
    95# #
    106# ### install debian packaging stuff if not already present:
    … …  
    1511#
    1612# ### copy all the stuff across - cannot shadow build (probably don't want git)
    1713# (cd ~/depot/qt/quick3d && tar cf - --exclude-vcs .)|(cd quick3d-tp1 && tar xf -)
    18 #
    19 # ### if the qmake in the $PATH is not the Qt you want to use
    20 # ### you can use a binary package or a Qt built from source (even if its installed with
    21 # ### "make install") as long as it has declarative & opengl
    22 # # export PATH=/usr/local/qt/%VERSION%/bin:$PATH
     14# cp -f ~/depot/qt/quick3d/devices/ubuntu/debian/* quick3d-tp1/debian/.
    2315#
    2416# cd quick3d-tp1
    2517# export DEB_BUILD_OPTIONS="parallel=4"
    26 # dpkg-buildpackage -b
     18# fakeroot dpkg-buildpackage -b
    2719
    2820# Uncomment this to turn on verbose mode.
    2921export DH_OPTIONS=-v
    … … ifneq (,$(filter parallel=%,$(TMP_BUILD_OPTS)))  
    3931        PARALLEL_MAKEFLAGS += -j$(NUMJOBS)
    4032endif
    4133
     34ifeq (arm,$(findstring arm,$(shell g++ -v 2>&1 | sed -n '/Target: arm/p')))
     35        QMAKE_CONF_MKSPEC = -spec linux-g++-maemo
     36        QMAKE_CONF_OPTS = CONFIG+=maemo
     37endif
     38
    4239DEB_MAKE_INVOKE := $(MAKE) $(PARALLEL_MAKEFLAGS)
    4340DEB_MAKE_INSTALL_TARGET := INSTALL_ROOT=$(DEB_DESTDIR) install
    4441DEB_DH_INSTALL_SOURCEDIR := debian/tmp
    4542
    4643common-configure-arch::
    47         qmake -spec linux-g++-maemo qt3d.pro CONFIG+=maemo CONFIG+=package
     44        qmake $(QMAKE_CONF_MKSPEC) qt3d.pro $(QMAKE_CONF_OPTS) CONFIG+=package
     45
     46common-install-arch:: install-desktops
     47
     48install-desktops:
     49        mkdir -p $(DEB_DESTDIR)/usr/share/applications
     50        find . -name *.desktop -exec cp {} $(DEB_DESTDIR)/usr/share/applications \;
     51        mkdir -p $(DEB_DESTDIR)/usr/share/pixmaps
     52        find . -name icon-*.png -exec cp {} $(DEB_DESTDIR)/usr/share/pixmaps \;
     53        mkdir -p $(DEB_DESTDIR)/usr/lib/       
     54        find . -name libQt3D.so.* -exec cp {} $(DEB_DESTDIR)/usr/lib \;
     55        find . -name libQt3DQuick.so.* -exec cp {} $(DEB_DESTDIR)/usr/lib \;
     56        mkdir -p $(DEB_DESTDIR)/usr/lib/qt4/plugins
     57        find src/plugins/ -name '*.so' -exec cp {} $(DEB_DESTDIR)/usr/lib/qt4/plugins \;
     58        mkdir -p $(DEB_DESTDIR)/usr/lib/qt4/imports
     59        find src/imports -name '*.so' -exec cp {} $(DEB_DESTDIR)/usr/lib/qt4/imports \;
     60        mkdir -p $(DEB_DESTDIR)/usr/lib/pkgconfig
     61        find src/pkgconfig -name '*.pc' -exec cp {} $(DEB_DESTDIR)/usr/lib/pkgconfig \;
     62        mkdir -p $(DEB_DESTDIR)/usr/share/qt4/mkspecs/features/
     63        find ./features -exec cp {} $(DEB_DESTDIR)/usr/share/qt4/mkspecs/features/ \;
     64        mkdir -p $(DEB_DESTDIR)/usr/include/qt4/Qt3D/
     65        find src/threed -name '*.h' -P -exec cp {} $(DEB_DESTDIR)/usr/include/qt4/Qt3D/ \;
     66        mkdir -p $(DEB_DESTDIR)/usr/include/qt4/Qt3DQuick/
     67        find src/quick3d -name '*.h' -P -exec cp {} $(DEB_DESTDIR)/usr/include/qt4/Qt3DQuick/ \;
     68        mkdir -p $(DEB_DESTDIR)/usr/bin
     69        find bin -perm /+x -type f -exec cp {} $(DEB_DESTDIR)/usr/bin \;
     70        mkdir -p $(DEB_DESTDIR)/usr/share/qt4/quick3d
     71        mkdir -p $(DEB_DESTDIR)/usr/share/icons/hicolor/80x80/apps
     72