Skip to contentSkip to conversation

maliit-framework-qt5: Always have optimize flags

PATCH New Khem Raj 1 participant 2 messages Jul 12, 2017

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 maliit-framework-qt5: Always have optimize flags

When building with hardening flags we need some optlevel > 0 enabled, otherwise FORTIFY_SOURCE wont work

Fixes
maliit-framework-qt5/0.99.0+git999-r0/recipe-sysroot/usr/include/features.h:376:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp ]

|  #  warning _FORTIFY_SOURCE requires compiling with optimization (-O)
|     ^~~~~~~
---
 ...ig.pri-Use-O1-optimization-in-DEBUG-flags.patch | 34 ++++++++++++++++++++++
 recipes-qt/maliit/maliit-framework-qt5_git.bb      |  8 ++---
 2 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 recipes-qt/maliit/maliit-framework-qt5/0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch
recipes-qt/maliit/maliit-framework-qt5/0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch new file +34 -0
new file mode 100644
index 0000000..7356034
@@ -0,0 +1,34 @@
+From cb38c078fa34a3d0cff6bc195edd9f507477d2e1 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Wed, 12 Jul 2017 11:45:06 -0700
+Subject: [PATCH] config.pri: Use -O1 optimization in DEBUG flags
+
+when building wit FORTIFY_SOURCES we need some level of
+optimization turned on for the compile to succeed
+
+O1 is a good compromise between debug quality and
+optimization level.
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+ config.pri | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/config.pri b/config.pri
+index 1505f9d..7cc196a 100644
+--- a/config.pri
++++ b/config.pri
+@@ -13,8 +13,8 @@ include(defines.pri)
+ # Linker optimization for release build
+ QMAKE_LFLAGS_RELEASE+=-Wl,--as-needed
+ # Compiler warnings are error if the build type is debug
+-QMAKE_CXXFLAGS_DEBUG+=-Werror -O0
+-QMAKE_CFLAGS_DEBUG+=-Werror -O0
++QMAKE_CXXFLAGS_DEBUG+=-Werror -O1
++QMAKE_CFLAGS_DEBUG+=-Werror -O1
+ 
+ OBJECTS_DIR = .obj
+ MOC_DIR = .moc
+-- 
+2.13.2
+
recipes-qt/maliit/maliit-framework-qt5_git.bb +4 -4
index 62a7209..e0a0e0e 100644
@@ -7,9 +7,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=5c917f6ce94ceb8d8d5e16e2fca5b9ad"
 inherit qmake5 qmake5_paths
 
 SRC_URI = "git://github.com/maliit/framework.git;branch=master \
-    file://0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch \
-    file://maliit-server.desktop \
-"
+           file://0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch \
+           file://maliit-server.desktop \
+           file://0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch \
+           "
 
 SRCREV = "60b1b10de14f932420313c547ab801daf522d539"
 PV = "0.99.0+git${SRCPV}"
@@ -57,7 +58,6 @@ EXTRA_QMAKEVARS_PRE = "\
     CONFIG+=enable-dbus-activation \
     CONFIG+=qt5-inputcontext \
 "
-
 EXTRA_OEMAKE += "INSTALL_ROOT=${D}"
 
 do_install_append() {
Signature · 1 line
2.13.2
author
#1 lore raw

PATCH 2/2 qt5-creator: Fix build with NO_ACCESSIBILITY

Also add missing headers in sources

---
 ...-Fix-compilation-with-QT_NO_ACCESSIBILITY.patch | 38 ++++++++++++++++++++
 .../0001-Qmlpuppet-add-missing-includes.patch      | 41 ++++++++++++++++++++++
 recipes-qt/qt5/qt5-creator_3.5.1.bb                |  2 ++
 3 files changed, 81 insertions(+)
 create mode 100644 recipes-qt/qt5/qt5-creator/0001-Fix-compilation-with-QT_NO_ACCESSIBILITY.patch
 create mode 100644 recipes-qt/qt5/qt5-creator/0001-Qmlpuppet-add-missing-includes.patch
recipes-qt/qt5/qt5-creator/0001-Fix-compilation-with-QT_NO_ACCESSIBILITY.patch new file +38 -0
new file mode 100644
index 0000000..9e90bab
@@ -0,0 +1,38 @@
+From 429347dda56a4d45dc03fee2362eb02294161bfd Mon Sep 17 00:00:00 2001
+From: Eike Ziller <[email protected]>
+Date: Fri, 24 Jun 2016 10:23:24 +0200
+Subject: [PATCH] Fix compilation with QT_NO_ACCESSIBILITY
+
+Task-number: QTCREATORBUG-16446
+Change-Id: If75122c23a697f26ccf56391fe2e8d316aad6367
+Reviewed-by: hjk <[email protected]>
+---
+ src/libs/utils/fancymainwindow.cpp | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/libs/utils/fancymainwindow.cpp b/src/libs/utils/fancymainwindow.cpp
+index 9477f17..1ee425f 100644
+--- a/src/libs/utils/fancymainwindow.cpp
++++ b/src/libs/utils/fancymainwindow.cpp
+@@ -159,13 +159,16 @@ public:
+ 
+         m_floatButton = new DockWidgetTitleButton(this);
+         m_floatButton->setIcon(q->style()->standardIcon(QStyle::SP_TitleBarNormalButton, &opt, q));
+-        m_floatButton->setAccessibleName(QDockWidget::tr("Float"));
+-        m_floatButton->setAccessibleDescription(QDockWidget::tr("Undocks and re-attaches the dock widget"));
+ 
+         m_closeButton = new DockWidgetTitleButton(this);
+         m_closeButton->setIcon(q->style()->standardIcon(QStyle::SP_TitleBarCloseButton, &opt, q));
++
++#ifndef QT_NO_ACCESSIBILITY
++        m_floatButton->setAccessibleName(QDockWidget::tr("Float"));
++        m_floatButton->setAccessibleDescription(QDockWidget::tr("Undocks and re-attaches the dock widget"));
+         m_closeButton->setAccessibleName(QDockWidget::tr("Close"));
+         m_closeButton->setAccessibleDescription(QDockWidget::tr("Closes the dock widget"));
++#endif
+ 
+         setActive(false);
+ 
+-- 
+2.13.2
+
recipes-qt/qt5/qt5-creator/0001-Qmlpuppet-add-missing-includes.patch new file +41 -0

41 lines not on this page · raw message

recipes-qt/qt5/qt5-creator_3.5.1.bb +2 -0
index f4ba858..c85f38c 100644
@@ -21,6 +21,8 @@ DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qtto
 SRC_URI = " \
     http://download.qt.io/official_releases/qtcreator/3.5/${PV}/qt-creator-opensource-src-${PV}.tar.gz \
     file://0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch \
+    file://0001-Fix-compilation-with-QT_NO_ACCESSIBILITY.patch \
+    file://0001-Qmlpuppet-add-missing-includes.patch \
     file://qtcreator.desktop.in \
 "
 SRC_URI[md5sum] = "77aef7df837eba07c7ce6037ee504c05"
Signature · 1 line
2.13.2