[SCM] qtbase packaging branch, experimental, updated. debian/5.7.1+dfsg-3-17-g2c3f320
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Thu Feb 9 17:41:54 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=2c3f320
The following commit has been merged in the experimental branch:
commit 2c3f32069566915875a9e72131a22391bf8eb388
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Thu Feb 9 20:41:25 2017 +0300
Rebuild only the object file that used qurltlds_p.h.
Not the whole qtcore.
---
debian/changelog | 2 ++
debian/rules | 5 ++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7da00b4..ea782fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ qtbase-opensource-src (5.8.0+dfsg-1) UNRELEASED; urgency=medium
* Bump Qt build-dependencies for documentation to 5.8.0, for the new
qtattributionsscanner tool.
* Remove unused code which is leftover from Qt 4.
+ * After generating qurltlds_p.h, rebuild only the corresponding source
+ file, not the whole qtcore.
[ Alexander Volkov ]
* Remove debian/90qt5-opengl script, no longer needed (refs: #850705).
diff --git a/debian/rules b/debian/rules
index 5505171..2ec29ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -227,9 +227,8 @@ override_dh_auto_build-arch:
cd $(CURDIR)/src; ../bin/qmake; make sub-corelib
# Add here the code to generate the helpers and then the headers.
LC_ALL=C.UTF-8 sh debian/generateTLDs.sh
- # Clean up the compiled code and start again.
- cd $(CURDIR)/src; make distclean
- make clean
+ # Rebuild only the object file that used the generated header.
+ rm src/corelib/.obj/qtldurl.o
dh_auto_build
override_dh_auto_install-arch:
--
qtbase packaging
More information about the pkg-kde-commits
mailing list