diff --git a/common/shlibs b/common/shlibs index 52f86041162..da704cf5986 100644 --- a/common/shlibs +++ b/common/shlibs @@ -521,8 +521,6 @@ libmetacity-private.so.0 metacity metacity-devel libgnome-menu-3.so.0 gnome-menus gnome-menus-devel libart_lgpl_2.so.2 libart libart-devel libgnomecanvas-2.so.0 libgnomecanvas libgnomecanvas-devel -libgcr-3.so.1 gnome-keyring gnome-keyring-devel -libgck-1.so.0 gnome-keyring gnome-keyring-devel libgnome-keyring.so.0 libgnome-keyring libgnome-keyring-devel libgweather-3.so.0 libgweather libgweather-devel libical.so.0 libical libical-devel diff --git a/srcpkgs/gnome-keyring-devel b/srcpkgs/gnome-keyring-devel deleted file mode 120000 index 0e2556accf5..00000000000 --- a/srcpkgs/gnome-keyring-devel +++ /dev/null @@ -1 +0,0 @@ -gnome-keyring \ No newline at end of file diff --git a/srcpkgs/gnome-keyring/depends b/srcpkgs/gnome-keyring/depends deleted file mode 100644 index ab0d9627ad7..00000000000 --- a/srcpkgs/gnome-keyring/depends +++ /dev/null @@ -1,2 +0,0 @@ -abi_depends=">=3.0.0" -api_depends="${abi_depends}" diff --git a/srcpkgs/gnome-keyring/gnome-keyring-devel.template b/srcpkgs/gnome-keyring/gnome-keyring-devel.template deleted file mode 100644 index adc3255d181..00000000000 --- a/srcpkgs/gnome-keyring/gnome-keyring-devel.template +++ /dev/null @@ -1,19 +0,0 @@ -# Template file for 'gnome-keyring-devel'. -# -short_desc="${sourcepkg} (development files)" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - -Add_dependency run gtk+3-devel -Add_dependency run p11-kit-devel -Add_dependency run libtasn1-devel -Add_dependency run gnome-keyring - -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/gtk-doc ${DESTDIR}/usr/share -} diff --git a/srcpkgs/gnome-keyring/gnome-keyring.rshlibs b/srcpkgs/gnome-keyring/gnome-keyring.rshlibs index bf993e50fe3..da5ca5f705e 100644 --- a/srcpkgs/gnome-keyring/gnome-keyring.rshlibs +++ b/srcpkgs/gnome-keyring/gnome-keyring.rshlibs @@ -1,4 +1,3 @@ -libp11-kit.so.0 libgio-2.0.so.0 libgobject-2.0.so.0 libgmodule-2.0.so.0 @@ -10,16 +9,8 @@ libc.so.6 libgcrypt.so.11 libgpg-error.so.0 libgtk-3.so.0 -libgdk-3.so.0 -libatk-1.0.so.0 -libpangoft2-1.0.so.0 -libpangocairo-1.0.so.0 -libgdk_pixbuf-2.0.so.0 -libcairo-gobject.so.2 -libcairo.so.2 -libpango-1.0.so.0 -libfreetype.so.6 -libfontconfig.so.1 libdbus-1.so.3 libcap-ng.so.0 libpam.so.0 +libgcr-base-3.so.1 +libgck-1.so.0 diff --git a/srcpkgs/gnome-keyring/template b/srcpkgs/gnome-keyring/template index a45d409f58d..6d4a16f79b8 100644 --- a/srcpkgs/gnome-keyring/template +++ b/srcpkgs/gnome-keyring/template @@ -1,15 +1,15 @@ # Template file for 'gnome-keyring' pkgname=gnome-keyring -version=3.2.2 -distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz" +version=3.3.92 +distfiles="${GNOME_SITE}/$pkgname/3.3/$pkgname-$version.tar.xz" build_style=gnu-configure -configure_args="--with-pam-dir=/lib/security +configure_args="--with-pam-dir=/lib/security --disable-debug --disable-schemas-compile --with-root-certs=/etc/ssl/certs" short_desc="GNOME password and secret manager" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL, LGPL" -checksum=f4cdc2c492a9b0157d59439310093e611e1f718a16f7ee2391ac03aadacfaaa3 +checksum=968bb7a099214259b333ed0e9f88960da59228b05e18817b7e679b6a8de48a2e long_desc=" gnome-keyring is a program that keeps passwords and other secrets for users. It is run as a damon in the session, similar to ssh-agent, and @@ -19,8 +19,6 @@ long_desc=" password, and there is also a session keyring which is never stored to disk, but forgotten when the session ends." -subpackages="$pkgname-devel" - # For setcap(8). Add_dependency run libcap-progs Add_dependency run dconf @@ -28,12 +26,10 @@ Add_dependency run dconf Add_dependency build pkg-config Add_dependency build intltool Add_dependency build dbus-devel -Add_dependency build libtasn1-tools +Add_dependency build gcr-devel +Add_dependency build libcap-ng-devel +Add_dependency build pam-devel +Add_dependency build libcap-devel Add_dependency build libtasn1-devel Add_dependency build libgcrypt-devel -Add_dependency build libgpg-error-devel -Add_dependency build pam-devel -Add_dependency build gtk+3-devel -Add_dependency build libcap-devel -Add_dependency build p11-kit-devel -Add_dependency build libcap-ng-devel +Add_dependency build libtasn1-tools