[lfs-fr] r5632 - in trunk/blfs: . general/prog traduc/commits x/lib

myou72 at orange.fr myou72 at orange.fr
Sam 8 Fév 12:42:39 PST 2014


Author: myou72
Date: 2014-02-08 21:42:39 +0100 (Sat, 08 Feb 2014)
New Revision: 5632

Added:
   trunk/blfs/traduc/commits/r12680.txt
Modified:
   trunk/blfs/general.ent
   trunk/blfs/general/prog/git.xml
   trunk/blfs/x/lib/qt5.xml
Log:
[BLFS-EN] r12680.txt

Modified: trunk/blfs/general/prog/git.xml
===================================================================
--- trunk/blfs/general/prog/git.xml	2014-02-08 20:40:16 UTC (rev 5631)
+++ trunk/blfs/general/prog/git.xml	2014-02-08 20:42:39 UTC (rev 5632)
@@ -6,10 +6,10 @@
   <!ENTITY git-root "https://www.kernel.org/pub/software/scm/git" >
   <!ENTITY git-download-http "&git-root;/git-&git-version;.tar.xz">
   <!ENTITY git-download-ftp  " ">
-  <!ENTITY git-md5sum        "2a8a515c3e69e26d5e027aec7c9e9150">
+  <!ENTITY git-md5sum        "d9ded03c71c4cd2eafa38a6f74b69870">
   <!ENTITY git-size          "3.2 Mo">
-  <!ENTITY git-buildsize     "190 Mo (additional 14 Mo with downloaded docs and man pages, or 24 Mo building docs and man pages)">
-  <!ENTITY git-time          "0.7 SBU (additional 8 SBU for tests and 2.7 SBU
+  <!ENTITY git-buildsize     "190 Mo (additional 15 Mo with downloaded docs and man pages, or 24 Mo building docs and man pages)">
+  <!ENTITY git-time          "0.7 SBU (additional 4.7 SBU for tests and 2.6 SBU
                               for docs and man creation)">
 ]>
 <sect1 id="git" xreflabel="git-&git-version;">

Modified: trunk/blfs/general.ent
===================================================================
--- trunk/blfs/general.ent	2014-02-08 20:40:16 UTC (rev 5631)
+++ trunk/blfs/general.ent	2014-02-08 20:42:39 UTC (rev 5632)
@@ -309,7 +309,7 @@
 <!ENTITY gcc-version                  "4.8.2">
 <!ENTITY gc-version                   "7.4.0">
 <!ENTITY gdb-version                  "7.7">
-<!ENTITY git-version                  "1.8.5.3">
+<!ENTITY git-version                  "1.8.5.4">
 <!ENTITY guile-version                "2.0.9">
 <!ENTITY librep-version               "0.92.3">
 <!ENTITY llvm-version                 "3.4">
@@ -471,7 +471,7 @@
 <!ENTITY pangox-version               "0.0.2">
 <!ENTITY pangomm-version              "2.34.0">
 <!ENTITY qt4-version                  "4.8.5">
-<!ENTITY qt5-version                  "5.2.0">
+<!ENTITY qt5-version                  "5.2.1">
 <!ENTITY shared-mime-info-version     "1.2">
 <!ENTITY startup-notification-version "0.12">
 <!ENTITY webkitgtk-version            "1.10.2">   

