Author: dj
Date: Sun Jan 15 09:33:23 2017
New Revision: 18186
Log:
Fix build issue with latest gpgme.
Modified:
trunk/BOOK/general.ent
trunk/BOOK/general/prog/cmake.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/kde/extra-cmake-modules.xml
trunk/BOOK/kde/libdbusmenuqt.xml
trunk/BOOK/kde/phonon-backend-gstreamer.xml
trunk/BOOK/kde/phonon-backend-vlc.xml
trunk/BOOK/kde/phonon.xml
trunk/BOOK/kde/polkit-qt.xml
trunk/BOOK/postlfs/security/gpgme.xml
Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent Sat Jan 14 16:20:55 2017 (r18185)
+++ trunk/BOOK/general.ent Sun Jan 15 09:33:23 2017 (r18186)
@@ -1,12 +1,12 @@
<!-- $LastChangedBy$ $Date$ -->
-<!ENTITY day "14"> <!-- Always 2 digits -->
+<!ENTITY day "15"> <!-- Always 2 digits -->
<!ENTITY month "01"> <!-- Always 2 digits -->
<!ENTITY year "2017">
<!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS Development Team">
<!ENTITY version "&year;-&month;-&day;">
-<!ENTITY releasedate "January 14th &year;">
+<!ENTITY releasedate "January 15th &year;">
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
<!ENTITY lfs-version "development"> <!-- x.y|development -->
Modified: trunk/BOOK/general/prog/cmake.xml
==============================================================================
--- trunk/BOOK/general/prog/cmake.xml Sat Jan 14 16:20:55 2017 (r18185)
+++ trunk/BOOK/general/prog/cmake.xml Sun Jan 15 09:33:23 2017 (r18186)
@@ -151,14 +151,14 @@
<title>Command Explanations</title>
<para>
- <command>sed ... CMakeLists.txt</command>: This command
- disables the attempt to use the external libuv library.
+ <command>sed -i '/CMAKE_USE_LIBUV 1/s/1/0/' CMakeLists.txt</command>:
+ This command disables the attempt to use the external libuv library.
</para>
<para>
- <command>sed ... Modules/GNUInstallDirs.cmake</command>:
+ <command>sed -i '/"lib64"/s/64//'
Modules/GNUInstallDirs.cmake</command>:
This command disables applications using cmake from attempting to
- install files in /usr/lib64/.
+ install files in a subdirectory named lib64 rather than lib.
</para>
<para>
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Sat Jan 14 16:20:55
2017 (r18185)
+++ trunk/BOOK/introduction/welcome/changelog.xml Sun Jan 15 09:33:23
2017 (r18186)
@@ -43,6 +43,16 @@
</listitem>
-->
<listitem>
+ <para>January 15th, 2016</para>
+ <itemizedlist>
+ <listitem>
+ <para>[dj] - Fixed release issue with gpgme-1.8.0 that affects
+ kwallet.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>January 14th, 2016</para>
<itemizedlist>
<listitem>
Modified: trunk/BOOK/kde/extra-cmake-modules.xml
==============================================================================
--- trunk/BOOK/kde/extra-cmake-modules.xml Sat Jan 14 16:20:55 2017
(r18185)
+++ trunk/BOOK/kde/extra-cmake-modules.xml Sun Jan 15 09:33:23 2017
(r18186)
@@ -96,7 +96,9 @@
commands:
</para>
-<screen><userinput>mkdir build &&
+<screen><userinput>sed -i '/"lib64"/s/64//' kde-modules/KDEInstallDirs.cmake
&&
+
+mkdir build &&
cd build &&
cmake -DCMAKE_INSTALL_PREFIX=/usr .. &&
@@ -119,6 +121,17 @@
</sect2>
+ <sect2 role="commands">
+ <title>Command Explanations</title>
+
+ <para>
+ <command>sed -i '/"lib64"/s/64//'
kde-modules/KDEInstallDirs.cmake</command>:
+ This command disables applications using cmake from attempting to
+ install files in a subdirectory named lib64 rather than lib.
+ </para>
+
+ </sect2>
+
<sect2 role="content">
<title>Contents</title>
Modified: trunk/BOOK/kde/libdbusmenuqt.xml
==============================================================================
--- trunk/BOOK/kde/libdbusmenuqt.xml Sat Jan 14 16:20:55 2017 (r18185)
+++ trunk/BOOK/kde/libdbusmenuqt.xml Sun Jan 15 09:33:23 2017 (r18186)
@@ -83,7 +83,6 @@
cd build &&
cmake -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_BUILD_TYPE=Release \
-DWITH_DOC=OFF \
-Wno-dev .. &&
Modified: trunk/BOOK/kde/phonon-backend-gstreamer.xml
==============================================================================
--- trunk/BOOK/kde/phonon-backend-gstreamer.xml Sat Jan 14 16:20:55 2017
(r18185)
+++ trunk/BOOK/kde/phonon-backend-gstreamer.xml Sun Jan 15 09:33:23 2017
(r18186)
@@ -93,7 +93,6 @@
cd build &&
cmake -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_BUILD_TYPE=Release \
-DPHONON_BUILD_PHONON4QT5=ON \
-Wno-dev .. &&
Modified: trunk/BOOK/kde/phonon-backend-vlc.xml
==============================================================================
--- trunk/BOOK/kde/phonon-backend-vlc.xml Sat Jan 14 16:20:55 2017
(r18185)
+++ trunk/BOOK/kde/phonon-backend-vlc.xml Sun Jan 15 09:33:23 2017
(r18186)
@@ -86,7 +86,6 @@
cd build &&
cmake -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_BUILD_TYPE=Release \
-DPHONON_BUILD_PHONON4QT5=ON \
-Wno-dev .. &&
Modified: trunk/BOOK/kde/phonon.xml
==============================================================================
--- trunk/BOOK/kde/phonon.xml Sat Jan 14 16:20:55 2017 (r18185)
+++ trunk/BOOK/kde/phonon.xml Sun Jan 15 09:33:23 2017 (r18186)
@@ -87,7 +87,6 @@
cmake -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_LIBDIR=lib \
-DPHONON_BUILD_PHONON4QT5=ON \
-Wno-dev .. &&
make</userinput></screen>
Modified: trunk/BOOK/kde/polkit-qt.xml
==============================================================================
--- trunk/BOOK/kde/polkit-qt.xml Sat Jan 14 16:20:55 2017 (r18185)
+++ trunk/BOOK/kde/polkit-qt.xml Sun Jan 15 09:33:23 2017 (r18186)
@@ -81,7 +81,6 @@
cmake -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_LIBDIR=lib \
-Wno-dev .. &&
make</userinput></screen>
Modified: trunk/BOOK/postlfs/security/gpgme.xml
==============================================================================
--- trunk/BOOK/postlfs/security/gpgme.xml Sat Jan 14 16:20:55 2017
(r18185)
+++ trunk/BOOK/postlfs/security/gpgme.xml Sun Jan 15 09:33:23 2017
(r18186)
@@ -102,6 +102,12 @@
<title>Installation of GPGME</title>
<para>
+ Fix a minor release error:
+ </para>
+
+<screen><userinput>sed 's#@libsuffix@#.so#' -i
lang/cpp/src/GpgmeppConfig.cmake.in.in</userinput></screen>
+
+ <para>
Install <application>GPGME</application> by running the following
commands:
</para>
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page