Changeset 0b664be0


Ignore:
Timestamp:
10/16/2021 01:00:57 PM (20 months ago)
Author:
Ken Moffat <ken@…>
Branches:
11.1, 11.2, 11.3, ken/inkscape-core-mods, lazarus, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226
Children:
c99889d9
Parents:
580ce98 (diff), 97b8038 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'trunk' of git.linuxfromscratch.org:blfs into trunk

Files:
15 edited
1 moved

Legend:

Unmodified
Added
Removed

  • general/genutils/genutils.xml

    r580ce98 r0b664be0  
    3838  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lsof.xml"/>
    3939  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pinentry.xml"/>
    40   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rarian.xml"/>
     40  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rarian.xml"/>-->
    4141  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rep-gtk.xml"/>
    4242  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="screen.xml"/>

  • general/prog/git.xml

    r580ce98 r0b664be0  
    99  <!ENTITY git-download-http "&git-root;/git-&git-version;.tar.xz">
    1010  <!ENTITY git-download-ftp  " ">
    11   <!ENTITY git-md5sum        "0990ff97af1511be0d9f0d3223dd4359">
     11  <!ENTITY git-md5sum        "3462f34d9c17288eee854b7645f6a0a1">
    1212
    1313  <!ENTITY git-size          "6.2 MB">
    … …  
    1818  <!-- With 2.23.0, there was a large increase in time for tests. Possibly disk related? -->
    1919  <!-- Confirmed that it is disk related.-->
    20   <!ENTITY git-time          "0.4 SBU (with parallelism=4; add 0.4 SBU for building documentation and 2.1 SBU for tests, both with parallelism=4)">
     20  <!ENTITY git-time          "0.5 SBU (with parallelism=4; add 0.4 SBU for building documentation and 2.1 SBU for tests, both with parallelism=4)">
    2121]>
    2222

  • general/prog/jinja2.xml

    r580ce98 r0b664be0  
    77  <!ENTITY Jinja2-download-http "&pymodules-dl;/J/Jinja2/Jinja2-&Jinja2-version;.tar.gz">
    88  <!ENTITY Jinja2-download-ftp  " ">
    9   <!ENTITY Jinja2-md5sum        "25ba6ef98c164878acff1036fbd72a1d">
     9  <!ENTITY Jinja2-md5sum        "059f89375d7ea60eb7013f341f0b89e7">
    1010  <!ENTITY Jinja2-size          "264 KB">
    1111  <!ENTITY Jinja2-buildsize     "2.3 MB">

  • general/prog/python3.xml

    r580ce98 r0b664be0  
    88           "https://www.python.org/ftp/python/&python3-version;/Python-&python3-version;.tar.xz">
    99  <!ENTITY python3-download-ftp  " ">
    10   <!ENTITY python3-md5sum        "fddb060b483bc01850a3f412eea1d954">
     10  <!ENTITY python3-md5sum        "3e7035d272680f80e3ce4e8eb492d580">
    1111  <!ENTITY python3-size          "18 MB">
    12   <!ENTITY python3-buildsize     "193 MB (add 36 MB for tests)">
    13   <!ENTITY python3-time          "2.4 SBU (using parallelism=4; add 1.7 SBU for tests)">
     12  <!ENTITY python3-buildsize     "200 MB (add 38 MB for tests)">
     13  <!ENTITY python3-time          "2.4 SBU (using parallelism=4; add 1.6 SBU for tests)">
    1414  <!--
    1515  Note: Size does not reflect docs that were install in LFS.

  • introduction/welcome/changelog.xml

    r580ce98 r0b664be0  
    5353
    5454    <listitem>
     55      <para>October 15th, 2021</para>
     56      <itemizedlist>
     57        <listitem>
     58          <para>[renodr] - Adapt cracklib to build with Python 3.10.</para>
     59        </listitem>
     60        <listitem>
     61          <para>[renodr] - Adapt gpgme to build with Python 3.10.</para>
     62        </listitem>
     63      </itemizedlist>
     64    </listitem>
     65
     66    <listitem>
     67      <para>October 14th, 2021</para>
     68      <itemizedlist>
     69        <listitem>
     70          <para>[bdubbs] - Upgrade to imlib2-1.7.4. Fixes
     71          <ulink url="&blfs-ticket-root;15373">#15373</ulink>.</para>
     72        </listitem>
     73        <listitem>
     74          <para>[bdubbs] - Upgrade to vim-8.2.3508. Fixes
     75          <ulink url="&blfs-ticket-root;15671">#15671</ulink>.</para>
     76        </listitem>
     77        <listitem>
     78          <para>[bdubbs] - Upgrade to Jinja2-3.0.2. Fixes
     79          <ulink url="&blfs-ticket-root;15645">#15645</ulink>.</para>
     80        </listitem>
     81        <listitem>
     82          <para>[bdubbs] - Upgrade to python3-3.10.0. Fixes
     83          <ulink url="&blfs-ticket-root;15641">#15641</ulink>.</para>
     84        </listitem>
     85      </itemizedlist>
     86    </listitem>
     87
     88    <listitem>
     89      <para>October 13th, 2021</para>
     90      <itemizedlist>
     91        <listitem>
     92          <para>[thomas] - Upgrade ristretto-0.12.0. Fixes
     93          <ulink url="&blfs-ticket-root;15666">#15666</ulink>.</para>
     94        </listitem>
     95        <listitem>
     96          <para>[thomas] - Upgrade git-2.33.1. Fixes
     97          <ulink url="&blfs-ticket-root;15669">#15669</ulink>.</para>
     98        </listitem>
     99      </itemizedlist>
     100    </listitem>
     101
     102    <listitem>
    55103      <para>October 12th, 2021</para>
    56104      <itemizedlist>
     105        <listitem>
     106          <para>[renodr] - Archive Rarian.</para>
     107        </listitem>
    57108        <listitem>
    58109          <para>[ken] - Update to node.js-v14.18.1 (security fix). Fixes

  • packages.ent

    r580ce98 r0b664be0  
    6565<!ENTITY juffed-version               "0.10.r71.gc3c1a3f">
    6666<!ENTITY nano-version                 "5.9">
    67 <!ENTITY vim-version                  "8.2.3337">
     67<!ENTITY vim-version                  "8.2.3508">
    6868<!ENTITY vim-majmin                   "82">
    6969
    … …  
    346346<!ENTITY gc-version                   "8.0.4">
    347347<!ENTITY gdb-version                  "11.1">
    348 <!ENTITY git-version                  "2.33.0">
     348<!ENTITY git-version                  "2.33.1">
    349349<!ENTITY guile-version                "3.0.7">
    350350<!ENTITY librep-version               "0.92.7">
    … …  
    365365
    366366<!ENTITY python3-major                "3">
    367 <!ENTITY python3-minor                "9">
    368 <!ENTITY python3-patch                "7">
     367<!ENTITY python3-minor                "10">
     368<!ENTITY python3-patch                "0">
    369369<!ENTITY python3-majorver             "&python3-major;.&python3-minor;">
    370370<!ENTITY python3-version              "&python3-majorver;.&python3-patch;">
    … …  
    564564<!-- <!ENTITY funcsigs-version             "1.0.2"> -->
    565565<!ENTITY decorator-version            "5.0.9">
    566 <!ENTITY Jinja2-version               "3.0.1">
     566<!ENTITY Jinja2-version               "3.0.2">
    567567<!-- libxml2 for Python2 shares the version of libxml2 -->
    568568<!ENTITY lxml-version                 "4.6.3">
    … …  
    760760<!ENTITY gtksourceview5-version       "5.2.0">
    761761<!ENTITY gtk-vnc-version              "1.2.0">
    762 <!ENTITY imlib2-version               "1.7.2">
     762<!ENTITY imlib2-version               "1.7.4">
    763763<!ENTITY keybinder2-version           "0.3.1">
    764764<!ENTITY keybinder3-version           "0.3.2">
    … …  
    860860<!ENTITY xfce4-terminal-version       "0.8.10">
    861861<!ENTITY xfburn-version               "0.6.2">
    862 <!ENTITY ristretto-version            "0.11.0">
     862<!ENTITY ristretto-version            "0.12.0">
    863863<!ENTITY xfce4-mixer-version          "4.10.0">
    864864<!ENTITY xfce4-notifyd-version        "0.6.2">

  • postlfs/editors/vim.xml

    r580ce98 r0b664be0  
    99  <!ENTITY vim-download-http "&sources-anduin-http;/vim/vim-&vim-version;.tar.gz">
    1010  <!ENTITY vim-download-ftp  " ">
    11   <!ENTITY vim-md5sum        "e0325a4988b1b99b9c2e46fa853c1980">
     11  <!ENTITY vim-md5sum        "f6004d3e776040e2301a1967975d00d1">
    1212  <!ENTITY vim-size          "15 MB">
    1313  <!ENTITY vim-buildsize     "109 MB (add 61 MB for tests)">
    14   <!ENTITY vim-time          "0.3 SBU (with parallelism=4; add 2.1 SBU for tests)">
     14  <!ENTITY vim-time          "0.3 SBU (with parallelism=4; add 2.2 SBU for tests)">
    1515]>
    1616

  • postlfs/security/cracklib.xml

    r580ce98 r0b664be0  
    134134
    135135<screen><userinput>sed -i '/skipping/d' util/packer.c &amp;&amp;
     136
     137sed -i '15209 s/.*/am_cv_python_version=&python3-majorver;/' configure &amp;&amp;
    136138
    137139PYTHON=python3 CPPFLAGS=-I/usr/include/python&python3-majorver; \

  • postlfs/security/gpgme.xml

    r580ce98 r0b664be0  
    106106
    107107    <para>
    108       At first, fix an issue building the package with Glibc-2.34 or later:
    109     </para>
    110 
    111 <screen><userinput>sed 's/defined(__sun.*$/1/' -i src/posix-io.c</userinput></screen>
     108      First, fix an issue building the package with Glibc-2.34 or later:
     109    </para>
     110
     111<screen><userinput remap="pre">sed 's/defined(__sun.*$/1/' -i src/posix-io.c</userinput></screen>
     112
     113    <para>
     114      Next, fix an issue building with Python 3.10 installed:
     115    </para>
     116
     117<screen><userinput remap="pre">sed -e 's/3\.9/3\.10/'   \
     118    -e '23664,+3 s/^/#/' \
     119    -i configure</userinput></screen>
    112120
    113121    <para>

  • x/lib/imlib2.xml

    r580ce98 r0b664be0  
    77  <!ENTITY imlib2-download-http "&sourceforge-dl;/enlightenment/imlib2-&imlib2-version;.tar.bz2">
    88  <!ENTITY imlib2-download-ftp  " ">
    9   <!ENTITY imlib2-md5sum        "d24dc90ac08810d0a66bcd226e35a451">
     9  <!ENTITY imlib2-md5sum        "373ddc1978e5aa6e3a11bdb1a9d622c6">
    1010  <!ENTITY imlib2-size          "876 KB">
    1111  <!ENTITY imlib2-buildsize     "11 MB">

  • x/lib/webkitgtk.xml

    r580ce98 r0b664be0  
    126126      <ulink url="https://ccache.dev/">ccache</ulink>,
    127127      <ulink url="https://sourceforge.net/projects/hunspell/files/Hyphen/">Hyphen</ulink>,
    128       <ulink url="http://xsltml.sourceforge.net/">MathML</ulink>,
     128      <ulink url="https://github.com/AOMediaCodec/libavif">libavif</ulink>,
    129129      <ulink url="https://gnome.pages.gitlab.gnome.org/libmanette/">libmanette</ulink>, and
    130130      <ulink url="https://github.com/flatpak/xdg-dbus-proxy">xdg-dbus-proxy</ulink>

  • xfce/apps/ristretto.xml

    r580ce98 r0b664be0  
    66
    77  <!ENTITY ristretto-download-http
    8            "https://archive.xfce.org/src/apps/ristretto/0.11/ristretto-&ristretto-version;.tar.bz2">
     8           "https://archive.xfce.org/src/apps/ristretto/0.12/ristretto-&ristretto-version;.tar.bz2">
    99  <!ENTITY ristretto-download-ftp  " ">
    10   <!ENTITY ristretto-md5sum        "134d4a49a98b28ba6e91b862fb9a24cc">
    11   <!ENTITY ristretto-size          "576 KB">
     10  <!ENTITY ristretto-md5sum        "722e383b1ced064294146f515cbe15ff">
     11  <!ENTITY ristretto-size          "586 KB">
    1212  <!ENTITY ristretto-buildsize     "9.6 MB">
    1313  <!ENTITY ristretto-time          "0.1 SBU">

  • xsoft/other/balsa.xml

    r580ce98 r0b664be0  
    7878      <xref linkend="gmime3"/>,
    7979      <xref linkend="gpgme"/>,
    80       <xref linkend="gtk3"/>,
    81       <xref linkend="libnotify"/>, and
    82       <xref linkend="rarian"/>
     80      <xref linkend="gtk3"/>, and
     81      <xref linkend="libnotify"/>
     82      <!--<xref linkend="rarian"/>-->
    8383    </para>
    8484

  • xsoft/other/hexchat.xml

    r580ce98 r0b664be0  
    88  <!ENTITY hexchat-download-http "https://dl.hexchat.net/hexchat/hexchat-&hexchat-version;.tar.xz">
    99  <!ENTITY hexchat-download-ftp  " ">
    10   <!ENTITY hexchat-md5sum        "9f04c48f011b646b91d03c5776fce776">
    11   <!ENTITY hexchat-size          "1.2 MB">
     10  <!ENTITY hexchat-md5sum        "ecf5133c369bbc88df064f8506867fb6">
     11  <!ENTITY hexchat-size          "1.3 MB">
    1212  <!ENTITY hexchat-buildsize     "21 MB">
    1313  <!ENTITY hexchat-time          "0.1 SBU (using parallelism=4)">

  • xsoft/other/tigervnc.xml

    r580ce98 r0b664be0  
    159159    </para>
    160160
    161 <screen><userinput># Put code in place
     161<screen revision="sysv"><userinput># Put code in place
     162mkdir -p unix/xserver &amp;&amp;
     163tar -xf ../xorg-server-&tigervnc-xorg-version;.tar.bz2 \
     164    --strip-components=1              \
     165    -C unix/xserver                   &amp;&amp;
     166( cd unix/xserver &amp;&amp;
     167  patch -Np1 -i ../xserver120.patch ) &amp;&amp;
     168
     169# Build viewer
     170cmake -G "Unix Makefiles"         \
     171      -DCMAKE_INSTALL_PREFIX=/usr \
     172      -DCMAKE_BUILD_TYPE=Release  \
     173      -DINSTALL_SYSTEMD_UNITS=OFF \
     174      -Wno-dev . &amp;&amp;
     175make &amp;&amp;
     176
     177# Build server
     178pushd unix/xserver &amp;&amp;
     179  autoreconf -fiv  &amp;&amp;
     180
     181  CPPFLAGS="-I/usr/include/drm"       \
     182  ./configure $XORG_CONFIG            \
     183      --disable-xwayland    --disable-dri        --disable-dmx         \
     184      --disable-xorg        --disable-xnest      --disable-xvfb        \
     185      --disable-xwin        --disable-xephyr     --disable-kdrive      \
     186      --disable-devel-docs  --disable-config-hal --disable-config-udev \
     187      --disable-unit-tests  --disable-selective-werror                 \
     188      --disable-static      --enable-dri3                              \
     189      --without-dtrace      --enable-dri2        --enable-glx          \
     190      --with-pic &amp;&amp;
     191  make  &amp;&amp;
     192popd</userinput></screen>
     193
     194<screen revision="systemd"><userinput># Put code in place
    162195mkdir -p unix/xserver &amp;&amp;
    163196tar -xf ../xorg-server-&tigervnc-xorg-version;.tar.bz2 \
Note: See TracChangeset for help on using the changeset viewer.