Added: trunk/blfs/traduc/commits/r12680.txt
===================================================================
--- trunk/blfs/traduc/commits/r12680.txt	                        (rev 0)
+++ trunk/blfs/traduc/commits/r12680.txt	2014-02-08 20:42:39 UTC (rev 5632)
@@ -0,0 +1,157 @@
+Révision 12680
+
+fichiers modifiés :
+   general.ent
+   x/lib/qt4.xml
+   x/lib/qt5.xml
+   general/prog/git.xml
+   introduction/welcome/changelog.xml
+
+Log :
+Updates to git-1.8.5.4 and qt-5.2.1. Qt4 - Method 2: Installing in /opt/qt-4.8.5.
+
+Le robot a traité 34 % du commit anglais
+Index: introduction/welcome/changelog.xml
+===================================================================
+--- introduction/welcome/changelog.xml	(révision 12679)
++++ introduction/welcome/changelog.xml	(révision 12680)
+@@ -47,7 +47,19 @@
+       <para>February 7th, 2014</para>
+       <itemizedlist>
+         <listitem>
+-<para>[fernando] - Update to MesaLib-10.0.3, split GLU. Fixes
++          <para>[fernando] - Qt4 - Method 2: Installing in /opt/qt-4.8.5. Fixes
++          <ulink url="&blfs-ticket-root;4669">#4669</ulink>.</para>
++        </listitem>
++        <listitem>
++          <para>[fernando] - Update to qt-5.2.1. Thanks Armin K. Fixes
++          <ulink url="&blfs-ticket-root;4659">#4659</ulink>.</para>
++        </listitem>
++        <listitem>
++          <para>[fernando] - Update to git-1.8.5.4. Fixes
++          <ulink url="&blfs-ticket-root;4666">#4666</ulink>.</para>
++        </listitem>
++        <listitem>
++          <para>[igor] - Update to MesaLib-10.0.3, split GLU. Fixes
+           <ulink url="&blfs-ticket-root;4546">#4546</ulink>.</para>
+         </listitem>
+       </itemizedlist>
+
+Index: x/lib/qt4.xml
+===================================================================
+--- x/lib/qt4.xml	(révision 12679)
++++ x/lib/qt4.xml	(révision 12680)
+@@ -377,6 +376,19 @@
+ 
+ unset file</userinput></screen>
+ 
++    <para>
++      Symlink the <application>Qt4</application> executables into
++      <filename class="directory">/usr/bin</filename> by running the
++      following commands as the
++      <systemitem class="username">root</systemitem> user:
++    </para>
++<screen role="root"><userinput>ln -svf $QTDIR /opt/qt &&
++for file in /opt/qt/bin/*; do
++  ln -sfvn $file /usr/bin/$(basename $file)-qt4
++done</userinput></screen>
+   </sect2>
+ 
+   <sect2 role="commands">
+
+Index: x/lib/qt5.xml
+===================================================================
+--- x/lib/qt5.xml	(révision 12679)
++++ x/lib/qt5.xml	(révision 12680)
+@@ -96,13 +96,14 @@
+       <xref linkend="cups"/>,
+       <xref linkend="dbus"/>,
+       <xref linkend="glib2"/>,
+-<xref linkend="gst-plugins-base"/>,
+-<xref linkend="harfbuzz"/>,
++      <xref linkend="gst-plugins-base"/>,<!--
++      <xref linkend="harfbuzz"/>, Doesn't have all the features that the shipped one has. -->
+       <xref linkend="icu"/>,
+       <xref linkend="libjpeg"/>,
+       <xref linkend="libmng"/>,
+       <xref linkend="libpng"/>,
+       <xref linkend="libtiff"/>,
++      <xref linkend="mtdev"/>,
+       <xref linkend="openssl"/>,
+       <xref linkend="pcre"/>, and
+       <xref linkend="sqlite"/>
+@@ -110,8 +111,10 @@
+ 
+     <bridgehead renderas="sect4">Optional</bridgehead>
+     <para role="optional">
++      <xref linkend="geoclue"/>,
+       <xref linkend="gst10-plugins-base"/> (QtWebKit HTML5 Video Support),
+       <xref linkend="gtk2"/> (GTK+ Theme Support),
++      <ulink url="https://code.google.com/p/ibus/">IBus</ulink>,
+       <ulink url="http://xkbcommon.org/">libxkbcommon</ulink>,
+       <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
+       <xref linkend="postgresql"/>,
+@@ -213,18 +216,17 @@
+       following commands:
+     </para>
+ 
++    <!-- This is rather a bad idea. Most apps that I've seen using Qt5 look for -qt5
++         suffixed programs.
+     <note>
+       <para>
+         If <emphasis>not</emphasis> also installing <application>Qt4</application>
+@@     @@
+       </para>
+    </note> -->
+ 
+-<screen><userinput>sed -e "s:#if MNG:#if defined(MNG_VERSION_MAJOR)\n&:" \
+--e "s:#endif:&\n#endif:" \
+--i qtimageformats/config.tests/libmng/libmng.cpp
+-./configure -prefix         /usr               \
++<screen><userinput>./configure -prefix         /usr               \
+             -sysconfdir     /etc/xdg           \
+             -bindir         /usr/lib/qt5/bin   \
+             -headerdir      /usr/include/qt5   \
+@@ -236,8 +238,8 @@
+             -confirm-license   \
+             -opensource        \
+             -dbus-linked       \
+--openssl-linked    \
+--system-harfbuzz   \
++            -openssl-linked    \<!--
++            -system-harfbuzz   \-->
+             -system-sqlite     \
+             -no-nis            \
+             -nomake examples   \
+@@ -283,7 +285,7 @@
+      '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;</userinput></screen>
+ 
+     <para>
+-If you didn't modify the -bindir switch above, symlink the
++      <!-- If you didn't modify the -bindir switch above, -->Symlink the
+       <application>Qt5</application> executables into
+       <filename class="directory">/usr/bin</filename> by running the
+       following commands as the
+@@ -309,19 +311,15 @@
+       and <application>Qt5</application> executables when needed.
+     </para>
+ 
+-<screen><userinput>sed -e "s:#if MNG:#if defined(MNG_VERSION_MAJOR)\n&:" \
+--e "s:#endif:&\n#endif:" \
+--i qtimageformats/config.tests/libmng/libmng.cpp
++<screen><userinput>export QT5DIR=/opt/qt-&qt5-version;
+ 
+-QT5DIR=/opt/qt-&qt5-version;
+ ./configure -prefix     $QT5DIR  \
+             -sysconfdir /etc/xdg \
+             -confirm-license     \
+             -opensource          \
+             -dbus-linked         \
+--openssl-linked      \
+--system-harfbuzz     \
++            -openssl-linked      \<!--
++            -system-harfbuzz     \-->
+             -system-sqlite       \
+             -no-nis              \
+             -nomake examples     \
+

Modified: trunk/blfs/x/lib/qt5.xml
===================================================================
--- trunk/blfs/x/lib/qt5.xml	2014-02-08 20:40:16 UTC (rev 5631)
+++ trunk/blfs/x/lib/qt5.xml	2014-02-08 20:42:39 UTC (rev 5632)
@@ -7,9 +7,9 @@
   <!ENTITY qt5-url   "http://download.qt-project.org/official_releases/qt/&qt5-major;/&qt5-version;/single">
   <!ENTITY qt5-download-http "&qt5-url;/qt-everywhere-opensource-src-&qt5-version;.tar.xz">
   <!ENTITY qt5-download-ftp  " ">
-  <!ENTITY qt5-md5sum        "8f60b47ca9461831d940f579ee90517e">
+  <!ENTITY qt5-md5sum        "0c8d2aa45f38be9c3f7c9325eb059d9d">
   <!ENTITY qt5-size          "166 Mo">
-  <!ENTITY qt5-buildsize     "2.6 Go (160 Mo installé)">
+  <!ENTITY qt5-buildsize     "2.6 Go (160 Mo installed)">
   <!ENTITY qt5-time          "60 SBU">
 ]>
 <sect1 id="qt5" xreflabel="Qt-&qt5-version;">
@@ -195,28 +195,8 @@
       dans le répertoire /usr, modifiez l'entrée pour -bindir dessous en /usr/bin.
     </para></note>
 <screen>
-<userinput>sed -e "s:#if MNG:#if defined(MNG_VERSION_MAJOR)\n&:" \
-    -e "s:#endif:&\n#endif:" \
-    -i qtimageformats/config.tests/libmng/libmng.cpp
-./configure -prefix         /usr               \
-            -sysconfdir     /etc/xdg           \
-            -bindir         /usr/lib/qt5/bin   \
-            -headerdir      /usr/include/qt5   \
-            -archdatadir    /usr/lib/qt5       \
-            -datadir        /usr/share/qt5     \
-            -docdir         /usr/share/doc/qt5 \
-            -translationdir /usr/share/qt5/translations \
-            -examplesdir    /usr/share/doc/qt5/examples \
-            -confirm-license   \
-            -opensource        \
-            -dbus-linked       \
-            -openssl-linked    \
-            -system-harfbuzz   \
-            -system-sqlite     \
-            -no-nis            \
-            -nomake examples   \
-            -opengl es2        \
-            -optimized-qmake   &&
+<userinput>sed -e "s:#if MNG:#if defined(MNG_VERSION_MAJOR)n&:"     -e "s:#endif:&n#endif:"     -i qtimageformats/config.tests/libmng/libmng.cpp
+./configure -prefix         /usr                           -sysconfdir     /etc/xdg                       -bindir         /usr/lib/qt5/bin               -headerdir      /usr/include/qt5               -archdatadir    /usr/lib/qt5                   -datadir        /usr/share/qt5                 -docdir         /usr/share/doc/qt5             -translationdir /usr/share/qt5/translations             -examplesdir    /usr/share/doc/qt5/examples             -confirm-license               -opensource                    -dbus-linked                   -openssl-linked                -system-harfbuzz               -system-sqlite                 -no-nis                        -nomake examples               -opengl es2                    -optimized-qmake   &&
 make</userinput>
 </screen>
     <para>
@@ -224,7 +204,7 @@
       en lançant la commande suivante:
     </para>
 <screen>
-<userinput>find . -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput>
+<userinput>find . -name "*.pc" -exec perl -pi -e "s, -L$PWD/?S+,,g" {} ;</userinput>
 </screen>
     <para>
       Ce paquet n'a pas de suite de tests.
@@ -234,14 +214,10 @@
     </para>
 <screen role="root">
 <userinput>make install &&
-install -v -Dm644 qttools/src/assistant/assistant/images/assistant-128.png \
-                  /usr/share/pixmaps/assistant-qt5.png &&
-install -v -Dm644 qttools/src/designer/src/designer/images/designer.png \
-                  /usr/share/pixmaps/designer-qt5.png &&
-install -v -Dm644 qttools/src/linguist/linguist/images/icons/linguist-128-32.png \
-                  /usr/share/pixmaps/linguist-qt5.png &&
-install -v -Dm644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer-128.png \
-                  /usr/share/pixmaps/qdbusviewer-qt5.png</userinput>
+install -v -Dm644 qttools/src/assistant/assistant/images/assistant-128.png                   /usr/share/pixmaps/assistant-qt5.png &&
+install -v -Dm644 qttools/src/designer/src/designer/images/designer.png                   /usr/share/pixmaps/designer-qt5.png &&
+install -v -Dm644 qttools/src/linguist/linguist/images/icons/linguist-128-32.png                   /usr/share/pixmaps/linguist-qt5.png &&
+install -v -Dm644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer-128.png                   /usr/share/pixmaps/qdbusviewer-qt5.png</userinput>
 </screen>
     <para>
       Enlevez les références au répertoire de construction des fichiers installés
@@ -249,10 +225,8 @@
       <systemitem class="username">root</systemitem>:
     </para>
 <screen role="root">
-<userinput>sed -i -e "s:$PWD/qtbase:/usr/lib/qt5:g" \
-    /usr/lib/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri &&
-find /usr/lib/lib{qgsttools_p,Qt5*}.prl -exec sed -i -e \
-     '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;</userinput>
+<userinput>sed -i -e "s:$PWD/qtbase:/usr/lib/qt5:g"     /usr/lib/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri &&
+find /usr/lib/lib{qgsttools_p,Qt5*}.prl -exec sed -i -e      '/^QMAKE_PRL_BUILD_DIR/d;s/(QMAKE_PRL_LIBS =).*/1/' {} ;</userinput>
 </screen>
     <para>
       Si vous installez aussi Qt4 dans /usr, liez symboliquement les exécutables <application>Qt5</application> dans
