new libraries, fixed pyinstaller (hopefully)

Author: daveberrys

.github/workflows/building.yml

@@ -57,7 +57,8 @@ jobs:
                   gir1.2-ayatanaappindicator3-0.1 \
                   dbus \
                   libdbus-1-dev \
-                  gir1.2-dbusmenu-gtk3-0.4
+                  gir1.2-dbusmenu-gtk3-0.4 \
+                  gir1.2-dbus-1.0
             
             - name: Install Python dependencies
               run: pip install -r requirements.txt

.github/workflows/release.yml

@@ -64,7 +64,8 @@ jobs:
               gir1.2-ayatanaappindicator3-0.1 \
               dbus \
               libdbus-1-dev \
-              gir1.2-dbusmenu-gtk3-0.4
+              gir1.2-dbusmenu-gtk3-0.4 \
+              gir1.2-dbus-1.0
 
         - name: Install Python dependencies
           run: pip install -r requirements.txt

build.spec

@@ -5,24 +5,48 @@ import os
 
 block_cipher = None
 
-# Detect platform for the icon
 if sys.platform == 'win32':
   icon_file = os.path.join('assets', 'icon', 'SendYourFiles.ico')
 elif sys.platform == 'darwin':
   icon_file = os.path.join('assets', 'icon', 'SendYourFiles.icns')
 else:
   icon_file = os.path.join('assets', 'icon', 'SendYourFiles.png')
 
+linuxData = []
+linuxHiddenImports = []
+if sys.platform.startswith('linux'):
+  linuxData = [
+    ('/usr/lib/girepository-1.0/DBus-1.0.typelib', 'gi_typelibs/DBus-1.0.typelib'),
+    ('/usr/lib/girepository-1.0/AyatanaAppIndicator3-0.1.typelib', 'gi_typelibs/AyatanaAppIndicator3-0.1.typelib'),
+    ('/usr/lib/girepository-1.0/AppIndicator3-0.1.typelib', 'gi_typelibs/AppIndicator3-0.1.typelib'),  # fallback
+    ('/usr/lib/girepository-1.0/Gtk-3.0.typelib', 'gi_typelibs/Gtk-3.0.typelib'),
+    ('/usr/lib/girepository-1.0/GObject-2.0.typelib', 'gi_typelibs/GObject-2.0.typelib'),
+  ]
+  
+  linuxHiddenImports = [
+    'gi',
+    'gi.repository',
+    'gi.repository.GObject',
+    'gi.repository.Gtk',
+    'gi.repository.DBus',
+    'gi.repository.AyatanaAppIndicator3',
+    'gi.repository.AppIndicator3',
+    'pystray._appindicator',
+    'pystray._util.gtk',
+    'pystray._util.notify_dbus',
+  ]
+
 a = Analysis(
   ['main.py'],
   pathex=[],
   binaries=[],
+
   datas=[
     ('src', 'src'),
     ('assets', 'assets'),
     ('version.txt', '.'),
     ('src/back/extra/settings.json', 'src/back/system/extra'),
-  ],
+  ] + linuxData,
   hiddenimports=[
     'webview.platforms.winforms',
     'webview.platforms.cocoa',
@@ -31,7 +55,8 @@ a = Analysis(
     'desktop_notifier',
     'desktop_notifier.resources',
     'pystray._win32',
-  ],
+  ] + linuxHiddenImports,
+
   hookspath=[],
   hooksconfig={},
   runtime_hooks=[],
@@ -65,4 +90,4 @@ exe = EXE(
   codesign_identity=None,
   entitlements_file=None,
   icon=icon_file,
-)
+)