Attempt to fix build on GH

yousseb · Nov 5, 2023 · 0ee010b · 0ee010b
1 parent b143399
commit 0ee010b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 32 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -1,14 +1,6 @@
 [py2app]
 app = ['bin/meld']
 arch = x86_64
-# iconfile = osx/meld.icns
-# site-packages = false
-# packages = gi
-# includes = glib, gio, cairo, pango, pangocairo, atk, gobject, gtk.keysyms
-# excludes = gtk-2.0
-# #frameworks = CoreFoundation, Foundation, Python
-# argv_emulation = True
-#resources = share/themes/Mac
 
 [flake8]
 
@@ -43,4 +35,4 @@ order_by_type = True
 use_parentheses = True
 indent = 4
 include_trailing_comma = True
-skip = bin/meld, setup_win32.py, README.md
+skip = bin/meld, setup_win32.py, setup_py2app.py, README.md
diff --git a/setup_py2app.py b/setup_py2app.py
@@ -112,31 +112,10 @@
     app=['bin/meld'],
     setup_requires=["py2app"],
     options={'py2app': {
-                'includes': [ 'cairo', 'gi', 'weakref', 'encodings' ],
+                'includes': [ 'gi', 'weakref', 'encodings', 'pycairo', 'PyGObject', 'pyobjc-core', 'pyobjc-framework-Cocoa' ],
                 'excludes': [ 'tkinter' ],
                 'dylib_excludes': [ 'Python' ],
-                'frameworks':
-                    [ 
-                    # 'libpython3.11.dylib',
-                    # 'libatk-1.0.0.dylib',
-                    # 'libcairo-gobject.2.dylib',
-                    # 'libcairo-script-interpreter.2.dylib',
-                    # 'libcairo.2.dylib',
-                    # 'libgio-2.0.0.dylib',
-                    # 'libgirepository-1.0.1.dylib',
-                    # 'libglib-2.0.0.dylib',
-                    # 'libgmodule-2.0.0.dylib',
-                    # 'libgobject-2.0.0.dylib',
-                    # 'libgtk-3.0.dylib',
-                    # 'libgtkmacintegration-gtk3.4.dylib',
-                    # 'libgtksourceview-4.dylib',
-                    # 'libgtksourceview-4.0.dylib',
-                    # 'libharfbuzz.0.dylib',
-                    # 'libpango-1.0.dylib',
-                    # 'libpangocairo-1.0.0.dylib',
-                    # 'libpangoft2-1.0.0.dylib',
-                    # 'librsvg-2.2.dylib' 
-                    ],
+                'frameworks': [ ],
                 'argv_emulation': False,
                 'no_chdir': True,
                 'iconfile': 'osx/meld.icns',