Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (cd056249c464e238d5dabf93aa2f4571fc424a21)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (cd056249c464e238d5dabf93aa2f4571fc424a21)
  • Date: Wed, 2 Jun 2021 10:54:22 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

ChangeLog | 3
FUNCTIONS | 1
archive-libs/snappy/BUILD | 4
archive-libs/snappy/HISTORY | 4
archive-libs/snappy/PRE_BUILD | 4
qt5/qtbase/HISTORY | 3
qt5/qtbase/patches/0001-Fix-build-with-GCC-11-include-limits.patch | 53
++++++++
qt5/qtbase/patches/0002-Build-fixes-for-GCC-11.patch | 59
++++++++++
8 files changed, 131 insertions(+)

New commits:
commit cd056249c464e238d5dabf93aa2f4571fc424a21
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

snappy - fix build with gcc-11

commit 8622c43a1957adb3e3e75c202bf75c8308981e95
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

cmake_build - fix libdir

commit 213ac6bbe3e23559745ca5890e6cdd11e7c925d7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qtbase - fix buid with gcc-11

diff --git a/ChangeLog b/ChangeLog
index ddd5859..c50109c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2021-06-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * FUNCTIONS: cmake_build - fix libdir
+
2021-05-30 Ismael Luceno <ismael AT sourcemage.org>
* net/ifupdown-ng: new spell, flexible ifup/ifdown implementation

