Changeset 137668fd for x

Timestamp:

05/28/2024 06:33:45 PM (7 weeks ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

gimp3, trunk

Children:

834293c

Parents:

50ceedf6 (diff), 3ef6534e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'trunk' of git.linuxfromscratch.org:blfs into trunk

File:

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

x/lib/qt6.xml

@@ -271 +271 @@
       </para>
     </note>
+
+    <para>
+        Disable a conflicting declaration on i686 systems:
+    </para>
+<screen><userinput>if [ "$(uname -m)" == "i686" ]; then
+    sed -e "/^#elif defined(Q_CC_GNU_ONLY)/s/.*/&amp; \&amp;\&amp; 0/" \
+        -i qtbase/src/corelib/global/qtypes.h
+fi</userinput></screen>
 
     <para>