Changeset 2315a3ca


Ignore:
Timestamp:
01/22/2022 07:10:19 PM (2 years ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
11.1, 11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
02cfd6d
Parents:
65c5c56 (diff), 61f5b628 (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:
6 edited

Legend:

Unmodified
Added
Removed

  • general/genlib/umockdev.xml

    r65c5c56 r2315a3ca  
    77  <!ENTITY umockdev-download-http "https://github.com/martinpitt/umockdev/releases/download/&umockdev-version;/umockdev-&umockdev-version;.tar.xz">
    88  <!ENTITY umockdev-download-ftp  " ">
    9   <!ENTITY umockdev-md5sum        "cbf62c1a89123a9c13f9ff6598c8cd09">
     9  <!ENTITY umockdev-md5sum        "ab48c6c9e4ab173f2e8dcd6ce3bf445e">
    1010  <!ENTITY umockdev-size          "475 KB">
    1111  <!ENTITY umockdev-buildsize     "7.2 MB (with tests)">
    12   <!ENTITY umockdev-time          "0.2 SBU (with tests)">
     12  <!ENTITY umockdev-time          "0.3 SBU (with tests)">
    1313
    1414]>

  • introduction/welcome/changelog.xml

    r65c5c56 r2315a3ca  
    6161          <ulink url="&blfs-ticket-root;15990">#15990</ulink>.</para>
    6262        </listitem>
     63        <listitem>
     64          <para>[pierre] - Fix network-manager-applet for building
     65          with newer versions of meson. Report by Joe Locash.</para>
     66        </listitem>
     67        <listitem>
     68          <para>[pierre] - Update to umockdev-0.17.6. Fixes
     69          <ulink url="&blfs-ticket-root;15998">#15998</ulink>.</para>
     70        </listitem>
     71        <listitem>
     72          <para>[pierre] - Update to gtk4-4.6.0. Fixes
     73          <ulink url="&blfs-ticket-root;15997">#15997</ulink>.</para>
     74        </listitem>
     75        <listitem>
     76          <para>[pierre] - Update to fop-2.7. Fixes
     77          <ulink url="&blfs-ticket-root;15996">#15996</ulink>.</para>
     78        </listitem>
    6379      </itemizedlist>
    6480    </listitem>

  • networking/netutils/network-manager-applet.xml

    r65c5c56 r2315a3ca  
    113113  <sect2 role="installation">
    114114    <title>Installation of NetworkManager Applet</title>
     115
     116    <para>
     117      First, fix building with newer versions of
     118      <application>meson</application>:
     119    </para>
     120
     121<screen><userinput>sed -i '/merge_file/{n;d}' meson.build</userinput></screen>
    115122
    116123    <para>

  • packages.ent

    r65c5c56 r2315a3ca  
    198198<!ENTITY telepathy-glib-version       "0.24.2">
    199199<!ENTITY uchardet-version             "0.0.7">
    200 <!ENTITY umockdev-version             "0.17.5">
     200<!ENTITY umockdev-version             "0.17.6">
    201201<!ENTITY wayland-version              "1.20.0">
    202202<!ENTITY wayland-protocols-version    "1.24">
    … …  
    760760<!ENTITY gtk2-version                 "2.24.33">
    761761<!ENTITY gtk3-version                 "3.24.31">
    762 <!ENTITY gtk4-version                 "4.4.1">
     762<!ENTITY gtk4-minor                   "4.6">
     763<!ENTITY gtk4-version                 "&gtk4-minor;.0">
    763764<!ENTITY gtk-engines-version          "2.20.2">
    764765<!ENTITY gtkmm2-version               "2.24.5">
    … …  
    11031104<!ENTITY psutils-version              "p17">
    11041105<!ENTITY epdfview-version             "0.1.8">
    1105 <!ENTITY fop-version                  "2.6">
     1106<!ENTITY fop-version                  "2.7">
    11061107<!ENTITY mupdf-version                "1.19.0">
    11071108<!ENTITY paps-version                 "0.7.1">

  • pst/ps/fop.xml

    r65c5c56 r2315a3ca  
    77  <!ENTITY fop-download-http "https://archive.apache.org/dist/xmlgraphics/fop/source/fop-&fop-version;-src.tar.gz">
    88  <!ENTITY fop-download-ftp  " ">
    9   <!ENTITY fop-md5sum        "1d6bc84d2ab7f971bbc628080e3c307f">
     9  <!ENTITY fop-md5sum        "7c67fe91c39d143f024ca4e3b60d7942">
    1010  <!ENTITY fop-size          "26 MB">
    11   <!ENTITY fop-buildsize     "522 MB (including files downloaded to the user directory)">
     11  <!ENTITY fop-buildsize     "530 MB (including files downloaded to the user directory)">
    1212  <!ENTITY fop-time          "0.4 SBU">
    1313
    14   <!ENTITY pdfbox-version    "2.0.24">
     14  <!ENTITY pdfbox-version    "2.0.25">
    1515  <!ENTITY pdfbox-download   "http://archive.apache.org/dist/pdfbox/&pdfbox-version;/pdfbox-&pdfbox-version;.jar">
    16   <!ENTITY pdfbox-md5sum     "9e97fc59c662738a5fb82dcc447d1e2f">
    17   <!ENTITY pdfbox-size       "2.7 MB">
     16  <!ENTITY pdfbox-md5sum     "1af87e04d5a252f7c7b36a242f2f0c4c">
     17  <!ENTITY pdfbox-size       "2.6 MB">
    1818
    1919  <!ENTITY fontbox-download  "http://archive.apache.org/dist/pdfbox/&pdfbox-version;/fontbox-&pdfbox-version;.jar">
    20   <!ENTITY fontbox-md5sum    "6c2066df0d706d85e950fe8c73d52ed8">
     20  <!ENTITY fontbox-md5sum    "23f43699839fee028bec108cac4fcb9e">
    2121  <!ENTITY fontbox-size      "1.5 MB">
    2222
    2323  <!ENTITY maven-major        "3">
    24   <!ENTITY maven-version      "3.6.3">
     24  <!ENTITY maven-version      "3.8.4">
    2525  <!ENTITY maven-download     "http://archive.apache.org/dist/maven/maven-&maven-major;/&maven-version;/binaries/apache-maven-&maven-version;-bin.tar.gz">
    26   <!ENTITY maven-md5sum       "9792c717f5845d952907d5144b8253c3">
    27   <!ENTITY maven-size         "9.1 MB (additionally, about 82 MB are downloaded to the building user's directory)">
     26  <!ENTITY maven-md5sum       "9ab6a21fed8a26ed9e100c5e19a8bf4e">
     27  <!ENTITY maven-size         "8.6 MB (additionally, about 91 MB are downloaded to the building user's directory)">
    2828
    2929  <!ENTITY offo-download     "&sourceforge-dl;/offo/2.2/offo-hyphenation.zip">
    … …  
    236236<screen><userinput>sed -e '/hyph\.stack/s/512k/1M/' \
    237237    -i fop/build.xml</userinput></screen>
     238fixed with maven-3.8.4
     239      <para>
     240        Fix building with JDK-16 due to an outdated Apache Maven plugin:
     241      </para>
     242
     243<screen><userinput remap="pre">sed -i 's/&lt;war.plugin.version&gt;2.2/&lt;war.plugin.version&gt;3.3.1/' pom.xml</userinput></screen>
    238244-->
    239       <para>
    240         Fix building with JDK-16 due to an outdated Apache Maven plugin:
    241       </para>
    242 
    243 <screen><userinput remap="pre">sed -i 's/&lt;war.plugin.version&gt;2.2/&lt;war.plugin.version&gt;3.3.1/' pom.xml</userinput></screen>
    244 
    245245      <para>
    246246        The <filename>build.xml</filename> file calls for an old version of
    … …  
    293293
    294294    <para>
    295       <command>sed -i ... build.xml</command>: This adds two switches to the
     295      <command>sed -i ... build.xml</command>: This adds three switches to the
    296296      <command>javadoc</command> command, preventing some errors from occuring
    297297      when building the documentation.

  • x/lib/gtk4.xml

    r65c5c56 r2315a3ca  
    55  %general-entities;
    66
    7   <!ENTITY gtk4-download-http "&gnome-download-http;/gtk/4.4/gtk-&gtk4-version;.tar.xz">
    8   <!ENTITY gtk4-download-ftp  "&gnome-download-ftp;/gtk/4.4/gtk-&gtk4-version;.tar.xz">
    9   <!ENTITY gtk4-md5sum        "f3661ba9a9e6805172c776c9c0a3b73c">
    10   <!ENTITY gtk4-size          "29 MB">
    11   <!ENTITY gtk4-buildsize     "672 MB (78 MB installed, add 310 MB for tests)">
    12   <!ENTITY gtk4-time          "1.2 SBU (using parallelism=4, add 0.5 SBU for tests)">
     7  <!ENTITY gtk4-download-http "&gnome-download-http;/gtk/&gtk4-minor;/gtk-&gtk4-version;.tar.xz">
     8  <!ENTITY gtk4-download-ftp  "&gnome-download-ftp;/gtk/&gtk4-minor;/gtk-&gtk4-version;.tar.xz">
     9  <!ENTITY gtk4-md5sum        "41c25ca304052f1a592f698f83922e23">
     10  <!ENTITY gtk4-size          "22 MB">
     11  <!ENTITY gtk4-buildsize     "499 MB (69 MB installed, add 10 MB for tests)">
     12  <!ENTITY gtk4-time          "1.1 SBU (using parallelism=4, add 0.2 SBU for tests)">
    1313]>
    1414
    … …  
    136136    <para>
    137137      To run the tests, issue: <command>meson test --setup x11</command>. If you
    138       are in a Wayland session, replace x11 with wayland. 8 tests are known to
    139       fail, out of 730.
    140     </para>
     138      are in a Wayland session, replace x11 with wayland. A few tests may fail.
     139    </para>
     140<!-- [pierre]: 4.6.0, wayland: 727 ok; 2 Expected Fail; 1 Fail; 1 Skipped -->
    141141
    142142    <para>
    … …  
    235235gtk-icon-theme-name = <replaceable>oxygen</replaceable>
    236236gtk-font-name = <replaceable>DejaVu Sans 12</replaceable>
    237 gtk-cutsor-theme-size = <replaceable>18</replaceable>
     237gtk-cursor-theme-size = <replaceable>18</replaceable>
    238238gtk-xft-antialias = <replaceable>1</replaceable>
    239239gtk-xft-hinting = <replaceable>1</replaceable>
Note: See TracChangeset for help on using the changeset viewer.