[flatpaks/flatpak-runtime] f45: resolve-files.py: allow excluding packages from the Platform

[flatpaks/flatpak-runtime] f45: resolve-files.py: allow excluding packages from the Platform

[Owen W. Taylor]

            A new commit has been pushed.

            Repo   : flatpaks/flatpak-runtime
            Branch : f45
            Commit : bd15bc573165007f9476c153232a396e45cb03d9
            Author : Owen W. Taylor <otaylor@fishsoup.net>
            Date   : 2018-01-31T11:21:01+01:00
            Stats  : +17/-0 in 1 file(s)
            URL    : https://src.fedoraproject.org/flatpaks/flatpak-runtime/c/bd15bc573165007f9476c153232a396e45cb03d9?branch=f45

            Log:
            resolve-files.py: allow excluding packages from the Platform

To handle files from the SDK leaking into the platform (gtk-doc, etc),
allow specifying patterns of package names that we should simply
ignore in the Platform. In particular, ignore any -devel package.

---
diff --git a/resolve-files.py b/resolve-files.py
index cd861c9..6c0c93a 100755
--- a/resolve-files.py
+++ b/resolve-files.py
@@ -251,11 +251,23 @@ ignore_compiled = [re.compile(x) for x in ignore_patterns]
 rename_patterns = [
     (r'^/usr/include/c\+\+/6.2.0/(.*)', r'/usr/include/c++/7/\1'),
     (r'^/usr/include/c\+\+/7/x86_64-unknown-linux/(.*)', r'/usr/include/c++/7/x86_64-redhat-linux/\1'),
+    (r'^/usr/include/python3.5m/(.*)', r'/usr/include/python3.6m/\1'),
     (r'^/usr/lib64/pkgconfig/(.*proto.pc)', r'/usr/share/pkgconfig/\1'),
     (r'^/usr/share/fonts/liberation-fonts/(.*)', r'/usr/share/fonts/liberation/\1'),
 ]
 rename_compiled = [(re.compile(a), b) for a, b in rename_patterns]
 
+platform_package_ignore_patterns = [
+    "^.*-devel$",
+    "^libappstream-glib-builder$", # may not need in the sdk either
+    "^gtk-doc$",
+    "^icu$", # may not need in the sdk either
+    '^llvm$',
+    '^sqlite$',
+]
+platform_package_ignore_compiled = [re.compile(p) for p in platform_package_ignore_patterns]
+
+
 def package_cmp(a, b):
     if a.arch == 'i686' and b.arch != 'i686':
         return 1
@@ -332,6 +344,8 @@ if not inpath.endswith('.files'):
     sys.exit(1)
 
 base_path = inpath[:-len('.files')]
+is_platform = "-Platform" in base_path
+is_sdk = "-Sdk" in base_path
 
 def warn(msg):
     print("{}: \033[31m{}\033[39m".format(inpath, msg), file=sys.stderr)
@@ -450,6 +464,9 @@ for r in to_resolve:
         print(r, file=unmatched_file)
         unmatched_count += 1
     else:
+        if is_platform and any(p.match(providing) is not None for p in platform_package_ignore_compiled):
+            continue
+
         found_packages.add(providing)
         print("{}: {}".format(r, providing), file=matched_file)