Update seahorse to 2.26.0.

pkgsrc changes:

    * add net/avahi dependency to enable key sharing support

Changes between 2.24.0 and 2.26.0:
==================================

    * Searching by key identifiers now shows results.
    * Disable interactive tree search in key manager.
    * Add libcryptui documentation.
    * Remove use of GTK+ deprecated symbols.
    * Allow creation and deletion of keyrings from main GUI.
    * Only autostart seahorse-daemon when key sharing is enabled.
    * seahorse-daemon registers with session manager properly.
    * Remove bits of libcryptui	that are now handled by the gcr library
      from gnome-keyring.
    * Tons of other fixes and changes.
This commit is contained in:
jmcneill 2009-03-15 18:32:43 +00:00
parent c991d4d5c2
commit f5dfbd24ec
4 changed files with 78 additions and 120 deletions

View file

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.76 2008/11/08 23:46:00 jnemeth Exp $
# $NetBSD: Makefile,v 1.77 2009/03/15 18:32:43 jmcneill Exp $
DISTNAME= seahorse-2.24.1
DISTNAME= seahorse-2.26.0
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/seahorse/2.24/}
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/seahorse/2.26/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
@ -53,6 +53,7 @@ post-patch:
.include "../../databases/shared-mime-info/mimedb.mk"
.include "../../devel/GConf/schemas.mk"
.include "../../devel/libglade/buildlink3.mk"
.include "../../net/avahi/buildlink3.mk"
.include "../../net/libsoup24/buildlink3.mk"
.include "../../security/gnome-keyring/buildlink3.mk"
.include "../../security/gpgme/buildlink3.mk"
@ -63,5 +64,4 @@ post-patch:
.include "../../x11/gtk2/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
# XXX: avahi for SHARING
.include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.19 2008/10/27 16:51:59 wiz Exp $
@comment $NetBSD: PLIST,v 1.20 2009/03/15 18:32:43 jmcneill Exp $
bin/seahorse
bin/seahorse-daemon
include/libcryptui/cryptui-key-chooser.h
@ -15,137 +15,52 @@ man/man1/seahorse-daemon.1
share/applications/seahorse.desktop
share/dbus-1/services/org.gnome.seahorse.service
share/gconf/schemas/seahorse.schemas
share/gnome/help/seahorse/C/figures/export.png
share/gnome/help/seahorse/C/figures/file-manager.png
share/gnome/help/seahorse/C/figures/generate.png
share/gnome/help/seahorse/C/figures/import.png
share/gnome/help/seahorse/C/figures/key-manager.png
share/gnome/help/seahorse/C/figures/key-properties.png
share/gnome/help/seahorse/C/figures/passphrase.png
share/gnome/help/seahorse/C/figures/preferences.png
share/gnome/help/seahorse/C/figures/recipients.png
share/gnome/autostart/seahorse-daemon.desktop
share/gnome/help/seahorse/C/figures/seahorse-window.png
share/gnome/help/seahorse/C/figures/signature.png
share/gnome/help/seahorse/C/figures/text-editor.png
share/gnome/help/seahorse/C/legal.xml
share/gnome/help/seahorse/C/seahorse.xml
share/gnome/help/seahorse/de/figures/export.png
share/gnome/help/seahorse/de/figures/file-manager.png
share/gnome/help/seahorse/de/figures/generate.png
share/gnome/help/seahorse/de/figures/import.png
share/gnome/help/seahorse/de/figures/key-manager.png
share/gnome/help/seahorse/de/figures/key-properties.png
share/gnome/help/seahorse/de/figures/passphrase.png
share/gnome/help/seahorse/de/figures/preferences.png
share/gnome/help/seahorse/de/figures/recipients.png
share/gnome/help/seahorse/ca/figures/seahorse-window.png
share/gnome/help/seahorse/ca/seahorse.xml
share/gnome/help/seahorse/de/figures/seahorse-window.png
share/gnome/help/seahorse/de/figures/signature.png
share/gnome/help/seahorse/de/figures/text-editor.png
share/gnome/help/seahorse/de/seahorse.xml
share/gnome/help/seahorse/en_GB/figures/export.png
share/gnome/help/seahorse/en_GB/figures/file-manager.png
share/gnome/help/seahorse/en_GB/figures/generate.png
share/gnome/help/seahorse/en_GB/figures/import.png
share/gnome/help/seahorse/en_GB/figures/key-manager.png
share/gnome/help/seahorse/en_GB/figures/key-properties.png
share/gnome/help/seahorse/en_GB/figures/passphrase.png
share/gnome/help/seahorse/en_GB/figures/preferences.png
share/gnome/help/seahorse/en_GB/figures/recipients.png
share/gnome/help/seahorse/el/figures/seahorse-window.png
share/gnome/help/seahorse/el/seahorse.xml
share/gnome/help/seahorse/en_GB/figures/seahorse-window.png
share/gnome/help/seahorse/en_GB/figures/signature.png
share/gnome/help/seahorse/en_GB/figures/text-editor.png
share/gnome/help/seahorse/en_GB/seahorse.xml
share/gnome/help/seahorse/es/figures/export.png
share/gnome/help/seahorse/es/figures/file-manager.png
share/gnome/help/seahorse/es/figures/generate.png
share/gnome/help/seahorse/es/figures/import.png
share/gnome/help/seahorse/es/figures/key-manager.png
share/gnome/help/seahorse/es/figures/key-properties.png
share/gnome/help/seahorse/es/figures/passphrase.png
share/gnome/help/seahorse/es/figures/preferences.png
share/gnome/help/seahorse/es/figures/recipients.png
share/gnome/help/seahorse/es/figures/seahorse-window.png
share/gnome/help/seahorse/es/figures/signature.png
share/gnome/help/seahorse/es/figures/text-editor.png
share/gnome/help/seahorse/es/seahorse.xml
share/gnome/help/seahorse/fr/figures/export.png
share/gnome/help/seahorse/fr/figures/file-manager.png
share/gnome/help/seahorse/fr/figures/generate.png
share/gnome/help/seahorse/fr/figures/import.png
share/gnome/help/seahorse/fr/figures/key-manager.png
share/gnome/help/seahorse/fr/figures/key-properties.png
share/gnome/help/seahorse/fr/figures/passphrase.png
share/gnome/help/seahorse/fr/figures/preferences.png
share/gnome/help/seahorse/fr/figures/recipients.png
share/gnome/help/seahorse/eu/figures/seahorse-window.png
share/gnome/help/seahorse/eu/seahorse.xml
share/gnome/help/seahorse/fr/figures/seahorse-window.png
share/gnome/help/seahorse/fr/figures/signature.png
share/gnome/help/seahorse/fr/figures/text-editor.png
share/gnome/help/seahorse/fr/seahorse.xml
share/gnome/help/seahorse/it/figures/export.png
share/gnome/help/seahorse/it/figures/file-manager.png
share/gnome/help/seahorse/it/figures/generate.png
share/gnome/help/seahorse/it/figures/import.png
share/gnome/help/seahorse/it/figures/key-manager.png
share/gnome/help/seahorse/it/figures/key-properties.png
share/gnome/help/seahorse/it/figures/passphrase.png
share/gnome/help/seahorse/it/figures/preferences.png
share/gnome/help/seahorse/it/figures/recipients.png
share/gnome/help/seahorse/it/figures/seahorse-window.png
share/gnome/help/seahorse/it/figures/signature.png
share/gnome/help/seahorse/it/figures/text-editor.png
share/gnome/help/seahorse/it/seahorse.xml
share/gnome/help/seahorse/oc/figures/export.png
share/gnome/help/seahorse/oc/figures/file-manager.png
share/gnome/help/seahorse/oc/figures/generate.png
share/gnome/help/seahorse/oc/figures/import.png
share/gnome/help/seahorse/oc/figures/key-manager.png
share/gnome/help/seahorse/oc/figures/key-properties.png
share/gnome/help/seahorse/oc/figures/passphrase.png
share/gnome/help/seahorse/oc/figures/preferences.png
share/gnome/help/seahorse/oc/figures/recipients.png
share/gnome/help/seahorse/oc/figures/seahorse-window.png
share/gnome/help/seahorse/oc/figures/signature.png
share/gnome/help/seahorse/oc/figures/text-editor.png
share/gnome/help/seahorse/oc/seahorse.xml
share/gnome/help/seahorse/ru/figures/export.png
share/gnome/help/seahorse/ru/figures/file-manager.png
share/gnome/help/seahorse/ru/figures/generate.png
share/gnome/help/seahorse/ru/figures/import.png
share/gnome/help/seahorse/ru/figures/key-manager.png
share/gnome/help/seahorse/ru/figures/key-properties.png
share/gnome/help/seahorse/ru/figures/passphrase.png
share/gnome/help/seahorse/ru/figures/preferences.png
share/gnome/help/seahorse/ru/figures/recipients.png
share/gnome/help/seahorse/ru/figures/seahorse-window.png
share/gnome/help/seahorse/ru/figures/signature.png
share/gnome/help/seahorse/ru/figures/text-editor.png
share/gnome/help/seahorse/ru/seahorse.xml
share/gnome/help/seahorse/sv/figures/export.png
share/gnome/help/seahorse/sv/figures/file-manager.png
share/gnome/help/seahorse/sv/figures/generate.png
share/gnome/help/seahorse/sv/figures/import.png
share/gnome/help/seahorse/sv/figures/key-manager.png
share/gnome/help/seahorse/sv/figures/key-properties.png
share/gnome/help/seahorse/sv/figures/passphrase.png
share/gnome/help/seahorse/sv/figures/preferences.png
share/gnome/help/seahorse/sv/figures/recipients.png
share/gnome/help/seahorse/sv/figures/seahorse-window.png
share/gnome/help/seahorse/sv/figures/signature.png
share/gnome/help/seahorse/sv/figures/text-editor.png
share/gnome/help/seahorse/sv/seahorse.xml
share/gnome/help/seahorse/vi/figures/export.png
share/gnome/help/seahorse/vi/figures/file-manager.png
share/gnome/help/seahorse/vi/figures/generate.png
share/gnome/help/seahorse/vi/figures/import.png
share/gnome/help/seahorse/vi/figures/key-manager.png
share/gnome/help/seahorse/vi/figures/key-properties.png
share/gnome/help/seahorse/vi/figures/passphrase.png
share/gnome/help/seahorse/vi/figures/preferences.png
share/gnome/help/seahorse/vi/figures/recipients.png
share/gnome/help/seahorse/vi/figures/seahorse-window.png
share/gnome/help/seahorse/vi/figures/signature.png
share/gnome/help/seahorse/vi/figures/text-editor.png
share/gnome/help/seahorse/vi/seahorse.xml
share/gtk-doc/html/libcryptui/ch01.html
share/gtk-doc/html/libcryptui/home.png
share/gtk-doc/html/libcryptui/index.html
share/gtk-doc/html/libcryptui/index.sgml
share/gtk-doc/html/libcryptui/left.png
share/gtk-doc/html/libcryptui/libcryptui-CryptUIKeyChooser.html
share/gtk-doc/html/libcryptui/libcryptui-CryptUIKeyStore.html
share/gtk-doc/html/libcryptui/libcryptui-CryptUIKeyset.html
share/gtk-doc/html/libcryptui/libcryptui-cryptui-defines.html
share/gtk-doc/html/libcryptui/libcryptui-cryptui-key-combo.html
share/gtk-doc/html/libcryptui/libcryptui-cryptui-key-list.html
share/gtk-doc/html/libcryptui/libcryptui-cryptui-marshal.html
share/gtk-doc/html/libcryptui/libcryptui-cryptui.html
share/gtk-doc/html/libcryptui/libcryptui.devhelp
share/gtk-doc/html/libcryptui/libcryptui.devhelp2
share/gtk-doc/html/libcryptui/right.png
share/gtk-doc/html/libcryptui/style.css
share/gtk-doc/html/libcryptui/up.png
share/icons/hicolor/16x16/apps/seahorse-preferences.png
share/icons/hicolor/16x16/apps/seahorse.png
share/icons/hicolor/22x22/apps/seahorse-preferences.png
@ -186,6 +101,7 @@ share/locale/it/LC_MESSAGES/seahorse.mo
share/locale/ja/LC_MESSAGES/seahorse.mo
share/locale/kn/LC_MESSAGES/seahorse.mo
share/locale/ko/LC_MESSAGES/seahorse.mo
share/locale/ku/LC_MESSAGES/seahorse.mo
share/locale/lt/LC_MESSAGES/seahorse.mo
share/locale/lv/LC_MESSAGES/seahorse.mo
share/locale/mk/LC_MESSAGES/seahorse.mo
@ -221,9 +137,12 @@ share/locale/zh_CN/LC_MESSAGES/seahorse.mo
share/locale/zh_HK/LC_MESSAGES/seahorse.mo
share/locale/zh_TW/LC_MESSAGES/seahorse.mo
share/omf/seahorse/seahorse-C.omf
share/omf/seahorse/seahorse-ca.omf
share/omf/seahorse/seahorse-de.omf
share/omf/seahorse/seahorse-el.omf
share/omf/seahorse/seahorse-en_GB.omf
share/omf/seahorse/seahorse-es.omf
share/omf/seahorse/seahorse-eu.omf
share/omf/seahorse/seahorse-fr.omf
share/omf/seahorse/seahorse-it.omf
share/omf/seahorse/seahorse-oc.omf
@ -263,7 +182,8 @@ share/seahorse/glade/seahorse-add-uid.glade
share/seahorse/glade/seahorse-change-passphrase.glade
share/seahorse/glade/seahorse-expires.glade
share/seahorse/glade/seahorse-generate-select.glade
share/seahorse/glade/seahorse-gkeyring-item-properties.glade
share/seahorse/glade/seahorse-gkr-item-properties.glade
share/seahorse/glade/seahorse-gkr-keyring.glade
share/seahorse/glade/seahorse-key-manager.glade
share/seahorse/glade/seahorse-key-manager.ui
share/seahorse/glade/seahorse-keyserver-results.glade
@ -292,11 +212,18 @@ share/seahorse/glade/seahorse-ssh-upload.glade
@dirrm share/omf/seahorse
@comment in rarian: @dirrm share/omf
@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48
@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32
@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps
@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24
@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22
@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16
@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
@comment in xdg-dirs: @dirrm share/icons
@dirrm share/gtk-doc/html/libcryptui
@dirrm share/gnome/help/seahorse/vi/figures
@dirrm share/gnome/help/seahorse/vi
@dirrm share/gnome/help/seahorse/sv/figures
@ -309,18 +236,26 @@ share/seahorse/glade/seahorse-ssh-upload.glade
@dirrm share/gnome/help/seahorse/it
@dirrm share/gnome/help/seahorse/fr/figures
@dirrm share/gnome/help/seahorse/fr
@dirrm share/gnome/help/seahorse/eu/figures
@dirrm share/gnome/help/seahorse/eu
@dirrm share/gnome/help/seahorse/es/figures
@dirrm share/gnome/help/seahorse/es
@dirrm share/gnome/help/seahorse/en_GB/figures
@dirrm share/gnome/help/seahorse/en_GB
@dirrm share/gnome/help/seahorse/el/figures
@dirrm share/gnome/help/seahorse/el
@dirrm share/gnome/help/seahorse/de/figures
@dirrm share/gnome/help/seahorse/de
@dirrm share/gnome/help/seahorse/ca/figures
@dirrm share/gnome/help/seahorse/ca
@dirrm share/gnome/help/seahorse/C/figures
@dirrm share/gnome/help/seahorse/C
@dirrm share/gnome/help/seahorse
@comment in gnome2-dirs: @dirrm share/gnome/help
@comment in gnome2-dirs: @dirrm share/gnome
@comment in GConf: @dirrm share/gconf/schemas
@comment in dbus: @dirrm share/dbus-1/services
@comment in dbus: @dirrm share/dbus-1
@comment in xdg-dirs: @dirrm share/applications
@dirrm lib/seahorse
@dirrm include/libcryptui

