Author: bdubbs
Date: Tue Apr 26 15:52:05 2016
New Revision: 17290
Log:
Update to wireshark-2.0.3.
Update to QScintilla_gpl-2.9.2.
Modified:
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/lxqt/apps/qscintilla.xml
trunk/BOOK/networking/netutils/wireshark.xml
trunk/BOOK/packages.ent
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Tue Apr 26 11:01:43
2016 (r17289)
+++ trunk/BOOK/introduction/welcome/changelog.xml Tue Apr 26 15:52:05
2016 (r17290)
@@ -47,6 +47,14 @@
<para>April 26th, 2016</para>
<itemizedlist>
<listitem>
+ <para>[bdubbs] - Update to wireshark-2.0.3. Fixes
+ <ulink url="&blfs-ticket-root;7755">#7755</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to QScintilla_gpl-2.9.2. Fixes
+ <ulink url="&blfs-ticket-root;7740">#7740</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[igor] - Update to libgpg-error-1.22. Fixes
<ulink url="&blfs-ticket-root;7763">#7763</ulink>.</para>
</listitem>
Modified: trunk/BOOK/lxqt/apps/qscintilla.xml
==============================================================================
--- trunk/BOOK/lxqt/apps/qscintilla.xml Tue Apr 26 11:01:43 2016 (r17289)
+++ trunk/BOOK/lxqt/apps/qscintilla.xml Tue Apr 26 15:52:05 2016 (r17290)
@@ -4,12 +4,12 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
- <!ENTITY qscintilla-download-http
"&sourceforge-repo;/pyqt/QScintilla-gpl-&qscintilla-version;.tar.gz">
+ <!ENTITY qscintilla-download-http
"&sourceforge-repo;/pyqt/QScintilla_gpl-&qscintilla-version;.tar.gz">
<!ENTITY qscintilla-download-ftp " ">
- <!ENTITY qscintilla-md5sum "38e6248cb970adf6d05aea7d94f1288e">
+ <!ENTITY qscintilla-md5sum "db260651a5e086cc4eee6417172e27e8">
<!ENTITY qscintilla-size "2.4 MB">
- <!ENTITY qscintilla-buildsize "38 MB (with documentation)">
- <!ENTITY qscintilla-time "1 SBU (with documentation)">
+ <!ENTITY qscintilla-buildsize "25 MB (with documentation)">
+ <!ENTITY qscintilla-time "2.0 SBU (with documentation)">
]>
<sect1 id="qscintilla" xreflabel="qscintilla-&qscintilla-version;">
@@ -78,22 +78,12 @@
</listitem>
</itemizedlist>
- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
- <itemizedlist spacing="compact">
- <listitem>
- <para>
- Required patch (if building with <application>Qt5</application>):
- <ulink
url="&patch-root;/QScintilla-gpl-&qscintilla-version;-fixes-1.patch"/>
- </para>
- </listitem>
- </itemizedlist>
-
<bridgehead renderas="sect3">QScintilla Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
<xref linkend="chrpath"/> and
- <xref linkend="qt5"/> or
+ <xref linkend="qt5"/> (recommended) or
<xref linkend="qt4"/>
</para>
@@ -114,12 +104,6 @@
<title>Installation of QScintilla</title>
<para>
- If building with <application>Qt5</application>, run the following
commnd:
- </para>
-
-<screen><userinput>patch -Np1 -i
../QScintilla-gpl-&qscintilla-version;-fixes-1.patch</userinput></screen>
-
- <para>
If <application>Qt4</application> and <application>Qt5</application> are
installed, choose which one you prefer, by running <command>source
setqt4</command> or <command>source setqt5</command>, respectivelly.
@@ -151,7 +135,10 @@
Now, as the <systemitem class="username">root</systemitem> user:
</para>
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install &&
+
+ln -sfv libqscintilla2.so.12.0.1 $QT5DIR/lib/libqt5scintilla2.so &&
+ln -sfv libqscintilla2.so.12.0.1
$QT5DIR/lib/libqt5scintilla2.so.12</userinput></screen>
<para>
If you wish to install the documentation, issue, as the <systemitem
@@ -163,12 +150,21 @@
$QT5DIR/share/doc/QScintilla-&qscintilla-version;/html</userinput></screen>
<para>
- if building with <application>Qt5</application>. For
- <application>Qt4</application> build, replace <envar>QT5DIR</envar> with
+ When building with
+ <application>Qt4</application>, replace <envar>QT5DIR</envar> with
<envar>QT4DIR</envar>.
</para>
</sect2>
+ <sect2 role="commands">
+ <title>Command Explanations</title>
+
+ <para>
+ <command>ln -sfv ...</command>: These commands create compatibility
+ symlinks needed by some programs.
+ </para>
+
+ </sect2>
<sect2 role="content">
<title>Contents</title>
Modified: trunk/BOOK/networking/netutils/wireshark.xml
==============================================================================
--- trunk/BOOK/networking/netutils/wireshark.xml Tue Apr 26 11:01:43
2016 (r17289)
+++ trunk/BOOK/networking/netutils/wireshark.xml Tue Apr 26 15:52:05
2016 (r17290)
@@ -6,10 +6,10 @@
<!ENTITY wireshark-download-http
"https://www.wireshark.org/download/src/all-versions/wireshark-&wireshark-version;.tar.bz2";>
<!ENTITY wireshark-download-ftp
"ftp://ftp.uni-kl.de/pub/wireshark/src/wireshark-&wireshark-version;.tar.bz2";>
- <!ENTITY wireshark-md5sum "204d053e0796c7da09292e0b54bc8503">
+ <!ENTITY wireshark-md5sum "62dc20f5a77542feed2e38f18db8ae3b">
<!ENTITY wireshark-size "30 MB">
- <!ENTITY wireshark-buildsize "1.9 GB, with default GUI front-ends">
- <!ENTITY wireshark-time "9.4 SBU, with default GUI front-ends">
+ <!ENTITY wireshark-buildsize "1.8 GB, with default GUI front-ends">
+ <!ENTITY wireshark-time "9.6 SBU, with default GUI front-ends">
]>
<sect1 id="wireshark" xreflabel="Wireshark-&wireshark-version;">
Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent Tue Apr 26 11:01:43 2016 (r17289)
+++ trunk/BOOK/packages.ent Tue Apr 26 15:52:05 2016 (r17290)
@@ -384,7 +384,7 @@
<!ENTITY traceroute-version "2.1.0">
<!ENTITY whois-version "5.2.12">
<!ENTITY wicd-version "1.7.4">
-<!ENTITY wireshark-version "2.0.2"> <!-- even minors only -->
+<!ENTITY wireshark-version "2.0.3"> <!-- even minors only -->
<!ENTITY wicd-major-version "1.7">
@@ -635,7 +635,7 @@
<!ENTITY qtermwidget-version "0.6.0">
<!ENTITY qterminal-version "0.6.0">
<!ENTITY qupzilla-version "2.0.0">
-<!ENTITY qscintilla-version "2.9.1">
+<!ENTITY qscintilla-version "2.9.2">
<!ENTITY juffed-version "0.10.r71.gc3c1a3f">
<!-- Part X -->
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
