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=7888351b9edd7b0199a973c75bc1c35897d9d7ef'>refs</a><a class='active' href='/guix/log/gnu/tests/vnc.scm'>log</a><a href='/guix/tree/gnu/tests/vnc.scm?id=7888351b9edd7b0199a973c75bc1c35897d9d7ef'>tree</a><a href='/guix/commit/gnu/tests/vnc.scm?id=7888351b9edd7b0199a973c75bc1c35897d9d7ef'>commit</a><a href='/guix/diff/gnu/tests/vnc.scm?id=7888351b9edd7b0199a973c75bc1c35897d9d7ef'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/tests/vnc.scm'>
<input type='hidden' name='id' value='7888351b9edd7b0199a973c75bc1c35897d9d7ef'/><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=7888351b9edd7b0199a973c75bc1c35897d9d7ef'>root</a>/<a href='/guix/log/gnu?id=7888351b9edd7b0199a973c75bc1c35897d9d7ef'>gnu</a>/<a href='/guix/log/gnu/tests?id=7888351b9edd7b0199a973c75bc1c35897d9d7ef'>tests</a>/<a href='/guix/log/gnu/tests/vnc.scm?id=7888351b9edd7b0199a973c75bc1c35897d9d7ef'>vnc.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/tests/vnc.scm?id=7888351b9edd7b0199a973c75bc1c35897d9d7ef&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-07-19 10:38:15 -0400'>2023-07-19</span></td><td><a href='/guix/commit/gnu/tests/vnc.scm?id=1edbadc6b49adda050a87057e6501c961888d7bb'>tests: xvnc: Fix 'gdm auto-suspend is disabled' test.</a><span class='msg-avail'>...<span class='msg-tooltip'>This failure is another collateral from commit a09c7da ("tests: Fork and exec
a new Guile for the marionette REPL."), which isolated the marionette
evaluation environment from that of the host.

* gnu/tests/vnc.scm (run-xvnc-test): Move the (guix build utils) import to...
["gdm auto-suspend is disabled"]: ... inside the marionette-eval of this
test.  Complete comment.

Reported-by: Bruno Victal &lt;mirai@makinata.eu&gt;
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2023-07-19 10:38:15 -0400'>2023-07-19</span></td><td><a href='/guix/commit/gnu/tests/vnc.scm?id=95424292993551854fb7373cef997fd39340ea4b'>tests: xvnc: Group up GDM test and use GNU Ocrad instead of Tesseract.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/tests/vnc.scm (run-xvnc-test): Group up GDM test.  Use GNU Ocrad.

Signed-off-by: Maxim Cournoyer &lt;maxim.cournoyer@gmail.com&gt;
Modified-by: Maxim Cournoyer &lt;maxim.cournoyer@gmail.com&gt;
</span></span></td><td>Bruno Victal</td></tr>
<tr><td><span title='2022-10-07 15:08:05 -0400'>2022-10-07</span></td><td><a href='/guix/commit/gnu/tests/vnc.scm?id=0169aee33e154c1fa8b299c7f126f3e94a8dc9a4'>tests: xvnc: Do not use specification-&gt;package in OS definition.</a><span class='msg-avail'>...<span class='msg-tooltip'>Doing so would cause the extra package dependencies to not be
correctly registered as dependencies, which would lead to a silent
failure when attempting to load or byte compile the module at the time
guix build itself (e.g., when running 'guix pull').

* gnu/tests/vnc.scm (%xvnc-os) [packages]: Turn the the
specification-&gt;package declaration into a list of package objects.
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2022-10-07 15:07:48 -0400'>2022-10-07</span></td><td><a href='/guix/commit/gnu/tests/vnc.scm?id=00e843050012961e9cc41b003ea9271eab718541'>Revert "Revert "services: Add xvnc-service-type.""</a><span class='msg-avail'>...<span class='msg-tooltip'>This reverts commit 0c4966160054bc50e6ab3a4ac9c9a6a1826ab5a0.  The fix appears
in the subsequent commit, for clarity.
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2022-10-07 12:53:22 -0400'>2022-10-07</span></td><td><a href='/guix/commit/gnu/tests/vnc.scm?id=0c4966160054bc50e6ab3a4ac9c9a6a1826ab5a0'>Revert "services: Add xvnc-service-type."</a><span class='msg-avail'>...<span class='msg-tooltip'>This reverts commit 1c528a95cb92b7808e6603d7956185005583629f.  This broke
'guix pull', for (yet) unknown reasons.
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2022-10-07 10:11:13 -0400'>2022-10-07</span></td><td><a href='/guix/commit/gnu/tests/vnc.scm?id=1c528a95cb92b7808e6603d7956185005583629f'>services: Add xvnc-service-type.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/vnc.scm: New file.
* gnu/tests/vnc.scm: Likewise.
* gnu/local.mk: Register them.
</span></span></td><td>Maxim Cournoyer</td></tr>