linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-01-25 07:42:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'trunk' into renodr/vulkan-addition

Browse Source 
Merge in changes from trunk
This commit is contained in:
Douglas R. Reno 2023-11-29 14:07:21 -06:00
commit 105a90a727
6 changed files with 66 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
general/graphlib/jasper.xml
View File

@ -6,9 +6,9 @@
<!ENTITY jasper-download-http "https://github.com/jasper-software/jasper/archive/version-&jasper-version;/jasper-&jasper-version;.tar.gz">
<!ENTITY jasper-download-ftp " ">
<!ENTITY jasper-md5sum "ba2cebfc9c1970168ed8534cfaf9f6d3">
<!ENTITY jasper-md5sum "85ce7c19ca474306974365b7e04635ce">
<!ENTITY jasper-size "1.9 MB">
<!ENTITY jasper-buildsize "9.6 MB (with tests)">
<!ENTITY jasper-buildsize "10.0 MB (with tests)">
<!ENTITY jasper-time "0.3 SBU (with tests)">
]>
@ -117,6 +117,7 @@ cmake -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_INSTALL_RPATH=YES \
-DJAS_ENABLE_DOC=NO \
-DALLOW_IN_SOURCE_BUILD=YES \
-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/jasper-&jasper-version; \
.. &amp;&amp;
make</userinput></screen>
@ -147,6 +148,13 @@ make</userinput></screen>
is installed.
</para>
<para>
<parameter>-DALLOW_IN_SOURCE_BUILD=YES</parameter>: This switch allows
building from within the source tree. In our case, this is needed to
allow us to build inside of the BUILD directory instead of needing to
create another directory outside of the source tree.
</para>
</sect2>
<sect2 role="content">

7
general/prog/python-modules/sphinx_rtd_theme.xml
View File

@ -8,7 +8,7 @@
<!ENTITY sphinx_rtd_theme-download-ftp " ">
<!ENTITY sphinx_rtd_theme-md5sum "&sphinx_rtd_theme-md5sum;">
<!ENTITY sphinx_rtd_theme-size "2.7 MB">
<!ENTITY sphinx_rtd_theme-buildsize "40 MB (with tests)">
<!ENTITY sphinx_rtd_theme-buildsize "36 MB (with tests)">
<!ENTITY sphinx_rtd_theme-time "0.1 SBU (with tests)">
]>
@ -87,14 +87,15 @@
<sect3 role="installation">
<title>Installation of Sphinx_rtd_theme</title>
<!-- Upstream tentative fix: not completely tested, it seems
but otherwise we fall into dependency hell -->
but otherwise we fall into dependency hell
Fixed in 2.0.0 -renodr
<para>
Fix wrong versions for dependencies:
</para>
<screen><userinput>sed -e s/0.19/0.21/ \
-i setup.cfg</userinput></screen>
-->
<para>
Build the module:
</para>

23
introduction/welcome/changelog.xml
View File

@ -38,9 +38,32 @@
</itemizedlist>
</listitem>
-->
<listitem>
<para>November 29th, 2023</para>
<itemizedlist>
<listitem>
<para>[renodr] - Update to sphinx-rtd-theme-2.0.0 (Python Module).
Fixes <ulink url="&blfs-ticket-root;18933">#18933</ulink>.</para>
</listitem>
<listitem>
<para>[renodr] - Update to jasper-4.1.1. Fixes
<ulink url="&blfs-ticket-root;18931">#18931</ulink>.</para>
</listitem>
<listitem>
<para>[rahul] - Update to nss-3.95. Fixes
<ulink url="&blfs-ticket-root;18924">#18924</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>November 28th, 2023</para>
<itemizedlist>
<listitem>
<para>[renodr] - Fix building sendmail now that Berkeley DB has been
archived. Thanks goes to Joe Locash for the report and the solution.
Fixes <ulink url="&blfs-ticket-root;18929">#18929</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to libqalculate-4.9.0. Fixes
<ulink url="&blfs-ticket-root;18925">#18925</ulink>.</para>

10
packages.ent
View File