View file

@ -1,6 +1,7 @@
$NetBSD: distinfo,v 1.26 2008/10/27 16:51:59 wiz Exp $
$NetBSD: distinfo,v 1.27 2009/03/15 18:32:44 jmcneill Exp $
SHA1 (seahorse-2.24.1.tar.bz2) = 66a993a5a24e2e2637db6964c39c0a6cc432e0ec
RMD160 (seahorse-2.24.1.tar.bz2) = 0cf99ed7de4eeb7100f0de346dc82a8d74b3ff36
Size (seahorse-2.24.1.tar.bz2) = 2197087 bytes
SHA1 (seahorse-2.26.0.tar.bz2) = 701699685003202ec68de28d2d584cf682a210d4
RMD160 (seahorse-2.26.0.tar.bz2) = 2183c09bea1ed99ccdc20bd3ee2e3f2bce1f3d7f
Size (seahorse-2.26.0.tar.bz2) = 2151482 bytes
SHA1 (patch-aa) = 312f108adf95a33dc24b4025de7c0d74b9d2df3d
SHA1 (patch-ab) = 0abe419541669a41aaf48e3a41efdcfc031ed0ed

View file

@ -0,0 +1,22 @@
$NetBSD: patch-ab,v 1.10 2009/03/15 18:32:44 jmcneill Exp $
--- daemon/Makefile.in.orig 2009-03-15 14:18:18.000000000 -0400
+++ daemon/Makefile.in
@@ -323,7 +323,7 @@ INCLUDES = -I$(top_builddir) \
-DLOCALEDIR=\""$(localedir)"\" \
-DPIXMAPSDIR=\""$(pixmapsdir)"\" \
-DLIBCRYPTUI_API_SUBJECT_TO_CHANGE \
- -DAUTOSTARTDIR=\""$(sysconfdir)/xdg/autostart"\"
+ -DAUTOSTARTDIR=\""$(PREFIX)/share/gnome/autostart"\"
BUILT_SOURCES = \
seahorse-service-bindings.h \
@@ -359,7 +359,7 @@ man_MANS = seahorse-daemon.1
glade_DATA =
#autostart
-desktopdir = $(sysconfdir)/xdg/autostart
+desktopdir = $(PREFIX)/share/gnome/autostart
desktop_in_files = seahorse-daemon.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
EXTRA_DIST = \