X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=72ab041c006d91b3e925c30a84c46b67cf9d6428;hb=refs%2Fheads%2Fappimage-glib-fix;hp=1d4107c025c9f6b6271d223d6e3b744a10f7b0c7;hpb=3896560ec6b32574092552e6807bfb413dcb2783;p=dcpomatic.git

diff --git a/cscript b/cscript
index 1d4107c02..72ab041c0 100644
--- a/cscript
+++ b/cscript
@@ -408,6 +408,7 @@ def make_spec(filename, version, target, options, requires=None):
     print('', file=f)
     print('%post', file=f)
     print('/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :', file=f)
+    print('setcap "cap_dac_override+ep cap_sys_admin+ep" /usr/bin/dcpomatic2_disk_writer', file=f)
     print('', file=f)
     print('%postun', file=f)
     print('if [ $1 -eq 0 ] ; then', file=f)
@@ -431,8 +432,8 @@ def dependencies(target, options):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'v1.8.3'))
-    deps.append(('libsub', 'v1.6.3'))
+    deps.append(('libdcp', 'v1.8.5'))
+    deps.append(('libsub', 'v1.6.5'))
     deps.append(('leqm-nrt', '93ae9e6'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
@@ -705,8 +706,16 @@ def make_appimage(target, nice_name, internal_name, version):
     target.command('cp -r %s/share/libdcp/xsd build/%s.AppDir/usr/share/libdcp/' % (target.directory, nice_filename))
     target.command('cp -r %s/share/libdcp/tags build/%s.AppDir/usr/share/libdcp/' % (target.directory, nice_filename))
     lib = 'usr/lib/x86_64-linux-gnu'
-    target.command(f'mkdir -p build/{nice_filename}.AppDir/{lib}/gdk-pixbuf-2.0/2.10.0')
-    target.command(f'cp -a /{lib}/gdk-pixbuf-2.0 build/{nice_filename}.AppDir/usr/lib/x86_64-linux-gnu/')
+    appdir = f'build/{nice_filename}.AppDir'
+    target.command(f'mkdir -p {appdir}/{lib}/gdk-pixbuf-2.0/2.10.0')
+    target.command(f'cp -a /{lib}/gdk-pixbuf-2.0 {appdir}/usr/lib/x86_64-linux-gnu/')
+    for package in ['libc6', 'libglib2.0-0', 'gnome-settings-daemon-schemas', 'librsvg2-common', 'libgdk-pixbuf2.0-0', 'libpango-1.0-0', 'libpangoft2-1.0-0', 'libpangocairo-1.0-0']:
+        target.command(f'apt download {package}')
+        target.command(f'dpkg-deb -x {package}*.deb {appdir}')
+    target.command(f'glib-compile-schemas {appdir}/usr/share/glib-2.0/schemas')
+    target.command(f'sed -i -e "s|/usr/lib/x86_64-linux-gnu/gdk-pixbuf-.*/.*/loaders/||g" {appdir}/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders.cache')
+    # Stop anything loading from outside the AppImage
+    target.command(f'sed -i -e "s|/usr|/xxx|g" {appdir}/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2')
     if internal_name == 'dcpomatic2_disk':
         target.command('mkdir -p build/%s.AppDir/usr/share/polkit-1/actions' % nice_filename)
         target.command('cp %s/share/polkit-1/actions/com.dcpomatic.write-drive.policy build/%s.AppDir/usr/share/polkit-1/actions' % (target.directory, nice_filename))
@@ -715,7 +724,10 @@ def make_appimage(target, nice_name, internal_name, version):
         print('#!/bin/bash', file=f)
         print('export PATH=$APPDIR/usr/bin:$PATH', file=f)
         print('export XDG_DATA_DIRS="$APPDIR/usr/share/:/usr/share/:$XDG_DATA_DIRS"', file=f)
-        print('export LD_LIBRARY_PATH=$APPDIR/usr/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}', file=f)
+        print('export GDK_PIXBUF_MODULEDIR=$(readlink -f "$APPDIR"/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders/ )', file=f)
+        print('export GDK_PIXBUF_MODULE_FILE=$(readlink -f "$APPDIR"/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders.cache )', file=f)
+        print('export LD_LIBRARY_PATH=$GDK_PIXBUF_MODULEDIR:$APPDIR/usr/lib:$APPDIR/usr/lib/x86_64-linux-gnu', file=f)
+
         print('"$APPDIR"/usr/bin/%s $@' % internal_name, file=f)
     target.command('chmod a+rx build/%s.AppDir/AppRun' % nice_filename)
     with open('build/%s.AppDir/%s.desktop' % (nice_filename, internal_name), 'w') as f: