Consolidate Python2 and Python3 meta-modules.

GObject-Introspection now works with Python3 so the split isn't needed any more.
This commit is contained in:
John Ralls 2018-01-15 07:27:43 -08:00
parent 5b48691c3a
commit 5bec86c1f4

View File

@ -163,10 +163,10 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
</dependencies> </dependencies>
</distutils> </distutils>
<metamodule id="meta-python2-modules"> <metamodule id="meta-gramps-modules">
<dependencies> <dependencies>
<dep package="python"/> <dep package="python3"/>
<dep package="meta-gtk-osx-gtk3"/> <dep package="meta-gtk-osx-gtk3.14"/>
<dep package="meta-gtk-osx-gtk3-core-themes"/> <dep package="meta-gtk-osx-gtk3-core-themes"/>
<dep package="goocanvas2"/> <dep package="goocanvas2"/>
<dep package="librsvg"/> <dep package="librsvg"/>
@ -176,20 +176,15 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
<dep package="osmgpsmap"/> <dep package="osmgpsmap"/>
<dep package="graphviz"/> <dep package="graphviz"/>
<dep package="gexiv2"/> <dep package="gexiv2"/>
</dependencies> <dep package="berkeleydb"/>
</metamodule> <dep package="gtk-mac-integration-python"/>
<dep package="pycairo"/>
<dep package="pygobject3"/>
<dep package='pyicu'/>
<dep package='pybsddb'/>
<dep package="pil"/>
</dependencies>
</metamodule>
<metamodule id="meta-python3-modules">
<dependencies>
<dep package="berkeleydb"/>
<dep package="python3"/>
<dep package="gtk-mac-integration-python"/>
<dep package="pycairo"/>
<dep package="pygobject3"/>
<dep package='pyicu'/>
<dep package='pybsddb'/>
<dep package="pil"/>
</dependencies>
</metamodule>
</moduleset> </moduleset>