From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 16 Aug 2018 21:12:30 +0200
Subject: extundelete: Fix build with e2fsprogs 1.44.

The ‘inode.i_file_acl’ field was replaced with ‘inode.i_size_high’. I'm
not sure the field name is still accurate or useful, so don't print it
at all.

Based on this[0] patch by ‘conikost’[1].

[0]: https://sourceforge.net/p/extundelete/tickets/5/
[1]: https://sourceforge.net/u/conikost

--- a/src/insertionops.cc	2012-12-30 18:23:32.000000000 +0100
+++ b/src/insertionops.cc	2018-05-07 22:58:13.065868723 +0200
@@ -33,7 +33,6 @@
   os << "File flags: " << inode.i_flags << std::endl;
   os << "File version (for NFS): " << inode.i_generation << std::endl;
   os << "File ACL: " << inode.i_file_acl << std::endl;
-  os << "Directory ACL: " << inode.i_dir_acl << std::endl;
   os << "Fragment address: " << inode.i_faddr << std::endl;
   os << "Direct blocks: ";
   for (int n = 0; n < EXT2_NDIR_BLOCKS; n++)
ht'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=957a99ab971d4164286e7f0d6c851d6bf05f7598'>refs</a><a class='active' href='/guix/log/gnu/build/svg.scm'>log</a><a href='/guix/tree/gnu/build/svg.scm?id=957a99ab971d4164286e7f0d6c851d6bf05f7598'>tree</a><a href='/guix/commit/gnu/build/svg.scm?id=957a99ab971d4164286e7f0d6c851d6bf05f7598'>commit</a><a href='/guix/diff/gnu/build/svg.scm?id=957a99ab971d4164286e7f0d6c851d6bf05f7598'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/build/svg.scm'>
<input type='hidden' name='id' value='957a99ab971d4164286e7f0d6c851d6bf05f7598'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=957a99ab971d4164286e7f0d6c851d6bf05f7598'>root</a>/<a href='/guix/log/gnu?id=957a99ab971d4164286e7f0d6c851d6bf05f7598'>gnu</a>/<a href='/guix/log/gnu/build?id=957a99ab971d4164286e7f0d6c851d6bf05f7598'>build</a>/<a href='/guix/log/gnu/build/svg.scm?id=957a99ab971d4164286e7f0d6c851d6bf05f7598'>svg.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/build/svg.scm?id=957a99ab971d4164286e7f0d6c851d6bf05f7598&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2017-07-02 22:52:30 +0200'>2017-07-02</span></td><td><a href='/guix/commit/gnu/build/svg.scm?id=1b0f266e40aead09be95a984bd9c6cec3dff397e'>gnu: Switch guile-cairo and dependents to Guile 2.2 again.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://bugs.gnu.org/27551&gt;.
Reported by Leo Famulari &lt;leo@famulari.name&gt;.

This reinstates the following commits:

  e3ddb1e83 * gnu: guile-cairo: Switch to Guile 2.2.
  ae5c6ef39 * gnu: guile-gnome: Update to 2.16.5.
  0fd8013fc * gnu: guile-rsvg: Update to commit 05c6a2fd.
  66b9183c4 * gnu: guile-lib: Switch to Guile 2.2.

and adds the following changes:

* gnu/bootloader/grub.scm (svg-&gt;png): Add 'package-&gt;derivation' call for
GUILE-2.2.  Pass #:guile-for-build to 'gexp-&gt;derivation'.
* gnu/build/svg.scm (svg-&gt;png): Add 'em' and 'ex' to the 'let-values'
form to account for all the values returned by
'rsvg-handle-get-dimensions', which Guile 2.2 does not truncate.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2016-10-25 13:57:28 +0200'>2016-10-25</span></td><td><a href='/guix/commit/gnu/build/svg.scm?id=8ce84bf1f5705f5280e8bf8f150ec2e859b045ee'>svg: Autoload Guile-RSVG and Guile-Cairo.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes compilation by 'guix pull' where Guile-{RSVG,Cairo} are missing.
Reported by Efraim Flashner.

* gnu/build/svg.scm: Use 'module-autoload!' rather than 'module-use!'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2016-10-25 01:21:28 +0200'>2016-10-25</span></td><td><a href='/guix/commit/gnu/build/svg.scm?id=ffde82c9ecf99524220e463055f4f18c8c9e7a81'>system: grub: Use Guile-{RSVG,Cairo} instead of Inkscape + ImageMagick.</a><span class='msg-avail'>...<span class='msg-tooltip'>Based on a suggestion by Andy Wingo at
&lt;https://lists.gnu.org/archive/html/guix-devel/2015-08/msg00753.html&gt;.

* gnu/build/svg.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* gnu/system/grub.scm (svg-&gt;png): Add #:width and #:height.  Rewrite to
use (gnu build svg).
(resize-image): Remove.
(grub-background-image): Adjust accordingly.
</span></span></td><td>Ludovic Courtès</td></tr>