diff --git a/FUNCTIONS b/FUNCTIONS
index e0613ea..478a0fc 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -691,6 +691,7 @@ cmake_build() {
fi &&

cmake -DCMAKE_INSTALL_PREFIX=$CMAKE_INSTALL_PREFIX \
+ -DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_INSTALL_SYSCONFDIR=$INSTALL_ROOT/etc \
-DCMAKE_BUILD_TYPE=$CM_BUILD_TYPE \
-DCMAKE_C_FLAGS_RELEASE="$CFLAGS" \
diff --git a/archive-libs/snappy/BUILD b/archive-libs/snappy/BUILD
index c17ba01..38e74b8 100755
--- a/archive-libs/snappy/BUILD
+++ b/archive-libs/snappy/BUILD
@@ -1,3 +1,7 @@
+CXXFLAGS+=" -Wno-ignored-attributes" &&
+CXXFLAGS+=" -Wno-attributes" &&
+
+
OPTS+=" -DBUILD_SHARED_LIBS=1" &&
OPTS+=" -DSNAPPY_BUILD_TESTS=off" &&
OPTS+=" -DSNAPPY_BUILD_BENCHMARKS=off" &&
diff --git a/archive-libs/snappy/HISTORY b/archive-libs/snappy/HISTORY
index b774e78..10b75c1 100644
--- a/archive-libs/snappy/HISTORY
+++ b/archive-libs/snappy/HISTORY
@@ -1,3 +1,7 @@
+2021-06-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: fix for gcc-11
+ * BUILD: suppress some warnings
+
2021-05-09 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS, DEPENDS: 1.1.9

diff --git a/archive-libs/snappy/PRE_BUILD b/archive-libs/snappy/PRE_BUILD
new file mode 100755
index 0000000..b4cbfe1
--- /dev/null
+++ b/archive-libs/snappy/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build
+cd $SOURCE_DIRECTORY &&
+# inlining fails with gcc-11
+sed -i '/HAVE_ATTRIBUTE_ALWAYS_INLINE/D' cmake/config.h.in
diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY
index 0226adf..0a2922b 100644
--- a/qt5/qtbase/HISTORY
+++ b/qt5/qtbase/HISTORY
@@ -1,3 +1,6 @@
+2021-06-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * patches/*gcc*: fix build wit gcc-11
+
2020-11-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.15.2

diff --git
a/qt5/qtbase/patches/0001-Fix-build-with-GCC-11-include-limits.patch
b/qt5/qtbase/patches/0001-Fix-build-with-GCC-11-include-limits.patch
new file mode 100644
index 0000000..6a66588
--- /dev/null
+++ b/qt5/qtbase/patches/0001-Fix-build-with-GCC-11-include-limits.patch
@@ -0,0 +1,53 @@
+From 8252ef5fc6d043004ddf7085e1c1fe1bf2ca39f7 Mon Sep 17 00:00:00 2001
+From: Thiago Macieira <thiago.macieira AT intel.com>
+Date: Mon, 18 Jan 2021 07:40:54 -0800
+Subject: [PATCH 1/2] Fix build with GCC 11: include <limits>
+
+Fixes: QTBUG-90395
+Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40
+(cherry picked from commit 9c56d4da2ff631a8c1c30475bd792f6c86bda53c)
+Reviewed-by: Edward Welbourne <edward.welbourne AT qt.io>
+(cherry picked from commit b2af6332ea37e45ab230a7a5d2d278f86d961b83)
+---
+ src/corelib/global/qendian.h | 6 ++++--
+ src/corelib/global/qfloat16.h | 1 +
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h
+index 257efbbdbe..339f53abb6 100644
+--- a/src/corelib/global/qendian.h
++++ b/src/corelib/global/qendian.h
+@@ -1,7 +1,7 @@
+
/****************************************************************************
+ **
+-** Copyright (C) 2016 The Qt Company Ltd.
+-** Copyright (C) 2016 Intel Corporation.
++** Copyright (C) 2021 The Qt Company Ltd.
++** Copyright (C) 2021 Intel Corporation.
+ ** Contact: https://www.qt.io/licensing/
+ **
+ ** This file is part of the QtCore module of the Qt Toolkit.
+@@ -44,6 +44,8 @@
+ #include <QtCore/qfloat16.h>
+ #include <QtCore/qglobal.h>
+
++#include <limits>
++
+ // include stdlib.h and hope that it defines __GLIBC__ for glibc-based
systems
+ #include <stdlib.h>
+ #include <string.h>
+diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h
+index c7a9c87af3..5302be072e 100644
+--- a/src/corelib/global/qfloat16.h
++++ b/src/corelib/global/qfloat16.h
+@@ -43,6 +43,7 @@
+
+ #include <QtCore/qglobal.h>
+ #include <QtCore/qmetatype.h>
++#include <limits>
+ #include <string.h>
+
+ #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) &&
!defined(__F16C__)
+--
+2.31.1
+
diff --git a/qt5/qtbase/patches/0002-Build-fixes-for-GCC-11.patch
b/qt5/qtbase/patches/0002-Build-fixes-for-GCC-11.patch
new file mode 100644
index 0000000..2918ca1
--- /dev/null
+++ b/qt5/qtbase/patches/0002-Build-fixes-for-GCC-11.patch
@@ -0,0 +1,59 @@
+From cb2da673f53815a5cfe15f50df49b98032429f9e Mon Sep 17 00:00:00 2001
+From: Ville Voutilainen <ville.voutilainen AT qt.io>
+Date: Mon, 18 Jan 2021 09:58:17 +0200
+Subject: [PATCH 2/2] Build fixes for GCC 11
+
+Task-number: QTBUG-89977
+Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21
+Reviewed-by: Lars Knoll <lars.knoll AT qt.io>
+Reviewed-by: Thiago Macieira <thiago.macieira AT intel.com>
+(cherry picked from commit 813a928c7c3cf98670b6043149880ed5c955efb9)
+---
+ src/corelib/text/qbytearraymatcher.h | 2 ++
+ src/corelib/tools/qsharedpointer_impl.h | 3 ---
+ src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +-
+ 3 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/corelib/text/qbytearraymatcher.h
b/src/corelib/text/qbytearraymatcher.h
+index 0eedfc1d20..f5f9bef7b8 100644
+--- a/src/corelib/text/qbytearraymatcher.h
++++ b/src/corelib/text/qbytearraymatcher.h
+@@ -42,6 +42,8 @@
+
+ #include <QtCore/qbytearray.h>
+
++#include <limits>
++
+ QT_BEGIN_NAMESPACE
+
+
+diff --git a/src/corelib/tools/qsharedpointer_impl.h
b/src/corelib/tools/qsharedpointer_impl.h
+index 790c187cb9..4aee98af53 100644
+--- a/src/corelib/tools/qsharedpointer_impl.h
++++ b/src/corelib/tools/qsharedpointer_impl.h
+@@ -155,9 +155,6 @@ namespace QtSharedPointer {
+ #endif
+ inline void checkQObjectShared(...) { }
+ inline void setQObjectShared(...) { }
+-
+- inline void operator delete(void *ptr) { ::operator delete(ptr); }
+- inline void operator delete(void *, void *) { }
+ };
+ // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit)
+
+diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp
b/src/plugins/platforms/xcb/qxcbwindow.cpp
+index 9e7e1a5572..f0866a90ac 100644
+--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
++++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
+@@ -698,7 +698,7 @@ void QXcbWindow::show()
+ if (isTransient(window())) {
+ const QWindow *tp = window()->transientParent();
+ if (tp && tp->handle())
+- transientXcbParent = static_cast<const QXcbWindow
*>(tp->handle())->winId();
++ transientXcbParent = tp->handle()->winId();
+ // Default to client leader if there is no transient parent,
else modal dialogs can
+ // be hidden by their parents.
+ if (!transientXcbParent)
+--
+2.31.1
+



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (cd056249c464e238d5dabf93aa2f4571fc424a21), Treeve Jelbert, 06/02/2021

Archive powered by MHonArc 2.6.24.

Top of Page