diff --git a/chapter08/vim.xml b/chapter08/vim.xml
index 76b9d35..704b59c 100644
--- a/chapter08/vim.xml
+++ b/chapter08/vim.xml
@@ -39,8 +39,7 @@
Альтернативы Vim.Если вы предпочитаете другой текстовый редактор, например, Emacs,
- Joe или Nano, обратитесь к за рекомендациями по установке.
+ Joe или Nano, обратитесь к за рекомендациями по установке.
@@ -105,8 +104,8 @@ done
перекомпилировать Vim после установки X. Vim поставляется с графической версией
редактора, для которой требуется установка X и некоторых дополнительных библиотек.
Для получения дополнительной информации об этом процессе обратитесь к документации
- по Vim и странице установки Vim в книге BLFS по адресу .
+ по Vim и странице установки Vim из дополнительного раздела книги:
+ .
diff --git a/chapter12/chapter12.xml b/chapter12/chapter12.xml
index b238c43..e3c2e86 100644
--- a/chapter12/chapter12.xml
+++ b/chapter12/chapter12.xml
@@ -20,6 +20,7 @@
+
@@ -28,8 +29,10 @@
+
+
@@ -51,6 +54,7 @@
+
diff --git a/chapter12/general/genlib/libarchive.xml b/chapter12/general/genlib/libarchive.xml
new file mode 100644
index 0000000..e5ab20e
--- /dev/null
+++ b/chapter12/general/genlib/libarchive.xml
@@ -0,0 +1,223 @@
+
+
+ %general-entities;
+
+
+
+
+
+
+
+]>
+
+
+
+
+
+ libarchive-&libarchive-version;
+
+
+ libarchive
+
+
+
+ Introduction to libarchive
+
+
+ The libarchive library provides a single
+ interface for reading/writing various compression formats.
+
+
+ &lfs121_checked;
+
+ Package Information
+
+
+
+ Download (HTTP):
+
+
+
+
+ Download (FTP):
+
+
+
+
+ Download MD5 sum: &libarchive-md5sum;
+
+
+
+
+ Download size: &libarchive-size;
+
+
+
+
+ Estimated disk space required: &libarchive-buildsize;
+
+
+
+
+ Estimated build time: &libarchive-time;
+
+
+
+
+
+ libarchive Dependencies
+
+ Optional
+
+ ,
+ lzo,
+ nettle, and
+
+
+
+
+
+ Installation of libarchive
+
+
+ Install libarchive by running the following
+ commands:
+
+
+./configure --prefix=/usr --disable-static &&
+make
+
+
+ To test the results, issue: LC_ALL=C make check.
+
+
+
+ Now, as the root user:
+
+
+make install
+
+
+
+
+ Command Explanations
+
+
+
+
+ : This switch sets expat for xar archive
+ format support instead of preferred libxml2 if both packages are installed.
+
+
+
+ : This switch sets OpenSSL for crypto
+ support instead of preferred Nettle if both packages are installed.
+
+
+
+
+
+ Contents
+
+
+ Installed Programs
+ Installed Libraries
+ Installed Directories
+
+
+
+ bsdcat, bsdcpio, bsdtar, and bsdunzip
+
+
+ libarchive.so
+
+
+ None
+
+
+
+
+
+ Short Descriptions
+
+
+
+
+ bsdcat
+
+
+ expands files to standard output
+
+
+ bsdcat
+
+
+
+
+
+ bsdcpio
+
+
+ is a tool similar to cpio
+
+
+ bsdcpio
+
+
+
+
+
+ bsdtar
+
+
+ is a tool similar to GNU tar
+
+
+ bsdtar
+
+
+
+
+
+ bsdunzip
+
+
+ is a tool similar to Info-ZIP unzip
+
+
+ bsdunzip
+
+
+
+
+
+ libarchive.so
+
+
+ is a library that can create and read several streaming
+ archive formats
+
+
+ libarchive.so
+
+
+
+
+
+
+
+
+
diff --git a/chapter12/postlfs/config/vimrc.xml b/chapter12/postlfs/config/vimrc.xml
index df854b9..4810601 100644
--- a/chapter12/postlfs/config/vimrc.xml
+++ b/chapter12/postlfs/config/vimrc.xml
@@ -1,5 +1,5 @@
-
%general-entities;
diff --git a/chapter12/postlfs/editors/emacs.xml b/chapter12/postlfs/editors/emacs.xml
index cf9449a..91c7682 100644
--- a/chapter12/postlfs/editors/emacs.xml
+++ b/chapter12/postlfs/editors/emacs.xml
@@ -70,34 +70,34 @@
Recommended
- ,
- ,
- ,
- , and
-
+ harfbuzz,
+ giflib,
+ gnutls,
+ jansson, and
+ libtiff
Optional
- ,
- ,
- ,
- ,
+ x-window-system
+ alsa-lib
+ cairo
+ dbus,
&gobject-introspection;,
- ,
+ gsettings-desktop-schemas
,
- ,
- ,
- ,
- ,
- ,
- ,
- ,
- ,
+ gtk3,
+ imagemagick,
+ lcms2,
+ libjpeg,
+ libpng,
+ librsvg,
+ libseccomp,
+ libwebp,
,
- ,
- ,
- ,
+ mitkrb
+ sqlite
+ valgrind,
intlfonts,
libungif,
libotf, and
@@ -157,33 +157,33 @@ rm -vf /usr/lib/systemd/user/emacs.service
: Use this if you have installed
- and wish to link against it.
+ imagemagick and wish to link against it.
: Use this if you have not installed
- or
+ giflib or
libungif.
: Use this if you have not installed
- .
+ libtiff.
: Use this if you have not installed
- .
+ gnutls.
: Use this if you have not installed
- .
+ harfbuzz.
: Use this if you have not installed
- .
+ jansson.
diff --git a/chapter12/postlfs/editors/vim.xml b/chapter12/postlfs/editors/vim.xml
new file mode 100644
index 0000000..afb8ba4
--- /dev/null
+++ b/chapter12/postlfs/editors/vim.xml
@@ -0,0 +1,481 @@
+
+
+ %general-entities;
+
+
+
+
+
+
+
+
+]>
+
+
+
+
+
+ Vim-&vim-version;
+
+
+ Vim
+
+
+
+ Introduction to Vim
+
+
+ The Vim package, which is an
+ abbreviation for VI IMproved, contains a vi
+ clone with extra features as compared to the original
+ vi.
+
+
+
+ The default LFS instructions install vim
+ as a part of the base system. If you would prefer to link
+ vim against X,
+ you should recompile vim to enable GUI mode.
+ There is no need for special instructions since
+ X support is automatically detected.
+
+
+
+
+ The version of vim changes daily. To get the latest
+ version, go to
+ https://github.com/vim/vim/releases.
+
+
+
+ &lfs121_checked;
+
+ Package Information
+
+
+
+ Download (HTTP):
+
+
+
+
+ Download (FTP):
+
+
+
+
+ Download MD5 sum: &vim-md5sum;
+
+
+
+
+ Download size: &vim-size;
+
+
+
+
+ Estimated disk space required: &vim-buildsize;
+
+
+
+
+ Estimated build time: &vim-time;
+
+
+
+
+ Vim Dependencies
+
+ Recommended
+
+ x-window-system и
+ gtk3
+
+
+ Optional
+
+ ,
+ lua,
+ ruby, and
+
+
+
+
+
+
+ Installation of Vim
+
+
+
+ If you recompile Vim to link against
+ X and your X
+ libraries are not on the root partition, you will no longer have an
+ editor for use in emergencies. You may choose to install an additional
+ editor, not link Vim against
+ X, or move the current vim
+ executable to the /bin directory
+ under a different name such as vi.
+
+
+
+
+ Install Vim by running the following
+ commands:
+
+
+
+
+ If you intend to run the tests and have not installed Xorg in /usr,
+ append LDFLAGS='-L$XORG_PREFIX/lib' to the configure line below.
+
+
+
+echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h &&
+echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' >> src/feature.h &&
+
+./configure --prefix=/usr \
+ --with-features=huge \
+ --enable-gui=gtk3 \
+ --with-tlib=ncursesw &&
+make
+
+
+
+ If the global configuration file /etc/vimrc
+ references the VIMRUNTIME environment variable, some
+ tests may complain about being unable to find the corresponding
+ directory and wait for user input. If this is the case, this file
+ should be saved and removed before running the tests. Or if
+ bubblewrap is installed, it's also possible to
+ create a lightweight container environment where this file is hidden
+ and run the tests in the container.
+
+
+
+
+ To test the results, issue: make -j1 test, or
+ bwrap --dev-bind / / --dev-bind /dev/null /etc/vimrc make -j1
+ test if running the tests with bubblewrap
+ and /etc/vimrc hidden.
+ Even if one of the tests fails to produce the file
+ test.out in src/testdir, the remaining tests will
+ still be executed. If all goes well, the log will report
+ ALL DONE. Some tests labelled as
+ flaky may fail occasionally and can be ignored.
+ The tests are known to fail if the output is redirected to a file,
+ and also if they are run in a 'screen' session.
+
+
+
+
+ Some color tests expect to be executed under the
+ xterm terminal emulator.
+
+
+
+
+ Now, as the root user:
+
+
+make install
+
+
+ By default, Vim's documentation is installed in /usr/share/vim. The following symlink allows
+ the documentation to be accessed via /usr/share/doc/vim-&vim-version;, making it
+ consistent with the location of documentation for other packages:
+
+
+
+
+ln -snfv ../vim/vim&vim-majmin;/doc /usr/share/doc/vim-&vim-version;
+
+
+ If you wish to update the runtime
+ files, issue the following command (requires )
+ to download it:
+
+
+rsync -avzcP --exclude="/dos/" --exclude="/spell/" \
+ ftp.nluug.nl::Vim/runtime/ ./runtime/
+
+
+ And then install the updated runtime files and regenerate the
+ tags file, as the
+ root user issue:
+
+
+
+make -C src installruntime &&
+vim -c ":helptags /usr/share/doc/vim-&vim-version;" -c ":q"
+
+
+
+
+ Command Explanations
+
+
+ --with-features=huge: This switch enables all
+ the additional features available in Vim,
+ including support for multibyte characters.
+
+
+
+ --with-tlib=ncursesw: This switch forces Vim to
+ link against the libncursesw
+ library.
+
+
+
+ : This will prevent compilation of the
+ GUI. Vim will still link against
+ X, so that some features such as the
+ client-server model or the x11-selection (clipboard) are still available.
+
+
+
+ : If you prefer not to link
+ Vim against X, use
+ this switch.
+
+
+
+ ,
+ ,
+ ,
+ ,
+ :
+ These options include the Lua, Perl, Python3, Tcl, or Ruby interpreters
+ that allow using other application code in vim
+ scripts. All the options can accept
+ to dynamically load the interpreter when
+ needed. This is required for Python 3 to
+ prevent segmentation faults. For tcl,
+ it is necessary to indicate the name of the tclsh
+ executable, since configure only searches versioned
+ names with old versions.
+
+
+
+
+
+ Configuring Vim
+
+
+ Config Files
+
+
+ /etc/vimrc and
+ ~/.vimrc
+
+
+
+ /etc/vimrc
+
+
+
+ ~/.vimrc
+
+
+
+
+
+ Configuration Information
+
+
+ Vim has an integrated spell checker
+ which you can enable by issuing the following in a vim window:
+
+
+:setlocal spell spelllang=ru
+
+
+ This setting will enable spell checking for the Russian
+ language for the current session.
+
+
+
+ By default, Vim only installs spell
+ files for the English language. If a spell file is not available for
+ a language, then Vim will call the
+ $VIMRUNTIME/plugin/spellfile.vim plugin and will
+ try to obtain the *.spl and optionally *.sug from the vim ftp server,
+ by using the $VIMRUNTIME/plugin/netrwPlugin.vim
+ plugin.
+
+
+
+
+ Alternatively you can manually download the *.spl and *.sug files
+ from: and save
+ them to ~/.vim/spell or in
+ /usr/share/vim/vim&vim-majmin;/spell/.
+
+
+
+ To find out what's new in Vim-&vim-version;
+ issue the following command:
+
+
+:help version-&vim-version;
+
+
+ For additional information on setting up
+ Vim configuration files, see and .
+
+
+
+
+
+
+
+ Contents
+
+
+ A list of the reinstalled files, along with their short
+ descriptions can be found in the
+ LFS Vim
+ Installation Instructions.
+
+
+
+ Installed Programs
+ Installed Libraries
+ Installed Directory
+
+
+ gview, gvim, gvimdiff, gvimtutor, rgview, and rgvim
+ None
+ /usr/share/vim
+
+
+
+
+ Short Descriptions
+
+
+
+
+ gview
+
+
+ starts gvim in read-only mode
+
+
+ gview
+
+
+
+
+
+ gvim
+
+
+ is the editor that runs under X
+ and includes a GUI
+
+
+ gvim
+
+
+
+
+
+ gvimdiff
+
+
+ edits two or three versions of a file with
+ gvim and shows the differences
+
+
+ gvimdiff
+
+
+
+
+
+ gvimtutor
+
+
+ teaches the basic keys and commands of
+ gvim
+
+
+ gvimtutor
+
+
+
+
+
+ rgview
+
+
+ is a restricted version of gview
+
+
+ rgview
+
+
+
+
+
+ rgvim
+
+
+ is a restricted version of gvim
+
+
+ gvim
+
+
+
+
+
+
+
+
+
diff --git a/chapter12/xincludes/gtk-update-icon-cache.xml b/chapter12/xincludes/gtk-update-icon-cache.xml
index 069391a..07ab198 100644
--- a/chapter12/xincludes/gtk-update-icon-cache.xml
+++ b/chapter12/xincludes/gtk-update-icon-cache.xml
@@ -8,7 +8,7 @@
class="directory">/usr/share/icons/hicolor hierarchy and you
can improve system performance and memory usage by updating
/usr/share/icons/hicolor/index.theme. To perform
- the update you must have installed and issue the
+ the update you must have gtk3 installed and issue the
following command as the root
user: