On Tue, Feb 18, 2020 at 02:37:09AM +0100, Juan Francisco Cantero Hurtado wrote: > On Mon, Feb 17, 2020 at 10:50:10PM +0100, Juan Francisco Cantero Hurtado > wrote: > > On Mon, Feb 17, 2020 at 12:12:37AM +0100, Juan Francisco Cantero Hurtado > > wrote: > > > tortoisehg is the last consumer of py-qt4. With this patch, we can > > > remove py-qt4 from ports. > > > > > > I need a python2+qt5 version of qscintilla for the change in tortoise > > > and qgis is the only consumer of the python3+qt5 flavor. Instead of > > > adding more complexity to the py-qscintilla port, I made the port qt5 > > > only. The port is now a standard python2+python3 port. > > > > > > Landry, I imported qscintilla in the python console of qgis and worked > > > without errors. Could you test qgis with this patch and give me an OK > > > for the qgis change?. > > > > > > Any additional test of qgis or tortoisehg is welcome. > > > > There is a common file in both flavors. I added -main and -common to > > py-qscintilla as workaround.
Ah, good catch.. a bit infortunate, the diff is hardly readable now :) I think you've covered all cases but more eyes on it would be good, especially testing the upgrade paths. other than that it reads good to me, we just need to make sure the qscintilla update is commited in sync with this.
