Changeset 49b913d2 for x/lib

Timestamp:

10/19/2023 05:29:35 PM (7 months ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

12.1, ken/TL2024, ken/tuningfonts, lazarus, plabs/newcss, python3.11, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18

Children:

a1492906

Parents:

e2cae8d

Message:

Update to libxkbcommon-1.6.0.

libxkbcommon-1.6.0 removes some definitions that are unused.
These definitions are referenced in qtbase so we remove them
with a sed for both the full qt5 package and gt5-alternate.

Location:

x/lib

Files:

• qt5-alternate.xml (modified) (1 diff)
• qt5.xml (modified) (1 diff)

x/lib/qt5-alternate.xml

@@ -247 +247 @@
 
     <para>
-      The patch is supposed to be used in a git repository, because the
+      The patch is supposed to be used in a git repository. Because the
       behavior of the <command>configure</command> command below is changed
-      in this case. It is enough to create a
+      in this case, it is enough to create a
       <filename class="directory">.git</filename> directory in the
-      <filename class="directory">qmake</filename> directory, where the
+      <filename class="directory">qmake</filename> directory where the
       <command>configure</command> script is run:
     </para>
 
     <screen><userinput remap="pre">mkdir -pv qtbase/.git</userinput></screen>
+
+    <para>
+      The libxkbcommon-1.6.0 package removes some definitions that are not used.  Remove 
+      those here also:
+    </para>
+
+    <screen><userinput>sed -i '276,279d' qtbase/src/platformsupport/input/xkbcommon/qxkbcommon.cpp</userinput></screen>
 
     <para>

x/lib/qt5.xml

@@ -276 +276 @@
 
     <para>
-      The patch is supposed to be used in a git repository, because the
+      The patch is supposed to be used in a git repository. Because the
       behavior of the <command>configure</command> command below is changed
-      in this case. It is enough to create a
+      in this case, it is enough to create a
       <filename class="directory">.git</filename> directory in the
-      <filename class="directory">qmake</filename> directory, where the
+      <filename class="directory">qmake</filename> directory where the
       <command>configure</command> script is run:
     </para>
 
     <screen><userinput remap="pre">mkdir -pv qtbase/.git</userinput></screen>
+
+    <para>
+      The libxkbcommon-1.6.0 package removes some definitions that are not used.  Remove 
+      those here also:
+    </para>
+
+    <screen><userinput>sed -i '276,279d' qtbase/src/platformsupport/input/xkbcommon/qxkbcommon.cpp</userinput></screen>
 
     <para>