Changeset ad6afb24 for lxqt/desktop/lxqt-panel.xml

Timestamp:

02/21/2017 09:04:52 AM (7 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

8027c69

Parents:

ac75c3d1

Message:

Fix lxqt-panel build (thanks to arch linux)

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@18375 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• lxqt/desktop/lxqt-panel.xml (modified) (3 diffs)

lxqt/desktop/lxqt-panel.xml

@@ -114 +114 @@
     </para>
 
-<screen><userinput>sed -e 's:&lt;KF5/KWindowSystem/:&lt;:' \
-    -i plugin-taskbar/lxqttaskgroup.{h,cpp} &amp;&amp;
+<screen><userinput>sed -e 's:&lt;KF5/KWindowSystem/:&lt;:'               \
+    -i plugin-taskbar/lxqttaskgroup.{h,cpp}     &amp;&amp;
+sed -e '\@&lt;xcb/xkb.h@a #undef explicit'         \
+    -i plugin-kbindicator/src/x11/kbdlayout.cpp &amp;&amp;
 
 mkdir -v build &amp;&amp;
@@ -149 +151 @@
 
     <para>
+      <command>sed ... kbdlayout.cpp</command>: Fixes an upstream workaround
+      for a namespace conflict. See <ulink
+url="https://git.archlinux.org/svntogit/community.git/tree/trunk/fix-build.patch?h=packages/lxqt-panel">
+      this archlinux patch</ulink>.
+    </para>
+    <para>
       <parameter>-DPULL_TRANSLATIONS=no</parameter>: Removes the need for
       <xref linkend="git"/>, which would otherwise be requested to download
@@ -155 +163 @@
 
     <para>
-      <option>-D&lt;plugin&gt;_PLUGIN=no</option>: Disable $lt;plugin&gt;,
+      <option>-D&lt;plugin&gt;_PLUGIN=no</option>: Disable &lt;plugin&gt;,
       where &lt;plugin&gt; may be CLOCK, COLORPICKER, CPULOAD, DIRECTORYMENU,
       DESKTOPSWITCH, KBINDICATOR, MAINMENU, MOUNT, QUICKLAUNCH, SENSORS,