[flatpaks/flatpak-runtime] f45: Include Python libraries

[flatpaks/flatpak-runtime] f45: Include Python libraries

[Owen W. Taylor]

            A new commit has been pushed.

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

            Log:
            Include Python libraries

Look in the Python site-packages for additional files to include in the runtime.

---
diff --git a/flatpak-runtime.yaml b/flatpak-runtime.yaml
index c1f6e47..f79e6cf 100644
--- a/flatpak-runtime.yaml
+++ b/flatpak-runtime.yaml
@@ -254,6 +254,8 @@ data:
       - libplist
       - libpng
       - libproxy
+      - python2-libproxy
+      - python3-libproxy
       - libpsl
       - libpwquality
       - librsvg2
@@ -295,6 +297,7 @@ data:
       - libxkbcommon
       - libxkbcommon-x11
       - libxml2
+      - python2-libxml2
       - libxshmfence
       - libxslt
       - llvm-libs
@@ -358,6 +361,10 @@ data:
       - pulseaudio-libs
       - pulseaudio-libs-glib2
       - pulseaudio-utils
+      - python3-cairo
+      - python3-gobject
+      - python3-gobject-base
+      - python3-gstreamer1
       - python2-pip
       - python3-pip
       - python2-setuptools
@@ -642,6 +649,8 @@ data:
       - libpciaccess
       - libpng
       - libproxy
+      - python2-libproxy
+      - python3-libproxy
       - libpsl
       - libpwquality
       - librsvg2
@@ -679,6 +688,7 @@ data:
       - libxkbcommon
       - libxkbcommon-x11
       - libxml2
+      - python2-libxml2
       - libxshmfence
       - libxslt
       - llvm-libs
@@ -1257,6 +1267,8 @@ data:
       - libpng-devel
       - libproxy
       - libproxy-devel
+      - python2-libproxy
+      - python3-libproxy
       - libpsl
       - libpwquality
       - librsvg2
@@ -1591,6 +1603,7 @@ data:
       - python2-cffi
       - python2-cryptography
       - python2-enum34
+      - python3-gstreamer1
       - python2-idna
       - python2-ipaddress
       - python2-mako
@@ -2237,6 +2250,8 @@ data:
       - libpng-devel
       - libproxy
       - libproxy-devel
+      - python2-libproxy
+      - python3-libproxy
       - libpsl
       - libpwquality
       - librsvg2

diff --git a/tools/list-files.py b/tools/list-files.py
index fe900d2..b358fae 100755
--- a/tools/list-files.py
+++ b/tools/list-files.py
@@ -19,11 +19,17 @@ def output_dir_recurse(d):
 
 output_dir('/usr/bin')
 
+python_dirs = []
 for f in os.listdir('/usr/lib'):
     full = os.path.join('/usr/lib', f)
     if (re.match(r'^.*\.so\.\d+$', f) is not None or
         re.match(r'^.*\.so$', f) is not None and not os.path.islink(full)):
         print(full)
+    if (re.match('python[2-9]*', f)):
+        python_dirs.append(os.path.join(full, 'site-packages'))
+
+for d in python_dirs:
+    output_dir_recurse(d)
 
 output_dir_recurse('/usr/share/fonts')
 output_dir_recurse('/usr/share/themes')

diff --git a/tools/resolve-files.py b/tools/resolve-files.py
index d4985d5..aa79c2a 100755
--- a/tools/resolve-files.py
+++ b/tools/resolve-files.py
@@ -253,7 +253,10 @@ ignore_patterns = [
     r'/usr/include/md/.*',
 
     # .install files litter the include directories of openembedded
-    r'.*/\.install$'
+    r'.*/\.install$',
+
+    # .pyc files shouldn't affect what is needed
+    r'.*\.pyc$',
 ]
 ignore_compiled = [re.compile(x) for x in ignore_patterns]
 
@@ -262,6 +265,8 @@ rename_patterns = [
     (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/lib/python3.5/(.*)', r'/usr/lib/python3.6/\1'),
+    (r'^/usr/lib64/python3.5/(.*)', r'/usr/lib64/python3.6/\1'),
     (r'^/usr/share/fonts/liberation-fonts/(.*)', r'/usr/share/fonts/liberation/\1'),
     (r'^/usr/share/fonts/cantarell/(.*)', r'/usr/share/fonts/abattis-cantarell/\1'),
 ]
@@ -500,8 +505,11 @@ for r in to_resolve:
         if p.match(r) is not None:
             r = p.sub(replacement, r)
 
-    if r.startswith('/usr/lib64/'):
+    if os.path.dirname(r) == '/usr/lib64':
         search = [r, '/lib64/' + os.path.basename(r)]
+    elif r.startswith('/usr/lib64') and r.find('/site-packages/') > 0:
+        # Python packages can be either in /usr/lib64 or /usr/lib
+        search = [r, '/usr/lib/' + r[len('/usr/lib64/'):]]
     elif r.startswith('/usr/bin/'):
         search = [r, '/bin/' + os.path.basename(r), '/usr/sbin/' + os.path.basename(r), '/sbin/' + os.path.basename(r)]
     else: