Index: general.ent
===================================================================
--- general.ent (revision ea0c1c2b12799e88691e76bd6570a722b13ef52d)
+++ general.ent (revision 0fe2f5b9d2ec42161d3aa571a9f64fcd8e1df71e)
@@ -1,5 +1,5 @@
-
+
@@ -7,5 +7,5 @@
-
+
Index: general/genlib/boost.xml
===================================================================
--- general/genlib/boost.xml (revision ea0c1c2b12799e88691e76bd6570a722b13ef52d)
+++ general/genlib/boost.xml (revision 0fe2f5b9d2ec42161d3aa571a9f64fcd8e1df71e)
@@ -94,5 +94,5 @@
-sed -e 's@using python[^;]*@&: /usr/include/python${PYTHON_VERSION/3*/${PYTHON_VERSION}m} @' \
+sed -e '/using python/ s@;@: /usr/include/python${PYTHON_VERSION/3*/${PYTHON_VERSION}m} @' \
-i bootstrap.sh
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml (revision ea0c1c2b12799e88691e76bd6570a722b13ef52d)
+++ introduction/welcome/changelog.xml (revision 0fe2f5b9d2ec42161d3aa571a9f64fcd8e1df71e)
@@ -44,4 +44,30 @@
-->
+
+
+ January 25th, 2016
+
+
+ [fernando] - Update to v4l-utils-1.10.0. Fixes
+ #7393.
+
+
+ [fernando] - Update to libinput-1.1.5. Fixes
+ #7392.
+
+
+ [fernando] - Update to wicd-1.7.4. Fixes
+ #7391.
+
+
+ [fernando] - Update to LVM2.2.02.141. Fixes
+ #7390
+
+
+ [fernando] - Update to bluefish-2.2.8. Fixes
+ #7389.
+
+
+
Index: multimedia/libdriv/v4l-utils.xml
===================================================================
--- multimedia/libdriv/v4l-utils.xml (revision ea0c1c2b12799e88691e76bd6570a722b13ef52d)
+++ multimedia/libdriv/v4l-utils.xml (revision 0fe2f5b9d2ec42161d3aa571a9f64fcd8e1df71e)
@@ -5,10 +5,10 @@
%general-entities;
-
+
-
+
-
-
+
+
]>
@@ -101,10 +101,13 @@
Installation of v4l-utils
-
- If both Qt4 and Qt5 are installed, Qt5 will be used.
- Ensure that the proper support programs are used:
-
- source /usr/bin/setqt5
-
+
+ If both Qt4 and Qt5 are installed, Qt5 will be used. If you choose to
+ build against Qt4, temporarily hide it from
+ PKG_CONFIG_PATH, issuing:
+
+
+SAVEPATH=$PKG_CONFIG_PATH &&
+PKG_CONFIG_PATH="\
+`echo $PKG_CONFIG_PATH | sed 's@:/opt/qt5/lib/pkgconfig@@'`"
@@ -117,4 +120,12 @@
--disable-static &&
make
+
+
+ Again, if both Qt4 and 5 installed at /opt and you chose to build against
+ Qt4, restore PKG_CONFIG_PATH:
+
+
+PKG_CONFIG_PATH=$SAVEPATH &&
+unset SAVEPATH
@@ -166,5 +177,6 @@
- /lib/udev/rc_keymaps
+ /etc/rc_keymaps,
+ /lib/udev/rc_keymaps,
/usr/include/libdvbv5, and
/usr/lib/libv4l
Index: networking/netutils/wicd.xml
===================================================================
--- networking/netutils/wicd.xml (revision ea0c1c2b12799e88691e76bd6570a722b13ef52d)
+++ networking/netutils/wicd.xml (revision 0fe2f5b9d2ec42161d3aa571a9f64fcd8e1df71e)
@@ -5,9 +5,9 @@
%general-entities;
-
+
-
-
-
+
+
+
]>
@@ -66,13 +66,4 @@
Wicd Dependencies
- Wicd uses ifconfig to activate network
- connections. ifconfig is provided by both the Inetutils
- and Net-tools packages. The Inetutils package is part of LFS, but the
- ifconfig command is not installed by the LFS instructions.
- If you choose to install the Inetutils version of ,
- you need to reinstall the package and configure it without the
- switch.
-
-
Required
@@ -80,6 +71,6 @@
,
, and
- (Wicd needs ifconfig and
- mii-tool from this package)
+
+ (Wicd needs mii-tool from this package)
@@ -94,6 +85,8 @@
(for suspend/resume integration),
- Urwid (for the Curses-based frontend), and
- Babel (for internationalization)
+ Urwid
+ (for the Curses-based frontend), and
+ Babel
+ (for internationalization)
@@ -109,8 +102,10 @@
commands:
-sed -e "/wpath.logrotate\|wpath.systemd/d" \
+sed -e "s/ 'CHANGES',//" \
+ -e "/wpath.logrotate\|wpath.systemd/d" \
-e "/detection failed/ a\ self.init=\'init\/default\/wicd\'" \
- -i setup.py &&
-rm po/*.po &&
+ -i.orig setup.py &&;
+
+rm po/*.po &&
python setup.py configure --no-install-kde \
@@ -123,7 +118,8 @@
This package does not come with a test suite.
- Now, as the root user, install the package:
-
-LANG=C python setup.py install
+ Now, as the root user,
+ install the package:
+
+python setup.py install
@@ -132,20 +128,20 @@
Command Explanations
- sed -e ... -i setup.py: The first command in this
- sed prevents installation of
- logrotate and systemd configuration files. You may omit
- it if you use these utilities. The second command in this
- sed fixes buildng with BLFS
- distro.
+ sed -e ... -i setup.py: The first expression in
+ this sed command prevents a build failure (trying
+ installation of nonexistent file "CHANGES"). The second one prevents
+ installation of logrotate and systemd configuration files. You may omit it
+ if you use these utilities. The third one fixes building with BLFS.rm po/*.po: This command removes the international
- messages associated with this package. The command is required unless
- Babel is installed. If it is installed, po/ast.po still needs to be removed
- in order for the build to complete.
+ messages associated with this package. The command is required unless Babel
+ is installed. If it is installed, po/ast.po still needs to be removed in
+ order for the build to complete.
: Prevent installation of an
- autostart desktop file for KDE. If you use KDE, you should instead install the
- Wicd KDE Client.
-
+ autostart desktop file for KDE. If you use KDE, you should instead install
+ the
+ Wicd
+ KDE Client.
: Prevent installation of
@@ -153,9 +149,9 @@
Omit this option if you use acpid.
- : Prevent installation of hooks for
- pm-utils. Omit this option if you use pm-utils.
-
- : Prevent installation of any init scripts,
- as a bootscript is installed later in the instructions.
+ : Prevent installation of hooks
+ for pm-utils. Omit this option if you use pm-utils.
+
+ : Prevent installation of any init
+ scripts, as a bootscript is installed later in the instructions.: Prevent
@@ -166,7 +162,4 @@
The group that will have permission to use the Wicd client (default is the
users group).
-
- LANG=C: This environment variable is needed to allow
- the installation to complete.
@@ -231,8 +224,8 @@
wicd, wicd-cli, wicd-client, wicd-curses, and wicd-gtk
- none
- /etc/wicd, /usr/lib/python&python2-majorver;/site-packages/wicd,
- /usr/share/doc/wicd-&wicd-version;, /usr/share/pixmaps/wicd,
- /usr/share/wicd, /var/lib/wicd, /var/log/wicd, and /var/run/wicd
+ None
+ /{etc,usr/share,var/lib,var/log,var/run}/wicd,
+ /usr/lib/python2.7/site-packages/wicd and
+ /usr/share/doc/wicd-&wicd-version;
Index: networking/textweb/lynx.xml
===================================================================
--- networking/textweb/lynx.xml (revision ea0c1c2b12799e88691e76bd6570a722b13ef52d)
+++ networking/textweb/lynx.xml (revision 0fe2f5b9d2ec42161d3aa571a9f64fcd8e1df71e)
@@ -201,5 +201,6 @@
user, change this setting:
-sed -i 's/#\(LOCALE_CHARSET\):FALSE/\1:TRUE/' /etc/lynx/lynx.cfg
+sed -e '/#LOCALE/ a LOCALE_CHARSET:TRUE' \
+ -i /etc/lynx/lynx.cfgThe built-in editor in Lynx
@@ -212,5 +213,6 @@
combination by default). Still as the
root user:
-sed -i 's/#\(DEFAULT_EDITOR\):/\1:vi/' /etc/lynx/lynx.cfg
+sed -e '/#DEFAULT_ED/ a DEFAULT_EDITOR:vi' \
+ -i /etc/lynx/lynx.cfgLynx handles the following values of
@@ -227,5 +229,6 @@
root user, change this
setting:
-sed -i 's/#\(PERSISTENT_COOKIES\):FALSE/\1:TRUE/' /etc/lynx/lynx.cfg
+sed -e '/#PERSIST/ a PERSISTENT_COOKIES:TRUE' \
+ -i /etc/lynx/lynx.cfgMany other system-wide settings such as proxies can also be set
Index: packages.ent
===================================================================
--- packages.ent (revision ea0c1c2b12799e88691e76bd6570a722b13ef52d)
+++ packages.ent (revision 0fe2f5b9d2ec42161d3aa571a9f64fcd8e1df71e)
@@ -46,5 +46,5 @@
-
+
@@ -57,5 +57,5 @@
-
+
@@ -384,5 +384,5 @@
-
+
@@ -741,5 +741,5 @@
-
+
Index: postlfs/editors/bluefish.xml
===================================================================
--- postlfs/editors/bluefish.xml (revision ea0c1c2b12799e88691e76bd6570a722b13ef52d)
+++ postlfs/editors/bluefish.xml (revision 0fe2f5b9d2ec42161d3aa571a9f64fcd8e1df71e)
@@ -7,8 +7,8 @@
-
-
-
-
+
+
+
+
]>
@@ -89,5 +89,5 @@
,
and
- Jing
+ Jing
Index: postlfs/filesystems/lvm2.xml
===================================================================
--- postlfs/filesystems/lvm2.xml (revision ea0c1c2b12799e88691e76bd6570a722b13ef52d)
+++ postlfs/filesystems/lvm2.xml (revision 0fe2f5b9d2ec42161d3aa571a9f64fcd8e1df71e)
@@ -7,8 +7,8 @@
-
-
-
-
+
+
+
+
]>
Index: x/installing/libinput.xml
===================================================================
--- x/installing/libinput.xml (revision ea0c1c2b12799e88691e76bd6570a722b13ef52d)
+++ x/installing/libinput.xml (revision 0fe2f5b9d2ec42161d3aa571a9f64fcd8e1df71e)
@@ -5,10 +5,10 @@
%general-entities;
-
+
-
-
+
+