[SCM] qtwebengine packaging branch, master, updated. debian/5.9.2+dfsg-1-2-gf528c60

Dmitry Shachnev mitya57 at moszumanska.debian.org
Fri Oct 27 18:35:00 UTC 2017


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

The following commit has been merged in the master branch:
commit d68a431414825a7b2ccc256f6baa6cf3100d9b40
Author: Sandro Knauß <hefee at debian.org>
Date:   Wed Oct 18 00:15:16 2017 +0200

    Remove upstream applied patch: armhf-options.patch
---
 debian/changelog                   |  1 +
 debian/patches/armhf-options.patch | 18 ------------------
 debian/patches/series              |  1 -
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index af20c7e..69e37d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtwebengine-opensource-src (5.9.2+dfsg-1~) UNRELEASED; urgency=medium
 
   [ Sandro Knauß ]
   * New upstream release.
+  * Remove upstream applied patch: armhf-options.patch
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 17 Oct 2017 23:57:46 +0200
 
diff --git a/debian/patches/armhf-options.patch b/debian/patches/armhf-options.patch
deleted file mode 100644
index 796679f..0000000
--- a/debian/patches/armhf-options.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: apply ARM options on host builds too
- Is is needed to make sure NEON is not used on Debian armhf.
- This partially reverts upstream commit f0fc1606d5b6d2ad.
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Forwarded: no
-Last-Update: 2017-07-20
-
---- a/src/core/config/linux.pri
-+++ b/src/core/config/linux.pri
-@@ -41,7 +41,7 @@
-     !isEmpty(TOOLCHAIN_SYSROOT): gn_args += target_sysroot=\"$${TOOLCHAIN_SYSROOT}\"
- }
- 
--contains(QT_ARCH, "arm"):!host_build {
-+contains(QT_ARCH, "arm") {
-     # Extract ARM specific compiler options that we have to pass to gn,
-     # but let gn figure out a default if an option is not present.
-     MTUNE = $$extractCFlag("-mtune=.*")
diff --git a/debian/patches/series b/debian/patches/series
index d5538bd..066d909 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@ system-icu-utf.patch
 no-icudtl-dat.patch
 disable-last_commit_position.patch
 verbose-gn-bootstrap.patch
-armhf-options.patch

-- 
qtwebengine packaging



More information about the pkg-kde-commits mailing list