Changeset 9434e9a

Timestamp:

08/26/2019 01:28:27 PM (5 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 9.0, 9.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, 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:

f6da3b9

Parents:

425f8d69

Message:

Tweak Extra-cmake-modules instead of plasma-workspace, since any other kf5
package could be pottentially affected by ECM in /usr. Tested by rebuilding
all the packages dependent on ECM, and starting KDe Plasma successfully.

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

Location:

kde

Files:

• extra-cmake-modules.xml (modified) (3 diffs)
• kf5/kf5-frameworks.xml (modified) (1 diff)

kde/extra-cmake-modules.xml

@@ -81 +81 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <ulink url="https://pypi.python.org/pypi/Sphinx">Sphinx</ulink> (for building documentation)
+      <ulink url="https://pypi.python.org/pypi/Sphinx">Sphinx</ulink> (for
+         building documentation)
     </para>
 
@@ -93 +94 @@
 
     <para>
-      Install <application>Extra Cmake Modules</application> by running the following
-      commands:
+      Install <application>Extra Cmake Modules</application> by running the
+      following commands:
     </para>
 
 <screen><userinput>sed -i '/"lib64"/s/64//' kde-modules/KDEInstallDirs.cmake &amp;&amp;
+
+sed -e '/PACKAGE_INIT/i set(SAVE_PACKAGE_PREFIX_DIR "${PACKAGE_PREFIX_DIR}")' \
+    -e '/^include/a set(PACKAGE_PREFIX_DIR "${SAVE_PACKAGE_PREFIX_DIR}")' \
+    -i ECMConfig.cmake.in &amp;&amp;
 
 mkdir build &amp;&amp;
@@ -131 +136 @@
       sub-directory.
     </para>
+
+    <para>
+    <command>sed ... ECMConfig.cmake.in</command>:
+      This command protects the global <application>cmake</application>
+      variable <envar>PACKAGE_PREFIX_DIR</envar> from being changed when
+      checking ECM presence: since we install ECM into <filename
+      class="directory">/usr</filename>, the check would set that variable to
+      <filename class="directory">/usr</filename>, while most KDE packages
+      expect it to be set to <filename class="directory">/opt/kf5</filename>
+      and would fail to build if it is set to something else.
+    </para>
   </sect2>
 

kde/kf5/kf5-frameworks.xml

@@ -319 +319 @@
     pushd $packagedir
    
-      # Fix a cmake problem in plasma-framework
-      if [ "$name" == "plasma-framework" ]; then
-        sed -e '/CMakeFind/i set(SAVE_PACKAGE_PREFIX_DIR "${PACKAGE_PREFIX_DIR}")' \
-            -e '/find_dep/a set(PACKAGE_PREFIX_DIR "${SAVE_PACKAGE_PREFIX_DIR}")'  \ 
-            -i src/plasmaquick/KF5PlasmaQuickConfig.cmake.in
-      fi
-
       mkdir build
       cd    build