Major update to gnome-keyring-2.30.0.

THIS WILL BREAK SEVERAL DEPENDENCIES and will be dealt with really soon.
This commit is contained in:
ajacoutot 2010-04-20 20:11:26 +00:00
parent 355cfa0cef
commit b8a9513aa7
5 changed files with 40 additions and 73 deletions

View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.40 2009/12/14 16:53:24 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.41 2010/04/20 20:11:26 ajacoutot Exp $
COMMENT= password agent for the GNOME project
GNOME_PROJECT= gnome-keyring
GNOME_VERSION= 2.28.2
GNOME_VERSION= 2.30.0
SHARED_LIBS += gp11 0.0 # .0.0
SHARED_LIBS += gcr 0.0 # .0.0
SHARED_LIBS += gnome-keyring 5.0 # .1.1
SHARED_LIBS += gp11 1.0 # .0.0
SHARED_LIBS += gcr 1.0 # .0.0
# GPLv2/LGPLv2
PERMIT_PACKAGE_CDROM= Yes
@ -15,13 +14,13 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-glib-1
WANTLIB += expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 gpg-error
WANTLIB += gthread-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
WANTLIB += xcb z
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += glitz gmodule-2.0 gobject-2.0 gpg-error gthread-2.0
WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 png pthread pthread-stubs xcb xcb-render
WANTLIB += xcb-render-util z
MODULES= devel/gettext \
x11/gnome \
@ -33,6 +32,7 @@ LIB_DEPENDS= gcrypt::security/libgcrypt \
USE_X11= Yes
MODGCONF2_SCHEMAS_DIR= gnome-keyring
MODGCONF2_LIBDEP= No
CONFIGURE_ARGS= --with-root-certs=/etc/ssl \
--disable-pam \

View File

@ -1,5 +1,5 @@
MD5 (gnome/gnome-keyring-2.28.2.tar.bz2) = l+poI+iLOShBh3ZMHKlaWQ==
RMD160 (gnome/gnome-keyring-2.28.2.tar.bz2) = DgnHJ0xMTqA3vH60/47arKU/BPA=
SHA1 (gnome/gnome-keyring-2.28.2.tar.bz2) = CZFGoMs8A2g8/D/jyq3fXf8ArPg=
SHA256 (gnome/gnome-keyring-2.28.2.tar.bz2) = 0taG+yUo7gRbvNnxjQ1FLg64jCJloZR/Y5FSthpZh/Y=
SIZE (gnome/gnome-keyring-2.28.2.tar.bz2) = 3009480
MD5 (gnome/gnome-keyring-2.30.0.tar.bz2) = KT89/teLXD001y0VYfWqMg==
RMD160 (gnome/gnome-keyring-2.30.0.tar.bz2) = yoyTxUNKqgFDckAv+CTr5VgrH/g=
SHA1 (gnome/gnome-keyring-2.30.0.tar.bz2) = mI6unQBAjOnVfujYyk3yK7ph4Zs=
SHA256 (gnome/gnome-keyring-2.30.0.tar.bz2) = EVVRzFZGid7U+cUnk6Juhd774RpuAZoTcj2GfVsDwxQ=
SIZE (gnome/gnome-keyring-2.30.0.tar.bz2) = 1517980

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-daemon_ui_Makefile_in,v 1.2 2009/10/11 08:33:27 ajacoutot Exp $
gnome-keyring-ask will eventually need to dlopen(3) libgthread which
needs libpthread.
--- daemon/ui/Makefile.in.orig Sun Oct 11 10:12:23 2009
+++ daemon/ui/Makefile.in Sun Oct 11 10:12:41 2009
@@ -296,7 +296,7 @@ gnome_keyring_ask_SOURCES = \
gnome_keyring_ask_LDADD = \
$(top_builddir)/egg/libegg-secure.la \
$(top_builddir)/egg/libegg-secure-entry.la \
- $(GTK_LIBS)
+ $(GTK_LIBS) -pthread
noinst_LTLIBRARIES = libgkr-ui.la
BUILT_SOURCES = \

View File

@ -1,8 +1,8 @@
@comment $OpenBSD: PFRAG.shared,v 1.7 2009/10/11 08:33:27 ajacoutot Exp $
@comment $OpenBSD: PFRAG.shared,v 1.8 2010/04/20 20:11:26 ajacoutot Exp $
lib/gnome-keyring/devel/gck-ssh-store-standalone.so
lib/gnome-keyring/devel/gck-user-store-standalone.so
lib/gnome-keyring/gnome-keyring-pkcs11.so
lib/gnome-keyring/standalone/gck-roots-store-standalone.so
lib/gnome-keyring/standalone/gck-secret-store-standalone.so
@lib lib/libgcr.so.${LIBgcr_VERSION}
@lib lib/libgnome-keyring.so.${LIBgnome-keyring_VERSION}
@lib lib/libgp11.so.${LIBgp11_VERSION}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.18 2009/12/14 16:53:25 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.19 2010/04/20 20:11:26 ajacoutot Exp $
%%SHARED%%
@bin bin/gnome-keyring
@bin bin/gnome-keyring-daemon
@ -9,11 +9,8 @@ include/gcr/gcr-certificate.h
include/gcr/gcr-importer.h
include/gcr/gcr-parser.h
include/gcr/gcr-types.h
include/gcr/gcr-unlock-options-widget.h
include/gcr/gcr.h
include/gnome-keyring-1/
include/gnome-keyring-1/gnome-keyring-memory.h
include/gnome-keyring-1/gnome-keyring-result.h
include/gnome-keyring-1/gnome-keyring.h
include/gp11/
include/gp11/gp11.h
include/gp11/pkcs11.h
@ -30,27 +27,40 @@ lib/gnome-keyring/gnome-keyring-pkcs11.la
lib/gnome-keyring/standalone/
lib/gnome-keyring/standalone/gck-roots-store-standalone.a
lib/gnome-keyring/standalone/gck-roots-store-standalone.la
lib/gnome-keyring/standalone/gck-secret-store-standalone.a
lib/gnome-keyring/standalone/gck-secret-store-standalone.la
lib/libgcr.a
lib/libgcr.la
lib/libgnome-keyring.a
lib/libgnome-keyring.la
lib/libgp11.a
lib/libgp11.la
lib/pkgconfig/gcr-0.pc
lib/pkgconfig/gnome-keyring-1.pc
lib/pkgconfig/gp11-0.pc
@bin libexec/gnome-keyring-ask
@bin libexec/gnome-keyring-prompt
share/dbus-1/services/org.gnome.keyring.service
share/examples/xdg/
@sample ${SYSCONFDIR}/xdg/
share/examples/xdg/autostart/
@sample ${SYSCONFDIR}/xdg/autostart/
share/examples/xdg/autostart/gnome-keyring-daemon.desktop
@sample ${SYSCONFDIR}/xdg/autostart/gnome-keyring-daemon.desktop
share/examples/xdg/autostart/gnome-keyring-pkcs11.desktop
@sample ${SYSCONFDIR}/xdg/autostart/gnome-keyring-pkcs11.desktop
share/examples/xdg/autostart/gnome-keyring-secrets.desktop
@sample ${SYSCONFDIR}/xdg/autostart/gnome-keyring-secrets.desktop
share/examples/xdg/autostart/gnome-keyring-ssh.desktop
@sample ${SYSCONFDIR}/xdg/autostart/gnome-keyring-ssh.desktop
share/gcr/
share/gcr/ui/
share/gcr/ui/gcr-certificate-basics-widget.ui
share/gcr/ui/gcr-import-dialog.ui
share/gcr/ui/gcr-unlock-options-widget.ui
share/gnome-keyring/
share/gnome-keyring/introspect/
share/gnome-keyring/introspect/introspect-collection.xml
share/gnome-keyring/introspect/introspect-item.xml
share/gnome-keyring/introspect/introspect-prompt.xml
share/gnome-keyring/introspect/introspect-service.xml
share/gnome-keyring/introspect/introspect-session.xml
share/gnome-keyring/ui/
share/gnome-keyring/ui/gkd-prompt.ui
share/gtk-doc/html/gcr/
share/gtk-doc/html/gcr/GcrCertificateBasicsWidget.html
share/gtk-doc/html/gcr/GcrCertificateDetailsWidget.html
@ -72,29 +82,6 @@ share/gtk-doc/html/gcr/left.png
share/gtk-doc/html/gcr/right.png
share/gtk-doc/html/gcr/style.css
share/gtk-doc/html/gcr/up.png
share/gtk-doc/html/gnome-keyring/
share/gtk-doc/html/gnome-keyring/ch01.html
share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-acl.html
share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-attributes.html
share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-daemon.html
share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-find.html
share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-item-info.html
share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-items.html
share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-keyrings.html
share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-memory.html
share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-misc.html
share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-network.html
share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-password.html
share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-result.html
share/gtk-doc/html/gnome-keyring/gnome-keyring.devhelp
share/gtk-doc/html/gnome-keyring/gnome-keyring.devhelp2
share/gtk-doc/html/gnome-keyring/home.png
share/gtk-doc/html/gnome-keyring/index.html
share/gtk-doc/html/gnome-keyring/index.sgml
share/gtk-doc/html/gnome-keyring/left.png
share/gtk-doc/html/gnome-keyring/right.png
share/gtk-doc/html/gnome-keyring/style.css
share/gtk-doc/html/gnome-keyring/up.png
share/gtk-doc/html/gp11/
share/gtk-doc/html/gp11/ch01.html
share/gtk-doc/html/gp11/gp11-gp11-attribute.html
@ -116,8 +103,6 @@ share/gtk-doc/html/gp11/style.css
share/gtk-doc/html/gp11/up.png
share/locale/ar/LC_MESSAGES/gnome-keyring.mo
share/locale/as/LC_MESSAGES/gnome-keyring.mo
share/locale/ast/
share/locale/ast/LC_MESSAGES/
share/locale/ast/LC_MESSAGES/gnome-keyring.mo
share/locale/az/LC_MESSAGES/gnome-keyring.mo
share/locale/be/LC_MESSAGES/gnome-keyring.mo
@ -136,8 +121,6 @@ share/locale/da/LC_MESSAGES/gnome-keyring.mo
share/locale/de/LC_MESSAGES/gnome-keyring.mo
share/locale/dz/LC_MESSAGES/gnome-keyring.mo
share/locale/el/LC_MESSAGES/gnome-keyring.mo
share/locale/en@shaw/
share/locale/en@shaw/LC_MESSAGES/
share/locale/en@shaw/LC_MESSAGES/gnome-keyring.mo
share/locale/en_CA/LC_MESSAGES/gnome-keyring.mo
share/locale/en_GB/LC_MESSAGES/gnome-keyring.mo