@@ -277,22 +251,9 @@
       de quelques configurations supplémentaires et vous devez permuter manuellement entre
       les exécutables  <application>Qt4</application> et  <application>Qt5</application> quand c'est nécessaire.</para>
 <screen>
-<userinput>sed -e "s:#if MNG:#if defined(MNG_VERSION_MAJOR)\n&:" \
-    -e "s:#endif:&\n#endif:" \
-    -i qtimageformats/config.tests/libmng/libmng.cpp
+<userinput>sed -e "s:#if MNG:#if defined(MNG_VERSION_MAJOR)n&:"     -e "s:#endif:&n#endif:"     -i qtimageformats/config.tests/libmng/libmng.cpp
 QT5DIR=/opt/qt-&qt5-version;
-./configure -prefix     $QT5DIR  \
-            -sysconfdir /etc/xdg \
-            -confirm-license     \
-            -opensource          \
-            -dbus-linked         \
-            -openssl-linked      \
-            -system-harfbuzz     \
-            -system-sqlite       \
-            -no-nis              \
-            -nomake examples     \
-            -opengl es2          \
-            -optimized-qmake     &&
+./configure -prefix     $QT5DIR              -sysconfdir /etc/xdg             -confirm-license                 -opensource                      -dbus-linked                     -openssl-linked                  -system-harfbuzz                 -system-sqlite                   -no-nis                          -nomake examples                 -opengl es2                      -optimized-qmake     &&
 make</userinput>
 </screen>
     <para>
