[flatpaks/flatpak-runtime] f45: Update for newer upstream runtimes

[flatpaks/flatpak-runtime] f45: Update for newer upstream runtimes

[Owen W. Taylor]

            A new commit has been pushed.

            Repo   : flatpaks/flatpak-runtime
            Branch : f45
            Commit : 172bdec7b631a5f72cfa6becdfd3f7de2f4fd726
            Author : Owen W. Taylor <otaylor@fishsoup.net>
            Date   : 2018-02-05T13:00:48-05:00
            Stats  : +18/-0 in 2 file(s)
            URL    : https://src.fedoraproject.org/flatpaks/flatpak-runtime/c/172bdec7b631a5f72cfa6becdfd3f7de2f4fd726?branch=f45

            Log:
            Update for newer upstream runtimes

Match file changes in a newer version of the upstream runtimes; exclude fcitx
to avoid pulling in qt4.

---
diff --git a/flatpak-runtime.yaml b/flatpak-runtime.yaml
index 62b13d8..c1f6e47 100644
--- a/flatpak-runtime.yaml
+++ b/flatpak-runtime.yaml
@@ -138,6 +138,7 @@ data:
       - gstreamer1-plugins-bad-free
       - gstreamer1-plugins-base
       - gtk2
+      - gtk2-engines
       - gtk-update-icon-cache
       - gtk3
       - guile
@@ -238,6 +239,7 @@ data:
       - libimobiledevice
       - libinput
       - libjpeg-turbo
+      - turbojpeg
       - libksba
       - libmetalink
       - libmnl
@@ -474,6 +476,7 @@ data:
       - dbus
       - dbus-libs
       - dbus-x11
+      - dconf
       - dejavu-fonts-common
       - dejavu-sans-fonts
       - dejavu-sans-mono-fonts
@@ -626,6 +629,7 @@ data:
       - libidn
       - libidn2
       - libjpeg-turbo
+      - turbojpeg
       - libksba
       - libmetalink
       - libmodman
@@ -1052,6 +1056,8 @@ data:
       - gtk-doc
       - gtk2
       - gtk2-devel
+      - gtk2-engines
+      - gtk2-engines-devel
       - gtk-update-icon-cache
       - gtk3
       - gtk3-devel
@@ -1914,6 +1920,7 @@ data:
       - dbus-libs
       - dbus-x11
       - dconf
+      - dconf-devel
       - dejavu-fonts-common
       - dejavu-sans-fonts
       - dejavu-sans-mono-fonts

diff --git a/tools/resolve-files.py b/tools/resolve-files.py
index b1c4abd..d4985d5 100755
--- a/tools/resolve-files.py
+++ b/tools/resolve-files.py
@@ -267,6 +267,14 @@ rename_patterns = [
 ]
 rename_compiled = [(re.compile(a), b) for a, b in rename_patterns]
 
+global_package_ignore_patterns = [
+    # The Fedora packages of fcitx pull in qt4. While would be nice to match the upstream
+    # runtime in including fcitx for full compatiblity when the host is using fcitx,
+    # it doesn't seem worth the increase in runtime size.
+    '^fcitx-.*$',
+]
+global_package_ignore_compiled = [re.compile(p) for p in global_package_ignore_patterns]
+
 platform_package_ignore_patterns = [
     "^.*-devel$",
     "^libappstream-glib-builder$", # may not need in the sdk either
@@ -513,6 +521,9 @@ for r in to_resolve:
         print(r, file=unmatched_file)
         unmatched_count += 1
     else:
+        if any(p.match(providing) is not None for p in global_package_ignore_compiled):
+            continue
+
         if is_platform and any(p.match(providing) is not None for p in platform_package_ignore_compiled):
             continue