diff -ru git-cola-3.1.orig/bin/git-cola git-cola-3.1/bin/git-cola --- git-cola-3.1.orig/bin/git-cola 2018-04-29 13:11:52.000000000 -0400 +++ git-cola-3.1/bin/git-cola 2018-05-03 11:48:26.000000000 -0400 @@ -30,10 +30,16 @@ join = os.path.join realpath = os.path.realpath + # Force use of pyqt4 to be deterministic. + # pyqt4 is currently better supported than pyqt5. + os.environ['QT_API'] = 'pyqt4' + # Try to detect where it is run from and set prefix and the search path. # It is assumed that the user installed Cola using the --prefix= option python2 = sys.version_info[0] == 2 prefix = dirname(dirname(realpath(abspath(__file__)))) + if os.path.islink(__file__): + prefix = dirname(dirname(os.readlink(__file__))) # Look for modules in the source or install trees if python2: cola_mod = join(prefix, str('cola'), str('__init__.py')) @@ -48,6 +54,8 @@ else: # Install tree sys.path.insert(1, install_lib) + fink_lib = os.path.join(prefix, 'lib', '@PYTHON@', 'site-packages') + sys.path.insert(1, fink_lib) setup_environment() diff -ru git-cola-3.1.orig/bin/git-dag git-cola-3.1/bin/git-dag --- git-cola-3.1.orig/bin/git-dag 2018-04-29 13:11:52.000000000 -0400 +++ git-cola-3.1/bin/git-dag 2018-05-03 11:48:33.000000000 -0400 @@ -31,8 +31,14 @@ realpath = os.path.realpath join = os.path.join + # Force use of pyqt4 to be deterministic. + # pyqt4 is currently better supported than pyqt5. + os.environ['QT_API'] = 'pyqt4' + python2 = sys.version_info[0] == 2 prefix = dirname(dirname(realpath(abspath(__file__)))) + if os.path.islink(__file__): + prefix = dirname(dirname(os.readlink(__file__))) if python2: cola_mod = join(prefix, str('cola'), str('__init__.py')) @@ -48,6 +54,8 @@ else: # Install tree sys.path.insert(1, install_lib) + fink_lib = os.path.join(prefix, 'lib', '@PYTHON@', 'site-packages') + sys.path.insert(1, fink_lib) setup_environment() if __name__ == '__main__': diff -ru git-cola-3.1.orig/share/git-cola/bin/git-xbase git-cola-3.1/share/git-cola/bin/git-xbase --- git-cola-3.1.orig/share/git-cola/bin/git-xbase 2018-04-29 13:11:52.000000000 -0400 +++ git-cola-3.1/share/git-cola/bin/git-xbase 2018-05-03 11:49:01.000000000 -0400 @@ -8,8 +8,15 @@ def setup_environment(): path = os.path dirname = path.dirname + + # Force use of pyqt4 to be deterministic. + # pyqt4 is currently better supported than pyqt5. + os.environ['QT_API'] = 'pyqt4' + # / share/git-cola/ bin/git-xbase prefix = dirname(dirname(dirname(dirname(path.abspath(__file__))))) + if os.path.islink(__file__): + prefix = dirname(dirname(os.readlink(__file__))) # str() avoids unicode on python2 by staying in bytes source_tree = path.join(prefix, str('cola'), str('__init__.py')) unixpkgs = path.join(prefix, str('share'), str('git-cola'), str('lib')) @@ -25,6 +32,8 @@ modules = None if modules: sys.path.insert(1, modules) + fink_lib = os.path.join(prefix, 'lib', '@PYTHON@', 'site-packages') + sys.path.insert(1, fink_lib) setup_environment()