diff --git a/srcpkgs/python-gobject/template b/srcpkgs/python-gobject/template index cdfc61e9481..d46c7f799a4 100644 --- a/srcpkgs/python-gobject/template +++ b/srcpkgs/python-gobject/template @@ -3,9 +3,12 @@ pkgname=python-gobject version=3.30.4 revision=2 wrksrc="pygobject-${version}" +build_style=meson +build_helper="gir" +configure_args="-Dpython=python2.7" pycompile_module="gi pygtkcompat" -hostmakedepends="gobject-introspection meson pkg-config" -makedepends="libglib-devel python-cairo-devel python3-cairo-devel" +hostmakedepends="pkg-config" +makedepends="libglib-devel python-cairo-devel python-devel" depends="gir-freedesktop python-cairo" short_desc="Python2 bindings for GObject" maintainer="Enno Boland " @@ -14,49 +17,15 @@ homepage="https://pygobject.readthedocs.io/" distfiles="${GNOME_SITE}/pygobject/${version%.*}/pygobject-${version}.tar.xz" checksum=2dc1a1a444b82955e65b81c2a2511ecf8032404beba4ef1d48144168f2f64c43 -# Also, we don't do any meson cross specific stuff here -nocross="http://build.voidlinux.eu/builders/armv7l_builder/builds/8676/steps/shell_3/logs/stdio" - -pre_configure() { - mkdir -p gi-${py2_ver} - mv * gi-${py2_ver} || true - cp -a gi-${py2_ver} gi-${py3_ver} -} - -do_configure() { - for pyver in $py2_ver $py3_ver; do - cd ${wrksrc}/gi-${pyver} - meson --prefix=/usr --buildtype=plain -Dpython=python${pyver} . build - done -} - -do_build() { - for pyver in $py2_ver $py3_ver; do - cd ${wrksrc}/gi-${pyver} - ninja -C build ${makejobs} - done -} - -do_install() { - for pyver in $py2_ver $py3_ver; do - cd ${wrksrc}/gi-${pyver} - DESTDIR=${DESTDIR} ninja -C build install - done -} - -python3-gobject_package() { - pycompile_module="gi pygtkcompat" - depends="gir-freedesktop python3-cairo" - short_desc="${short_desc/Python2/Python3}" - pkg_install() { - vmove ${py3_sitelib} - } -} +case "$XBPS_TARGET_MACHINE" in + x86_64-musl) ;; + *-musl) broken="Error relocating /usr/aarch64-linux-musl/usr/lib/libz.so.1: unsupported relocation type 1026" ;; +esac python-gobject-devel_package() { - depends="libgirepository-devel python-cairo-devel python3-cairo-devel - python-gobject>=${version}_${revision} - python3-gobject>=${version}_${revision}" + depends="libgirepository-devel python-cairo-devel + libglib-devel libffi-devel + python-gobject>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include diff --git a/srcpkgs/python3-gobject b/srcpkgs/python3-gobject deleted file mode 120000 index 4af4eca5908..00000000000 --- a/srcpkgs/python3-gobject +++ /dev/null @@ -1 +0,0 @@ -python-gobject \ No newline at end of file