Changeset cb1d452

Timestamp:

04/26/2016 10:52:05 PM (7 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 7.10, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, ken/inkscape-core-mods, lazarus, nosym, perl-modules, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226

Children:

ff13fdc2

Parents:

55ff77e6

Message:

Update to wireshark-2.0.3.
Update to QScintilla_gpl-2.9.2.

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

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• lxqt/apps/qscintilla.xml (modified) (6 diffs)
• networking/netutils/wireshark.xml (modified) (1 diff)
• packages.ent (modified) (2 diffs)

introduction/welcome/changelog.xml

@@ -48 +48 @@
       <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>

lxqt/apps/qscintilla.xml

@@ -5 +5 @@
   %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)">
 ]>
 
@@ -79 +79 @@
     </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>
 
@@ -94 +84 @@
     <para role="required">
       <xref linkend="chrpath"/> and
-      <xref linkend="qt5"/> or
+      <xref linkend="qt5"/> (recommended) or
       <xref linkend="qt4"/>
     </para>
@@ -113 +103 @@
   <sect2 role="installation">
     <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>
@@ -152 +136 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install &amp;&amp;
+
+ln -sfv libqscintilla2.so.12.0.1 $QT5DIR/lib/libqt5scintilla2.so &amp;&amp;
+ln -sfv libqscintilla2.so.12.0.1 $QT5DIR/lib/libqt5scintilla2.so.12</userinput></screen>
 
     <para>
@@ -164 +151 @@
 
     <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>
 

networking/netutils/wireshark.xml

@@ -7 +7 @@
   <!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">
 ]>
 

packages.ent

@@ -385 +385 @@
 <!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">
@@ -636 +636 @@
 <!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">