[SCM] qtbase packaging branch, experimental, updated. debian/5.5.0+dfsg-1-3-g3b15cb9

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=3b15cb9

The following commit has been merged in the experimental branch:
commit 3b15cb9e9bbf3b8c084095e46a41a2f6cc4802c0
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Jul 9 21:48:16 2015 -0300

    Bootstrap corelibs in order to be able to rebuild headers provided by upstream.
    
    To renegerate this headers we need corelibs available. But once this
    headers are rebuilt we need to rebuild corelibs.
    
    It also contains a first example: regenerating TLDs.
---
 debian/changelog       |  4 ++++
 debian/control         |  1 +
 debian/generateTLDs.sh | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 debian/rules           | 11 +++++++++++
 4 files changed, 66 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c578cc1..919c5bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtbase-opensource-src (5.5.0+dfsg-2) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Bootstrap coreutils in order to be able to rebuild some pregenerated stuff.
+    - Rebuild the TLD names list.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 12 Jul 2015 14:29:16 -0300
 
 qtbase-opensource-src (5.5.0+dfsg-1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 8440a48..65aa029 100644
--- a/debian/control
+++ b/debian/control
@@ -60,6 +60,7 @@ Build-Depends: debhelper (>= 9),
                libxkbcommon-x11-dev,
                libxrender-dev,
                pkg-kde-tools (>= 0.15.17),
+               publicsuffix,
                unixodbc-dev,
                zlib1g-dev
 Build-Conflicts: libmariadbclient-dev
diff --git a/debian/generateTLDs.sh b/debian/generateTLDs.sh
new file mode 100644
index 0000000..49503a0
--- /dev/null
+++ b/debian/generateTLDs.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+# Copyright (c) 2015 Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+DESTHEADER=src/corelib/io/qurltlds_p.h
+
+mv -f $DESTHEADER $DESTHEADER.orig
+
+cd util/corelib/qurl-generateTLDs
+../../../bin/qmake -makefile qurl-generateTLDs.pro
+make
+
+# Prepare the data.
+grep '^[^\/\/]' /usr/share/publicsuffix/effective_tld_names.dat > effective_tld_names.dat.trimmed
+
+cat << EOF >> ../../../$DESTHEADER
+#ifndef QURLTLD_P_H
+#define QURLTLD_P_H
+
+QT_BEGIN_NAMESPACE
+
+EOF
+
+LD_PRELOAD=../../../lib/libQt5Core.so.5 ./qurl-generateTLDs effective_tld_names.dat.trimmed effective_tld_names.dat.qt
+cat effective_tld_names.dat.qt >> ../../../$DESTHEADER
+
+cat << EOF >> ../../../$DESTHEADER
+
+QT_END_NAMESPACE
+
+#endif // QURLTLD_P_H
+EOF
diff --git a/debian/rules b/debian/rules
index adc79c9..9c33a31 100755
--- a/debian/rules
+++ b/debian/rules
@@ -221,6 +221,17 @@ override_dh_auto_build-indep:
 	cd $(CURDIR)/src/xml; ../../bin/qmake
 	dh_auto_build -Smakefile -- html_docs
 
+override_dh_auto_build-arch:
+	# Bootstrap corelibs in order to be able to build the helper tools to
+	# regenerate some upstream-provided files.
+	cd $(CURDIR)/src; ../bin/qmake; make sub-corelib
+	# Add here the code to generate the helpers and then the headers.
+	sh debian/generateTLDs.sh
+	# Clean up the compiled code and start again.
+	cd $(CURDIR)/src; make distclean
+	make clean
+	dh_auto_build
+
 override_dh_auto_install-arch:
 	dh_auto_install -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp/
 

-- 
qtbase packaging