diff --git a/srcpkgs/gobject-introspection/gir-freedesktop.template b/srcpkgs/gobject-introspection/gir-freedesktop.template new file mode 100644 index 0000000000..f8040e92fd --- /dev/null +++ b/srcpkgs/gobject-introspection/gir-freedesktop.template @@ -0,0 +1,16 @@ +# Template file for 'gir-freedesktop'. +# +short_desc="Introspection data for some FreeDesktop components" +long_desc="${long_desc} + + This package contains small pieces of introspection data for the Cairo, + FontConfig, FreeType, GL, and some XOrg libraries. They are distributed in + this package temporarily, while the original sources do not include support + for GObject Introspection. They are far from complete and only include what + is necessary for other introspection packages to work properly." + +do_install() +{ + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib +} diff --git a/srcpkgs/gobject-introspection/gobject-introspection-devel.template b/srcpkgs/gobject-introspection/gobject-introspection-devel.template deleted file mode 100644 index ded0d70334..0000000000 --- a/srcpkgs/gobject-introspection/gobject-introspection-devel.template +++ /dev/null @@ -1,18 +0,0 @@ -# Template file for 'gobject-introspection-devel'. -# -short_desc="${sourcepkg} development files" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - -Add_dependency run gobject-introspection - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/lib*.so ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr -} diff --git a/srcpkgs/gobject-introspection/libgirepository-devel.template b/srcpkgs/gobject-introspection/libgirepository-devel.template new file mode 100644 index 0000000000..1b7e8ac6ed --- /dev/null +++ b/srcpkgs/gobject-introspection/libgirepository-devel.template @@ -0,0 +1,19 @@ +# Template file for 'libgirepository-devel'. +# +short_desc="Library for handling GObject introspection data (development files)" +long_desc="${long_desc} + + This package contains C libraries for handling the introspection data." + +Add_dependency run libffi-devel +Add_dependency run glib-devel +Add_dependency run libgirepository + +do_install() +{ + mkdir -p ${DESTDIR}/usr/{lib,share} + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/share/gir-1.0 ${DESTDIR}/usr/share +} diff --git a/srcpkgs/gobject-introspection/libgirepository.template b/srcpkgs/gobject-introspection/libgirepository.template new file mode 100644 index 0000000000..bb55636a0c --- /dev/null +++ b/srcpkgs/gobject-introspection/libgirepository.template @@ -0,0 +1,19 @@ +# Template file for 'libgirepository'. +# +short_desc="Library for handling GObject introspection data (runtime library)" +long_desc="${long_desc} + + This package contains C libraries for handling the introspection data." + +replaces="gobject-introspection<0.6.10" + +Add_dependency run glibc +Add_dependency run glib +Add_dependency run cairo +Add_dependency run libffi + +do_install() +{ + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/*.so* ${DESTDIR}/usr/lib +} diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template index eac49b9d6c..048687a477 100644 --- a/srcpkgs/gobject-introspection/template +++ b/srcpkgs/gobject-introspection/template @@ -1,19 +1,29 @@ # Template file for 'gobject-introspection' pkgname=gobject-introspection -version=0.6.5 +version=0.6.10 distfiles="${GNOME_SITE}/$pkgname/0.6/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="Introspection system for GObject-based libraries" maintainer="Juan RP " -checksum=fe1702200d45958cdfe3707952d64c3a541628b1203a9b2644db0ee2c6d5df79 +checksum=36bd511a4d45967f95526f94708b3f4367e9d344aa11f3206fe6edb7fc3a8d4b long_desc=" The goal of the project is to describe the APIs and collect them in a uniform, machine readable format." -subpackages="$pkgname-devel" +disable_parallel_build=yes +subpackages="gir-freedesktop libgirepository libgirepository-devel" + +Add_dependency run glibc +Add_dependency run libffi +Add_dependency run glib +Add_dependency run python +Add_dependency run libgirepository + Add_dependency build pkg-config Add_dependency build flex -Add_dependency full glibc -Add_dependency full libffi -Add_dependency full glib -Add_dependency full python +Add_dependency build libffi-devel +Add_dependency build glib-devel +Add_dependency build cairo-devel +Add_dependency build python-devel +Add_dependency build libxml2-devel +Add_dependency build MesaLib-devel diff --git a/srcpkgs/gobject-introspection-devel b/srcpkgs/libgirepository similarity index 100% rename from srcpkgs/gobject-introspection-devel rename to srcpkgs/libgirepository diff --git a/srcpkgs/libgirepository-devel b/srcpkgs/libgirepository-devel new file mode 120000 index 0000000000..acab3e635e --- /dev/null +++ b/srcpkgs/libgirepository-devel @@ -0,0 +1 @@ +gobject-introspection \ No newline at end of file diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt index fac9880031..a73610e3c4 100644 --- a/xbps-src/common/mapping_shlib_binpkg.txt +++ b/xbps-src/common/mapping_shlib_binpkg.txt @@ -167,8 +167,9 @@ libpci.so pciutils pciutils-devel libpcre.so pcre pcre-devel libpcreposix.so pcre pcre-devel libpcrecpp.so pcre pcre-devel -libgirepository-everything-1.0.so gobject-introspection gobject-introspection-devel -libgirepository-1.0.so gobject-introspection gobject-introspection-devel +libgirepository-gimarshallingtests-1.0.so libgirepository libgirepository-devel +libgirepository-everything-1.0.so libgirepository libgirepository-devel +libgirepository-1.0.so libgirepository libgirepository-devel libudev.so libudev libudev-devel libgudev-1.0.so libgudev libgudev-devel libproc-3.2.8.so procps