Changeset fb79d0a

Timestamp:

05/16/2021 11:13:22 PM (2 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

11.0, 11.1, 11.2, 11.3, ken/inkscape-core-mods, lazarus, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226

Children:

cbb1dd2

Parents:

25ef5f7

Message:

Fix qt fo rgcc-11.

File:

• x/lib/qt5.xml (modified) (1 diff)

x/lib/qt5.xml

@@ -245 +245 @@
             -examplesdir    /usr/share/doc/qt5/examples</userinput></screen>
     </note>
-<!-- Applied upstream in 5.15.0
-    <para>
-      First fix an issues using gcc-10:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../qt-everywhere-src-&qt5-version;-gcc10-1.patch</userinput></screen>
--->
+
+    <para>
+      First fix some issues using gcc-11:
+    </para>
+
+<screen><userinput>
+sed -i '/string/a #include&lt;limits&gt;'      qtbase/src/corelib/global/qfloat16.h &amp;&amp;
+sed -i '/qbytearray/a #include&lt;limits&gt;'  qtbase/src/corelib/text/qbytearraymatcher.h &amp;&amp;
+sed -i '/type_traits/a #include&lt;limits&gt;' qtdeclarative/src/qmldebug/qqmlprofilerevent_p.h</userinput></screen>
 
     <para>