@ -20,8 +20,8 @@
<!--!ENTITY mitkrb-version "&mitkrb-major-version;">-->
<!ENTITY nettle-version "3.9.1">
<!ENTITY nss-dir "3_94">
<!ENTITY nss-minor-version "94">
<!ENTITY nss-dir "3_95">
<!ENTITY nss-minor-version "95">
<!--
<!ENTITY nss-micro-version "1">
<!ENTITY nss-version "3.&nss-minor-version;.&nss-micro-version;">
@ -207,7 +207,7 @@
<!ENTITY glm-version "0.9.9.8">
<!ENTITY graphite2-version "1.3.14">
<!ENTITY harfbuzz-version "8.3.0">
<!ENTITY jasper-version "4.1.0">
<!ENTITY jasper-version "4.1.1">
<!ENTITY lcms2-version "2.14">
<!ENTITY libavif-version "1.0.2">
<!ENTITY libexif-version "0.6.24">
@ -579,8 +579,8 @@
<!ENTITY six-version "1.16.0">
<!ENTITY six-md5sum "a7c927740e4964dd29b72cebfc1429bb">
<!ENTITY sphinx-version "7.2.6">
<!ENTITY sphinx_rtd_theme-version "1.3.0">
<!ENTITY sphinx_rtd_theme-md5sum "9668eae48ab9ca55f88bcb00e4261e36">
<!ENTITY sphinx_rtd_theme-version "2.0.0">
<!ENTITY sphinx_rtd_theme-md5sum "8ad74a8e9ca706ed77117be0e9eed7e8">
<!-- Python module versions used in the Python Dependencies instructions -->
<!-- sc = sphinxcontrib -->

29
postlfs/security/nss.xml
View File

@ -13,9 +13,9 @@
<!-- no micro versions -->
<!ENTITY nss-download-http "https://&nss-url;/NSS_&nss-dir;_RTM/src/nss-&nss-version;.tar.gz">
<!ENTITY nss-download-ftp " ">
<!ENTITY nss-md5sum "a4694b0508ef509aa0bc0f3e068a3ad2">
<!ENTITY nss-md5sum "aa53fba59dd58de418447c9857acee41">
<!ENTITY nss-size "74 MB">
<!ENTITY nss-buildsize "234 MB (add 139 MB for tests)">
<!ENTITY nss-buildsize "305 MB (add 142 MB for tests)">
<!ENTITY nss-time "1.2 SBU (with parallelism=4, add 15 SBU for tests on AMD Ryzens or at least 30 SBU on Intel machines)">
<!-- On my system, I got 64.2 SBU, but Bruce gets 18 SBU. -renodr -->
<!-- On my system, I got 63 SBU, but Xi gets ~18 SBU. -pierre (for 3.78) -->
@ -36,6 +36,14 @@
Unknown status: 2
TinderboxPrint:Unknown: 2
-->
<!-- Test Results 3.95: (Intel i9-10900k) I got close to 70 SBU [rahul]
Passed: 69982
Failed: 0
Failed with core: 0
ASan failures: 0
Unknown status: 2
TinderboxPrint:Unknown: 2
-->
]>
<sect1 id="nss" xreflabel="nss-&nss-version;">
@ -161,7 +169,7 @@ patch -Np1 -i ../nss-&nss-version;-illegal_instruction-1.patch</userinput></scre
cd nss &amp;&amp;
make BUILD_OPT=1 \
make BUILD_OPT=1 \
NSPR_INCLUDE_DIR=/usr/include/nspr \
USE_SYSTEM_ZLIB=1 \
ZLIB_LIBS=-lz \
@ -187,9 +195,18 @@ cd ../</userinput></screen>
Without these variables, a FQDN is
required to be specified and this generic way should work for
everyone, provided <systemitem>localhost.localdomain</systemitem>
is defined in <filename>/etc/hosts</filename>, as done in
<ulink url="&lfs-root;/chapter09/network.html#ch-config-hosts">the
LFS book</ulink>.
is defined
<phrase revision='sysv'>
in <filename>/etc/hosts</filename>, as done in
<ulink url="&lfs-root;/chapter09/network.html#ch-config-hosts">
the LFS book</ulink>.
</phrase>
<phrase revision='systemd'>
by the <systemitem class='library'>myhostname</systemitem>
NSS module, as specified in
<ulink url="&lfs-root;/chapter08/glibc.html#conf-glibc">
the LFS book</ulink>.
</phrase>
</para>
</listitem>
<listitem>

2
server/mail/sendmail.xml
View File

@ -130,7 +130,7 @@ install -v -m700 -d /var/spool/mqueue</userinput></screen>
<screen><userinput>cat &gt;&gt; devtools/Site/site.config.m4 &lt;&lt; "EOF"
<literal>APPENDDEF(`confENVDEF',`-DSTARTTLS -DSASL -DLDAPMAP -DHASFLOCK')
APPENDDEF(`confLIBS', `-lssl -lcrypto -lsasl2 -lldap -llber -ldb')
APPENDDEF(`confLIBS', `-lssl -lcrypto -lsasl2 -lldap -llber')
APPENDDEF(`confINCDIRS', `-I/usr/include/sasl')</literal>
EOF</userinput></screen>