Changeset a6099fe5

Timestamp:

07/05/2023 01:56:43 PM (10 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

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

Children:

d96e546

Parents:

f670b27

git-author:

Pierre Labastie <pierre.labastie@…> (07/05/2023 01:54:58 PM)

git-committer:

Pierre Labastie <pierre.labastie@…> (07/05/2023 01:56:43 PM)

Message:

lxqt: keep only one chapter and reinstate old apps

• With the build order given in

​https://github.com/lxqt/lxqt/wiki/Building-from-source,
it is hard to separate between desktop and applications.

• old apps (specially obconf-qt) are needed for being able

to configure the desktop
Also:

• move dependencies not in lxqt to the beginning (muparser, kf5, plasma parts)

Location:

lxqt

Files:

• desktop/desktop.xml (modified) (1 diff)
• desktop/lximage-qt.xml (moved) (moved from archive/lxqt/apps/lximage-qt.xml )
• desktop/obconf-qt.xml (moved) (moved from archive/lxqt/apps/obconf-qt.xml )
• desktop/pavucontrol-qt.xml (moved) (moved from archive/lxqt/apps/pavucontrol-qt.xml )
• desktop/qterminal.xml (moved) (moved from lxqt/apps/qterminal.xml )
• desktop/qtermwidget.xml (moved) (moved from lxqt/apps/qtermwidget.xml )
• lxqt.xml (modified) (1 diff)

lxqt/desktop/desktop.xml

@@ -34 +34 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pre-install.xml"/>
+<!-- Needed dependency -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="muparser.xml"/>
+<!-- Needed kf5 packages -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-kwindowsystem.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-kwayland.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-kconfig.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-solid.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-kidletime.xml"/>
+<!-- Needed plasma package -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-libkscreen.xml"/>
+<!-- group 0 -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-build-tools.xml"/>
+<!-- group I -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libqtxdg.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-menu-data.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-kwindowsystem.xml"/>
+<!-- group II -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="liblxqt.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsysstat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtxdg-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libfm-qt.xml"/>
+<!-- group III -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-themes.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-qtplugin.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="obconf-qt.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pavucontrol-qt.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtermwidget.xml"/>
+<!-- group IV -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lximage-qt.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-about.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-admin.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-kwayland.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-kconfig.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-libkscreen.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-config.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-globalkeys.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-notificationd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-policykit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtxdg-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-session.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pcmanfm-qt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-solid.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qterminal.xml"/>
+<!-- group V -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-panel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-kidletime.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-powermanagement.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="muparser.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-runner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="post-install.xml"/>
-<!--  
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-l10n.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-kguiaddons.xml"/>
--->
 </chapter>

lxqt/lxqt.xml

@@ -12 +12 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="desktop/desktop.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apps/apps.xml"/>
+<!-- with the build order given in
+https://github.com/lxqt/lxqt/wiki/Building-from-source, it is hard to separate between desktop and applications. Using only "desktop" for now
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apps/apps.xml"/>
+-->
 
 </part>