On Tue, Feb 18, 2020 at 08:44:56AM +0100, Landry Breuil wrote: > 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.
after testing a bit and building both flavors, i think -common dependencies & @conflict markers should be improved. --- /usr/ports/plist/amd64/py-qscintilla-common-2.11.4 +++ /usr/ports/plist/amd64/py-qscintilla-common-2.11.4-new @@ -5,9 +5,9 @@ @arch amd64 +DESC @sha yi01FFF24LXAwpXx02TZFzXv4sasu4cUCkMk3DDpz1c= -@conflict py3-qscintilla-qt5-* +@conflict py-qscintilla-qt5-* @pkgpath editors/py-qscintilla,qt5 -@depend lang/python/3.7,-main:python->=3.7,<3.8:python-3.7.6p1 +@depend lang/python/2.7,-main:python->=2.7,<2.8:python-2.7.17p1 @cwd /usr/local lib/qt5/qsci/ lib/qt5/qsci/api/ technically i think it only conflicts with py3-qscintilla-qt5-* (since that's where the common file was, ie not in py2/qt4 version) and maybe RUN_DEPENDS-common should be emptied.
