[SCM] qtbase packaging branch, experimental, updated. debian/5.4.1+dfsg-2-37-gab91ed9
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Mon May 25 22:32:37 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=1e36be2
The following commit has been merged in the experimental branch:
commit 1e36be2dab70cf5eac244c3542ccaeb60748da1e
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Mon May 25 19:29:17 2015 -0300
Remove require_fpic_instead_of_fpie.patch.
Already present in upstream.
---
debian/changelog | 1 +
debian/patches/require_fpic_instead_of_fpie.patch | 115 ----------------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 116 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 57f7baf..d03fa26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ qtbase-opensource-src (5.4.1+dfsg-5) UNRELEASED; urgency=medium
- cve-2015-0295.diff
- qtsystemtrayicon_handle_submenus_correctly.patch
- xcb_delay_showing_tray_icon_window_until_it_is_embedded.patch
+ - require_fpic_instead_of_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/require_fpic_instead_of_fpie.patch b/debian/patches/require_fpic_instead_of_fpie.patch
deleted file mode 100644
index e9b8e83..0000000
--- a/debian/patches/require_fpic_instead_of_fpie.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 36d6eb721e7d5997ade75e289d4088dc48678d0d Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira at intel.com>
-Date: Tue, 5 May 2015 08:43:42 -0700
-Subject: [PATCH] Require -fPIC instead of just -fPIE for -reduce-relocations
-
-GCC 5 combined with a recent binutils have a new optimization that
-allows them to generate copy relocations even in -fPIE code. Clang has
-the same functionality when compiling an executable with -flto. We need
-to let the compilers know that they cannot use copy relocations, so they
-need to use really position-independent code.
-
-Position independent code throughout is not really required. We just
-need the compilers to use position-independent access to symbols coming
-from the Qt libraries, but there's currently no other way of doing that.
-
-Task-number: QTBUG-45755
-Change-Id: I0d4913955e3745b69672ffff13db5df7377398c5
-Reviewed-by: Simon Hausmann <simon.hausmann at theqtcompany.com>
-Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen at theqtcompany.com>
----
- mkspecs/common/gcc-base.conf | 2 +-
- mkspecs/common/qcc-base.conf | 2 +-
- mkspecs/linux-icc/qmake.conf | 2 +-
- src/corelib/Qt5CoreConfigExtras.cmake.in | 2 +-
- src/corelib/global/qglobal.h | 4 ++--
- tests/auto/tools/moc/tst_moc.cpp | 6 +++---
- 6 files changed, 9 insertions(+), 9 deletions(-)
-
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -42,7 +42,7 @@ QMAKE_CFLAGS_RELEASE += $$QMAKE_CF
- QMAKE_CFLAGS_DEBUG += -g
- QMAKE_CFLAGS_SHLIB += -fPIC
- QMAKE_CFLAGS_STATIC_LIB += -fPIC
--QMAKE_CFLAGS_APP += -fPIE
-+QMAKE_CFLAGS_APP += -fPIC
- QMAKE_CFLAGS_ISYSTEM = -isystem
- QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses
- QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
---- a/mkspecs/common/qcc-base.conf
-+++ b/mkspecs/common/qcc-base.conf
-@@ -23,7 +23,7 @@ QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $
- QMAKE_CFLAGS_DEBUG += -g
- QMAKE_CFLAGS_SHLIB += -fPIC -shared
- QMAKE_CFLAGS_STATIC_LIB += -fPIC
--QMAKE_CFLAGS_APP += -fPIE
-+QMAKE_CFLAGS_APP += -fPIC
- QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses
- QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
- QMAKE_CFLAGS_SSE2 += -msse2
---- a/mkspecs/linux-icc/qmake.conf
-+++ b/mkspecs/linux-icc/qmake.conf
-@@ -12,7 +12,7 @@ QMAKE_LEXFLAGS =
- QMAKE_YACC = yacc
- QMAKE_YACCFLAGS = -d
- QMAKE_CFLAGS =
--QMAKE_CFLAGS_APP = -fPIE
-+QMAKE_CFLAGS_APP = -fPIC
- QMAKE_CFLAGS_DEPS = -M
- QMAKE_CFLAGS_WARN_ON = -w1 -Wall -Wcheck -wd1572,873,2259,2261
- QMAKE_CFLAGS_WARN_OFF = -w
---- 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__) && !defined(__PIE__)
-+#if !defined(QT_BOOTSTRAPPED) && defined(QT_REDUCE_RELOCATIONS) && defined(__ELF__) && !defined(__PIC__)
- # error "You must build your code with position independent code if Qt was built with -reduce-relocations. "\
-- "Compile your code with -fPIC or -fPIE."
-+ "Compile your code with -fPIC."
- #endif
-
- namespace QtPrivate {
---- a/tests/auto/tools/moc/tst_moc.cpp
-+++ b/tests/auto/tools/moc/tst_moc.cpp
-@@ -662,7 +662,7 @@ void tst_Moc::oldStyleCasts()
-
- QStringList args;
- args << "-c" << "-x" << "c++" << "-Wold-style-cast" << "-I" << "."
-- << "-I" << qtIncludePath << "-o" << "/dev/null" << "-fPIE" << "-";
-+ << "-I" << qtIncludePath << "-o" << "/dev/null" << "-fPIC" << "-";
- proc.start("gcc", args);
- QVERIFY(proc.waitForStarted());
- proc.write(mocOut);
-@@ -732,7 +732,7 @@ void tst_Moc::inputFileNameWithDotsButNo
-
- QStringList args;
- args << "-c" << "-x" << "c++" << "-I" << ".."
-- << "-I" << qtIncludePath << "-o" << "/dev/null" << "-fPIE" << "-";
-+ << "-I" << qtIncludePath << "-o" << "/dev/null" << "-fPIC" << "-";
- proc.start("gcc", args);
- QVERIFY(proc.waitForStarted());
- proc.write(mocOut);
-@@ -1011,7 +1011,7 @@ void tst_Moc::ignoreOptionClashes()
- // If -pthread wasn't ignored, it was parsed as a prefix of "thread/", which breaks compilation.
- QStringList gccArgs;
- gccArgs << "-c" << "-x" << "c++" << "-I" << ".."
-- << "-I" << qtIncludePath << "-I" << includeDir << "-o" << "/dev/null" << "-fPIE" << "-";
-+ << "-I" << qtIncludePath << "-I" << includeDir << "-o" << "/dev/null" << "-fPIC" << "-";
- proc.start("gcc", gccArgs);
- QVERIFY(proc.waitForStarted());
- proc.write(mocOut);
---- a/src/corelib/Qt5CoreConfigExtras.cmake.in
-+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
-@@ -72,7 +72,7 @@ set(_qt5_corelib_extra_includes)
- # macro to add it.
- set(Qt5_POSITION_INDEPENDENT_CODE True)
- set_property(TARGET Qt5::Core PROPERTY INTERFACE_POSITION_INDEPENDENT_CODE \"ON\")
--set(Qt5Core_EXECUTABLE_COMPILE_FLAGS \"-fPIE\")
-+set(Qt5Core_EXECUTABLE_COMPILE_FLAGS \"-fPIC\")
- !!ENDIF
-
- !!IF !isEmpty(QT_NAMESPACE)
diff --git a/debian/patches/series b/debian/patches/series
index 042f824..7a9175c 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
-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
fixes_crash_in_bmp_and_ico_image_decoders.patch
--
qtbase packaging
More information about the pkg-kde-commits
mailing list