[SCM] qtbase packaging branch, experimental, updated. debian/5.4.1+dfsg-2-40-g4e3cb19

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 5aaeaf03d53e9086e377b819599d2b74f0c84ce6
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon May 25 19:34:10 2015 -0300

    Remove make_qglobal_h_complain_if_you_use_fpie.patch
    
    Applied upstream.
---
 debian/changelog                                   |  1 +
 .../make_qglobal_h_complain_if_you_use_fpie.patch  | 39 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 27e7db1..75a9593 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ qtbase-opensource-src (5.4.1+dfsg-5) UNRELEASED; urgency=medium
     - xcb_delay_showing_tray_icon_window_until_it_is_embedded.patch
     - require_fpic_instead_of_fpie.patch
     - try_to_ensure_that_fpic_is_used_in_cmake_builds.patch
+    - make_qglobal_h_complain_if_you_use_fpie.patch
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 18 May 2015 18:35:01 -0300
 
diff --git a/debian/patches/make_qglobal_h_complain_if_you_use_fpie.patch b/debian/patches/make_qglobal_h_complain_if_you_use_fpie.patch
deleted file mode 100644
index 4bdefa9..0000000
--- a/debian/patches/make_qglobal_h_complain_if_you_use_fpie.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 3eca75de67b3fd2c890715b30c7899cebc096fe9 Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira at intel.com>
-Date: Mon, 11 May 2015 18:30:00 +0900
-Subject: [PATCH] Make qglobal.h complain if you use -fPIE
-
-Prior to Qt 5.4.2 (commit 36d6eb721e7d5997ade75e289d4088dc48678d0d), we
-allowed it, but now we need to enforce that it is not used. Note that
--fPIE does define __PIC__, so we need this to catch the use of -fPIE.
-
-[ChangeLog][Important Behavior Changes] On x86 and x86-64 systems with
-ELF binaries (especially Linux), due to a new optimization in GCC 5.x in
-combination with a recent version of GNU binutils, compiling Qt
-applications with -fPIE is no longer enough. Applications now need to be
-compiled with the -fPIC option if Qt's option "reduce relocations" is
-active. Note that Clang is known to generate incompatible code even with
--fPIC if the -flto option is active.
-
-Task-number: QTBUG-45755
-Change-Id: I66a35ce5f88941f29aa6ffff13dd210e0aa2728f
-Reviewed-by: Dmitry Shachnev <mitya57 at gmail.com>
-Reviewed-by: Simon Hausmann <simon.hausmann at theqtcompany.com>
----
- src/corelib/global/qglobal.h |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/src/corelib/global/qglobal.h
-+++ b/src/corelib/global/qglobal.h
-@@ -1046,9 +1046,9 @@ Q_CORE_EXPORT int qrand();
- #  define QT_NO_SHAREDMEMORY
- #endif
- 
--#if !defined(QT_BOOTSTRAPPED) && defined(QT_REDUCE_RELOCATIONS) && defined(__ELF__) && !defined(__PIC__)
-+#if !defined(QT_BOOTSTRAPPED) && defined(QT_REDUCE_RELOCATIONS) && defined(__ELF__) && (!defined(__PIC__) || defined(__PIE__))
- #  error "You must build your code with position independent code if Qt was built with -reduce-relocations. "\
--         "Compile your code with -fPIC."
-+         "Compile your code with -fPIC (-fPIE is not enough)."
- #endif
- 
- namespace QtPrivate {
diff --git a/debian/patches/series b/debian/patches/series
index 81cd48f..1645bc2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@
 upstream_small-improvements-to-the-hurd-g-mkspec.patch
 upstream_Complete-MIPS-atomic-support-on-pre-MIPS32-architect.patch
 gnukfreebsd.diff
-make_qglobal_h_complain_if_you_use_fpie.patch
 fixes_crash_in_bmp_and_ico_image_decoders.patch
 fixes_crash_in_gif_image_decoder.patch
 tst_QNetworkDiskCache-Stop-using-actual-web-servers.patch

-- 
qtbase packaging