On Wed, Feb 05, 2020 at 01:36:02PM +0100, Landry Breuil wrote: > On Wed, Feb 05, 2020 at 12:37:56PM +0100, Björn Ketelaars wrote: > > Diff below changes our port of git-cola a bit: > > - Switch from py-qt4 to py-qt5 > > - Switch to python3 > > - Drop dependency on textproc/xxdiff. > > > > Rationale for the latter is that git-cola per default uses git.tool from > > .gitconfig. A user can easily pkg_add xxdiff, or one of its > > alternatives. > > i've tried it and in the parameters, the "diff tool" and "merge tool" > still default to xxdiff, so if you have no .gitconfig xxdif should be > present :) Not sure removing the RDEP is ok unless you patch that and > use a contraption to run xterm -e diff... which might not be worth the > trouble. > > Given that xxdiff can now use Qt5 and works fine, i'd keep the > dependency. > > That said, ok for the xxdiff update & this git-cola move to py3, both > work fine here.
and git-cola reliably segfaults upon exit deep in py-sip so you might want to look into that and see if it's reproducible.. :) [Current thread is 1 (process 531978)] (gdb) bt #0 0x000017bfee4018d7 in sipOMFindObject () from /usr/local/lib/python3.7/site-packages/sip.so #1 0x000017bfcdff3226 in PyQtMonitor::on_destroyed(QObject*) () from /usr/local/lib/python3.7/site-packages/PyQt5/QtCore.so #2 0x000017bf8259f885 in QMetaObject::activate(QObject*, int, int, void**) () from /usr/local/lib/qt5/libQt5Core.so.2.2 #3 0x000017bf8259ecca in QMetaObject::activate(QObject*, QMetaObject const*, int, void**) () from /usr/local/lib/qt5/libQt5Core.so.2.2 #4 0x000017bf82596a43 in QObject::destroyed(QObject*) () from /usr/local/lib/qt5/libQt5Core.so.2.2 #5 0x000017bf825962a5 in QObject::~QObject() () from /usr/local/lib/qt5/libQt5Core.so.2.2 #6 0x000017bf82234a3d in QThreadPool::~QThreadPool() () from /usr/local/lib/qt5/libQt5Core.so.2.2 #7 0x000017bf822358e6 in ?? () from /usr/local/lib/qt5/libQt5Core.so.2.2 #8 0x000017bfa2289f9d in _libc___cxa_finalize (dso=<optimized out>) at /usr/src/lib/libc/stdlib/atexit.c:177 #9 0x000017bfa22692e1 in _libc_exit (status=0) at /usr/src/lib/libc/stdlib/exit.c:54 #10 0x000017bf32f69932 in Py_Exit () from /usr/local/lib/libpython3.7m.so.0.0 #11 0x000017bf32f73741 in ?? () from /usr/local/lib/libpython3.7m.so.0.0 #12 0x000017bf32f73346 in PyErr_PrintEx () from /usr/local/lib/libpython3.7m.so.0.0 #13 0x000017bf32f72862 in PyRun_SimpleFileExFlags () from /usr/local/lib/libpython3.7m.so.0.0 #14 0x000017bf32f9701e in ?? () from /usr/local/lib/libpython3.7m.so.0.0 #15 0x000017bf32f97913 in _Py_UnixMain () from /usr/local/lib/libpython3.7m.so.0.0
