[neon/backports-focal/xdg-desktop-portal/Neon/unstable] debian/patches: Update icon validator to the one from Flatpak 1.8.1

[Simon McVittie]

Git commit 342f2d1f9f515c5f3651755e4999376185642833 by Simon McVittie.
Committed on 05/08/2020 at 09:26.
Pushed by ash into branch 'Neon/unstable'.

Update icon validator to the one from Flatpak 1.8.1

R  +5    -5    debian/patches/Replace-the-icon-validator-with-the-one-from-Flatpak-1.8..patch [from: debian/patches/Replace-the-icon-validator-with-the-one-from-Flatpak-1.6..patch - 097% similarity]
M  +1    -1    debian/patches/series

https://invent.kde.org/neon/backports-focal/xdg-desktop-portal/commit/342f2d1f9f515c5f3651755e4999376185642833

diff --git a/debian/patches/Replace-the-icon-validator-with-the-one-from-Flatpak-1.6..patch b/debian/patches/Replace-the-icon-validator-with-the-one-from-Flatpak-1.8..patch
similarity index 97%
rename from debian/patches/Replace-the-icon-validator-with-the-one-from-Flatpak-1.6..patch
rename to debian/patches/Replace-the-icon-validator-with-the-one-from-Flatpak-1.8..patch
index 52ebf9b..bc59814 100644
--- a/debian/patches/Replace-the-icon-validator-with-the-one-from-Flatpak-1.6..patch
+++ b/debian/patches/Replace-the-icon-validator-with-the-one-from-Flatpak-1.8..patch
@@ -1,9 +1,9 @@
 From: Simon McVittie <smcv at debian.org>
 Date: Fri, 25 Jan 2019 19:13:33 +0000
-Subject: Replace the icon validator with the one from Flatpak 1.6.0
+Subject: Replace the icon validator with the one from Flatpak 1.8.1
 
-For now we still want to avoid relying on Flatpak, since that dependency
-would be quite circular.
+We avoid relying on Flatpak here, since that dependency would be quite
+circular.
 
 Signed-off-by: Simon McVittie <smcv at debian.org>
 ---
@@ -55,7 +55,7 @@ index 5412609..35c779c 100644
      }
  
 diff --git a/src/validate-icon.c b/src/validate-icon.c
-index 2bab74f..9e88507 100644
+index 2bab74f..2c28527 100644
 --- a/src/validate-icon.c
 +++ b/src/validate-icon.c
 @@ -1,9 +1,35 @@
@@ -195,7 +195,7 @@ index 2bab74f..9e88507 100644
 +                  const char *arg_height,
 +                  const char *filename)
 +{
-+  const char * const usrmerged_dirs[] = { "bin", "lib64", "lib", "sbin" };
++  const char * const usrmerged_dirs[] = { "bin", "lib32", "lib64", "lib", "sbin" };
 +  int i;
 +  g_autoptr(GPtrArray) args = g_ptr_array_new_with_free_func (g_free);
 +  char validate_icon[PATH_MAX + 1];
diff --git a/debian/patches/series b/debian/patches/series
index c135245..a8f1fdb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,4 @@ tests-Divert-service-stdout-to-stderr.patch
 tests-Always-produce-verbose-output-from-subprocesses.patch
 Revert-Stop-building-the-icon-validator.patch
 validate-icon-Add-a-define-for-bwrap.patch
-Replace-the-icon-validator-with-the-one-from-Flatpak-1.6..patch
+Replace-the-icon-validator-with-the-one-from-Flatpak-1.8..patch