Changeset 2f2bfbd


Ignore:
Timestamp:
01/19/2022 05:15:32 PM (2 years ago)
Author:
Pierre Labastie <pierre.labastie@…>
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:
44aeb25f
Parents:
113f4e6
Message:

Fixes for building with meson 0.61+

Files:
13 edited

Legend:

Unmodified
Added
Removed

  • gnome/applications/evince.xml

    r113f4e6 r2f2bfbd  
    133133
    134134    <para>
     135      Next, fix building with newer versions of
     136      <application>meson</application>:
     137    </para>
     138
     139<screen><userinput>find . -name meson.build | xargs sed -i '/merge_file/{n;d}'</userinput></screen>
     140
     141    <para>
    135142      Install <application>Evince</application> by running the following
    136143      commands:

  • gnome/applications/gnome-disk-utility.xml

    r113f4e6 r2f2bfbd  
    100100
    101101    <para>
     102      First, fix building with newer versions of
     103      <application>meson</application>:
     104    </para>
     105
     106<screen><userinput>sed -i '/merge_file/{n;d}' data/meson.build</userinput></screen>
     107
     108    <para>
    102109      Install <application>GNOME Disk Utility</application> by running the
    103110      following commands:

  • gnome/applications/gnome-maps.xml

    r113f4e6 r2f2bfbd  
    9898
    9999    <para>
     100      First, fix building with newer versions of
     101      <application>meson</application>:
     102    </para>
     103
     104<screen><userinput>sed -i '/merge_file/{n;d}' data/meson.build</userinput></screen>
     105
     106    <para>
    100107      Install <application>GNOME Maps</application> by running the following
    101108      commands:

  • gnome/applications/gnome-screenshot.xml

    r113f4e6 r2f2bfbd  
    9191
    9292    <para>
     93      First, fix building with newer versions of
     94      <application>meson</application>:
     95    </para>
     96
     97<screen><userinput>sed -i '/merge_file/{n;d}' data/meson.build</userinput></screen>
     98
     99    <para>
    93100      Install <application>GNOME Screenshot</application> by running the following
    94101      commands:

  • gnome/applications/gnome-terminal.xml

    r113f4e6 r2f2bfbd  
    106106
    107107    <para>
    108       First, fix some deprecated schema entries:
     108      First, fix building with newer versions of
     109      <application>meson</application>:
     110    </para>
     111
     112<screen><userinput>sed -i '/merge_file/{n;d}' data/meson.build</userinput></screen>
     113
     114    <para>
     115      Next, fix some deprecated schema entries:
    109116    </para>
    110117

  • gnome/applications/gnome-tweaks.xml

    r113f4e6 r2f2bfbd  
    118118
    119119<screen role="root"><userinput remap="pre">rm -rf /usr/lib/python&python3-majorver;/site-packages/gtweak</userinput></screen>
     120
     121    <para>
     122      Next, fix building with newer versions of
     123      <application>meson</application>:
     124    </para>
     125
     126<screen><userinput>sed -i '/merge_file/s/(.*/(/' data/meson.build</userinput></screen>
    120127
    121128    <para>

  • gnome/applications/gnome-weather.xml

    r113f4e6 r2f2bfbd  
    9898
    9999    <para>
     100      First, fix building with newer versions of
     101      <application>meson</application>:
     102    </para>
     103
     104<screen><userinput>sed -i '/merge_file/{n;d}' data/meson.build</userinput></screen>
     105
     106    <para>
    100107      Install <application>GNOME Weather</application> by running the following
    101108      commands:

  • gnome/applications/gucharmap.xml

    r113f4e6 r2f2bfbd  
    126126  <sect2 role="installation">
    127127    <title>Installation of Gucharmap</title>
     128
     129    <para>
     130      First, fix building with newer versions of
     131      <application>meson</application>:
     132    </para>
     133
     134<screen><userinput>sed -i '/merge_file/{n;d}' data/meson.build</userinput></screen>
    128135
    129136    <para>

  • gnome/platform/gnome-bluetooth.xml

    r113f4e6 r2f2bfbd  
    108108  <sect2 role="installation">
    109109    <title>Installation of GNOME Bluetooth</title>
     110
     111    <para>
     112      First, fix building with newer versions of
     113      <application>meson</application>
     114    </para>
     115
     116<screen><userinput>sed -i "/  desktop,/d" sendto/meson.build</userinput></screen>
    110117
    111118    <para>

  • gnome/platform/gnome-control-center.xml

    r113f4e6 r2f2bfbd  
    138138
    139139    <para>
     140      First, fix building with newer versions of
     141      <application>meson</application>:
     142    </para>
     143
     144<screen><userinput>find . -name meson.build | xargs sed -i '/merge_file/{n;d}'</userinput></screen>
     145
     146    <para>
    140147      Install <application>GNOME Control Center</application> by running the
    141148      following commands:

  • gnome/platform/gnome-settings-daemon.xml

    r113f4e6 r2f2bfbd  
    134134    <title>Installation of GNOME Settings Daemon</title>
    135135
     136    <para>
     137      First fix building with recent versions of
     138      <application>meson</application>
     139    </para>
     140
     141<screen><userinput>sed "/  policy,/d" -i plugins/{power,wacom}/meson.build</userinput></screen>
     142
    136143    <para revision="sysv">
    137       First, fix libelogind detection for tests:
     144      Next, fix libelogind detection for tests:
    138145    </para>
    139146
    … …  
    147154<screen revision="sysv"><userinput>sed -e 's/(backlight->logind_proxy)/(0)/' \
    148155    -i plugins/power/gsd-backlight.c</userinput></screen>
    149 
    150 <!--
    151     <para revision="systemd">
    152       First, remove older versions of the systemd units:
    153     </para>
    154 
    155 <screen revision="systemd" role="root"><userinput remap="pre">rm -fv /usr/lib/systemd/user/gsd-*</userinput></screen>
    156 
    157     <para>
    158       Fix an issue with meson-0.60 and later:
    159     </para>
    160 
    161 <screen><userinput>sed -i /b_ndebug/s/true/\'true\'/ meson.build</userinput></screen>
    162 -->
    163156
    164157    <para>

  • introduction/welcome/changelog.xml

    r113f4e6 r2f2bfbd  
    4646      <itemizedlist>
    4747        <listitem>
     48          <para>[pierre] - Fixes for building with newer versions of meson:
     49          evince, gnome-disk-utility, gnome-maps, gnome-screenshot,
     50          gnome-terminal, gnome-tweaks, gnome-weather, gucharmap,
     51          gnome-bluetooth, gnome-control-center, gnome-settings-daemon,
     52          and epiphany.</para>
     53        </listitem>
     54        <listitem>
    4855          <para>[pierre] - Update to gnutls-3.7.3 (Security Fix). Fixes
    4956          <ulink url="&blfs-ticket-root;15983">#15983</ulink>.</para>

  • xsoft/graphweb/epiphany.xml

    r113f4e6 r2f2bfbd  
    113113
    114114    <para>
    115       Fix an issue building <application>Epiphany</application> with
     115      First, fix building with newer versions of
     116      <application>meson</application>:
     117    </para>
     118
     119<screen><userinput>sed -i '/merge_file/{n;d}' data/meson.build</userinput></screen>
     120
     121    <para>
     122      Next, fix an issue building <application>Epiphany</application> with
    116123      libportal-0.5 or later:
    117124    </para>
Note: See TracChangeset for help on using the changeset viewer.