diff --git a/srcpkgs/dconf/dconf-devel.template b/srcpkgs/dconf/dconf-devel.template index c0e235bfe5..f39230672e 100644 --- a/srcpkgs/dconf/dconf-devel.template +++ b/srcpkgs/dconf/dconf-devel.template @@ -7,6 +7,7 @@ long_desc="${long_desc} Add_dependency run pkg-config Add_dependency run glib-devel +Add_dependency run vala-devel Add_dependency run dconf do_install() @@ -14,6 +15,5 @@ do_install() mkdir -p ${DESTDIR}/usr/{lib,share} mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/{gir*,gtk-doc,vala} \ - ${DESTDIR}/usr/share + mv ${SRCPKGDESTDIR}/usr/share/{gtk-doc,vala} ${DESTDIR}/usr/share } diff --git a/srcpkgs/dconf/dconf-editor.template b/srcpkgs/dconf/dconf-editor.template index 86707790bf..4a4d7203fb 100644 --- a/srcpkgs/dconf/dconf-editor.template +++ b/srcpkgs/dconf/dconf-editor.template @@ -15,11 +15,13 @@ Add_dependency run libpng Add_dependency run freetype Add_dependency run fontconfig Add_dependency run libxml2 -Add_dependency run gtk+ +Add_dependency run gtk+3 Add_dependency run dconf do_install() { - install -d ${DESTDIR}/usr/bin + install -d ${DESTDIR}/usr/{bin,share} mv ${SRCPKGDESTDIR}/usr/bin/dconf-editor ${DESTDIR}/usr/bin + mv ${SRCPKGDESTDIR}/usr/share/{dconf-editor,applications} \ + ${DESTDIR}/usr/share } diff --git a/srcpkgs/dconf/gir-dconf.template b/srcpkgs/dconf/gir-dconf.template deleted file mode 100644 index 91aa19c2d4..0000000000 --- a/srcpkgs/dconf/gir-dconf.template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'gir-dconf'. -# -short_desc="Introspection data for GNOME dconf" -long_desc="${long_desc} - - This package contains small pieces of introspection data for dconf, - a low level configuration system." - -do_install() -{ - install -d ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib -} diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template index 4c7c490a94..12fbb3c93b 100644 --- a/srcpkgs/dconf/template +++ b/srcpkgs/dconf/template @@ -1,22 +1,24 @@ # Template file for 'dconf' pkgname=dconf -version=0.5.1 -distfiles="${GNOME_SITE}/$pkgname/0.5/$pkgname-$version.tar.bz2" +version=0.7.2 +distfiles="${GNOME_SITE}/$pkgname/0.7/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="A low-level configuration system" maintainer="Juan RP " -checksum=0083d70e1b5e540d8d4b3f04fa5d17dff4c574136682fe3bdd9b5ecc196ec4f6 +checksum=35fc51ef893dc3951bfc7abaee6adb8b77e501274b3a5292ed03db4e685ef03c long_desc=" dconf is a low-level configuration system. Its main purpose is to provide a backend to GSettings on platforms that don't already have configuration storage systems." triggers="gio-modules" -subpackages="gir-dconf dconf-devel dconf-editor" +subpackages="dconf-devel dconf-editor" Add_dependency run glibc Add_dependency run glib +Add_dependency run dbus-libs Add_dependency build pkg-config Add_dependency build glib-devel Add_dependency build gtk+-devel +Add_dependency build vala-devel Add_dependency full dbus diff --git a/srcpkgs/gir-dconf b/srcpkgs/gir-dconf deleted file mode 120000 index 69f7f165c4..0000000000 --- a/srcpkgs/gir-dconf +++ /dev/null @@ -1 +0,0 @@ -dconf \ No newline at end of file