Changeset 18d6eae2

Timestamp:

07/20/2015 08:20:31 PM (9 years ago)

Author:

Fernando de Oliveira <fernando@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.8, 7.9, 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, nosym, 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:

d90cdc8

Parents:

5eb80f7

Message:

• Add chrpath-0.16.
• Add QScintilla-gpl-2.9.
• Add juffed-0.10.r71.gc3c1a3f.
• Fixes for lximage-qt-0.4.0 and obconf-qt-0.9.0.8.g1ce85f1.
• Replace "_" by "-" in lximage-qt-0.4.0 and obconf-qt-0.9.0.8.g1ce85f1 file names.

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

Files:

• general/genutils/chrpath.xml (added)
• general/genutils/genutils.xml (modified) (1 diff)
• lxqt/apps/apps.xml (modified) (1 diff)
• lxqt/apps/juffed.xml (added)
• lxqt/apps/lximage-qt.xml (moved) (moved from lxqt/apps/lximage_qt.xml )
• lxqt/apps/obconf-qt.xml (moved) (moved from lxqt/apps/obconf_qt.xml )
• lxqt/apps/qscintilla.xml (added)
• lxqt/apps/qterminal.xml (modified) (1 diff)
• lxqt/apps/qupzilla.xml (modified) (2 diffs)
• packages.ent (modified) (2 diffs)

general/genutils/genutils.xml

@@ -23 +23 @@
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appdata-tools.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appstream-glib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chrpath.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="compface.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="desktop-file-utils.xml"/>

lxqt/apps/apps.xml

@@ -21 +21 @@
   </para>
 
-  <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="obconf_qt.xml"/>
+  <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="obconf-qt.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qscintilla.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="juffed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtermwidget.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qterminal.xml"/>

lxqt/apps/qterminal.xml

@@ -173 +173 @@
         <listitem>
           <para>
-            a lightweight terminal emulator for the
-            <application>Qt</application> desktop.
+            is a <application>Qt</application> based lightweight terminal
+            emulator for.
           </para>
           <indexterm zone="qterminal qterminal-prog">

lxqt/apps/qupzilla.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY qupzilla-download-http "&sources-anduin-other-http;/qupzilla-&qupzilla-version;.tar.gz">
+  <!ENTITY qupzilla-download-http "http://anduin.linuxfromscratch.org/sources/BLFS/conglomeration/qupzilla/qupzilla-&qupzilla-version;.tar.gz">
   <!ENTITY qupzilla-download-ftp  " ">
   <!ENTITY qupzilla-md5sum        "24c4033cbf20223eb73a33af9c037862">
@@ -104 +104 @@
     </para>
 
-<screen><userinput>sed -e '/qtlocalpeer/ i #include &lt;QDataStream&gt;'             \
+<screen><userinput>sed -e '/qtlocalpeer/ i #include &lt;QDataStream&gt;' \
     -i src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp &amp;&amp;
 
-sed -e '/QHash/ i #include &lt;QObject&gt;'                     \
+sed -e '/QHash/ i #include &lt;QObject&gt;' \
     -i src/plugins/TabManager/tldextractor/tldextractor.h</userinput></screen>
 

packages.ent

@@ -187 +187 @@
 <!-- Chapter 11 -->
 <!ENTITY appstream-glib-version       "0.4.0">
+<!ENTITY chrpath-version              "0.16">
 <!ENTITY compface-version             "1.5.2">
 <!ENTITY desktop-file-utils-version   "0.22">
@@ -614 +615 @@
 <!ENTITY qterminal-version            "0.6.0">
 <!ENTITY qupzilla-version             "1.8.6">
+<!ENTITY qscintilla-version           "2.9">
+<!ENTITY juffed-version               "0.10.r71.gc3c1a3f">
 
 <!-- Part X -->