@@ -300,14 +261,10 @@
     </para>
 <screen role="root">
 <userinput>make install &&
-install -v -Dm644 qttools/src/assistant/assistant/images/assistant-128.png \
-                  /usr/share/pixmaps/assistant-qt5.png &&
-install -v -Dm644 qttools/src/designer/src/designer/images/designer.png \
-                  /usr/share/pixmaps/designer-qt5.png &&
-install -v -Dm644 qttools/src/linguist/linguist/images/icons/linguist-128-32.png \
-                  /usr/share/pixmaps/linguist-qt5.png &&
-install -v -Dm644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer-128.png \
-                  /usr/share/pixmaps/qdbusviewer-qt5.png</userinput>
+install -v -Dm644 qttools/src/assistant/assistant/images/assistant-128.png                   /usr/share/pixmaps/assistant-qt5.png &&
+install -v -Dm644 qttools/src/designer/src/designer/images/designer.png                   /usr/share/pixmaps/designer-qt5.png &&
+install -v -Dm644 qttools/src/linguist/linguist/images/icons/linguist-128-32.png                   /usr/share/pixmaps/linguist-qt5.png &&
+install -v -Dm644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer-128.png                   /usr/share/pixmaps/qdbusviewer-qt5.png</userinput>
 </screen>
     <para>
       Enlevez les références au répertoire de construction dans les fichiers
@@ -315,10 +272,8 @@
       <systemitem class="username">root</systemitem>:
     </para>
 <screen role="root">
-<userinput>find $QT5DIR -name qt_lib_bootstrap_private.pri \
-   -exec sed -i -e "s:$PWD/qtbase:/$QT5DIR/lib/:g" {} \; &&
-find $QT5DIR -name \*.prl \
-   -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput>
+<userinput>find $QT5DIR -name qt_lib_bootstrap_private.pri    -exec sed -i -e "s:$PWD/qtbase:/$QT5DIR/lib/:g" {} ; &&
+find $QT5DIR -name *.prl    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} ;</userinput>
 </screen>
   <para>
       Liez symboliquement les exécutalbes <application>Qt5</application> 




More information about the lfs-traducfr mailing list