pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc update to 2.22.1
details: https://anonhg.NetBSD.org/pkgsrc/rev/c92c5e428e2e
branches: trunk
changeset: 540912:c92c5e428e2e
user: drochner <drochner%pkgsrc.org@localhost>
date: Thu Apr 10 16:53:44 2008 +0000
description:
update to 2.22.1
This switches to the gnome-2.22 release branch.
diffstat:
devel/libgnomeui/Makefile | 7 +++----
devel/libgnomeui/PLIST | 6 +++++-
devel/libgnomeui/distinfo | 8 ++++----
security/gnome-keyring/Makefile | 12 ++++++++----
security/gnome-keyring/PLIST | 12 +++++++++++-
security/gnome-keyring/distinfo | 12 +++++++-----
security/gnome-keyring/patches/patch-aa | 17 +++++++++++++----
security/gnome-keyring/patches/patch-ac | 12 ++++++++++++
security/gnome-keyring/patches/patch-ad | 23 +++++++++++++++++++++++
9 files changed, 86 insertions(+), 23 deletions(-)
diffs (255 lines):
diff -r 512b84723559 -r c92c5e428e2e devel/libgnomeui/Makefile
--- a/devel/libgnomeui/Makefile Thu Apr 10 16:46:53 2008 +0000
+++ b/devel/libgnomeui/Makefile Thu Apr 10 16:53:44 2008 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.75 2008/03/06 14:53:49 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2008/04/10 16:54:29 drochner Exp $
#
-DISTNAME= libgnomeui-2.20.1.1
-PKGREVISION= 2
+DISTNAME= libgnomeui-2.22.1
CATEGORIES= devel gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomeui/2.20/}
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomeui/2.22/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= jmmv%NetBSD.org@localhost
diff -r 512b84723559 -r c92c5e428e2e devel/libgnomeui/PLIST
--- a/devel/libgnomeui/PLIST Thu Apr 10 16:46:53 2008 +0000
+++ b/devel/libgnomeui/PLIST Thu Apr 10 16:53:44 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2007/10/31 20:06:34 drochner Exp $
+@comment $NetBSD: PLIST,v 1.25 2008/04/10 16:54:29 drochner Exp $
include/libgnomeui-2.0/gnome.h
include/libgnomeui-2.0/libgnomeui/gnome-about.h
include/libgnomeui-2.0/libgnomeui/gnome-app-helper.h
@@ -50,6 +50,7 @@
include/libgnomeui-2.0/libgnomeui/gnome-window.h
include/libgnomeui-2.0/libgnomeui/gnometypebuiltins.h
include/libgnomeui-2.0/libgnomeui/libgnomeui.h
+lib/gtk-2.0/2.10.0/filesystems/libgio.la
lib/gtk-2.0/2.10.0/filesystems/libgnome-vfs.la
lib/libglade/2.0/libgnome.la
lib/libgnomeui-2.la
@@ -163,6 +164,7 @@
share/locale/af/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/am/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ar/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/as/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/az/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/be/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/be@latin/LC_MESSAGES/libgnomeui-2.0.mo
@@ -187,6 +189,7 @@
share/locale/fa/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/fi/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/fr/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/fur/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ga/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/gl/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/gu/LC_MESSAGES/libgnomeui-2.0.mo
@@ -222,6 +225,7 @@
share/locale/or/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/pa/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/pl/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/ps/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/pt/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/pt_BR/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ro/LC_MESSAGES/libgnomeui-2.0.mo
diff -r 512b84723559 -r c92c5e428e2e devel/libgnomeui/distinfo
--- a/devel/libgnomeui/distinfo Thu Apr 10 16:46:53 2008 +0000
+++ b/devel/libgnomeui/distinfo Thu Apr 10 16:53:44 2008 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.26 2007/10/31 20:06:35 drochner Exp $
+$NetBSD: distinfo,v 1.27 2008/04/10 16:54:29 drochner Exp $
-SHA1 (libgnomeui-2.20.1.1.tar.bz2) = e1704b328de6f6f7130147062b3262b3df77484a
-RMD160 (libgnomeui-2.20.1.1.tar.bz2) = 90caad97c85250435299923c90ffa730dbdfd288
-Size (libgnomeui-2.20.1.1.tar.bz2) = 1445994 bytes
+SHA1 (libgnomeui-2.22.1.tar.bz2) = fedbc56ac42d32e97310220469a8d6c52c3732cc
+RMD160 (libgnomeui-2.22.1.tar.bz2) = 222362add689353aa5f7a68767b60588d33245cf
+Size (libgnomeui-2.22.1.tar.bz2) = 1450063 bytes
diff -r 512b84723559 -r c92c5e428e2e security/gnome-keyring/Makefile
--- a/security/gnome-keyring/Makefile Thu Apr 10 16:46:53 2008 +0000
+++ b/security/gnome-keyring/Makefile Thu Apr 10 16:53:44 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2008/02/06 00:36:06 tnn Exp $
+# $NetBSD: Makefile,v 1.35 2008/04/10 16:53:44 drochner Exp $
-DISTNAME= gnome-keyring-2.20.3
+DISTNAME= gnome-keyring-2.22.1
CATEGORIES= security gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-keyring/2.20/}
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-keyring/2.22/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= jmmv%NetBSD.org@localhost
@@ -16,16 +16,20 @@
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
-PKGCONFIG_OVERRIDE= ${WRKSRC}/gnome-keyring-1.pc.in
+PKGCONFIG_OVERRIDE= ${WRKSRC}/library/gnome-keyring-1.pc.in
+
+GCONF_SCHEMAS+= gnome-keyring.schemas
CFLAGS.HPUX+= -DMAP_ANON=MAP_ANONYMOUS
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../security/libgcrypt/buildlink3.mk"
+.include "../../security/libtasn1/buildlink3.mk"
.include "../../sysutils/dbus/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/pam.buildlink3.mk"
diff -r 512b84723559 -r c92c5e428e2e security/gnome-keyring/PLIST
--- a/security/gnome-keyring/PLIST Thu Apr 10 16:46:53 2008 +0000
+++ b/security/gnome-keyring/PLIST Thu Apr 10 16:53:44 2008 +0000
@@ -1,15 +1,19 @@
-@comment $NetBSD: PLIST,v 1.12 2007/10/31 20:20:30 drochner Exp $
+@comment $NetBSD: PLIST,v 1.13 2008/04/10 16:53:44 drochner Exp $
bin/gnome-keyring-daemon
include/gnome-keyring-1/gnome-keyring-memory.h
include/gnome-keyring-1/gnome-keyring-result.h
include/gnome-keyring-1/gnome-keyring.h
+lib/gnome-keyring/gnome-keyring-pkcs11.la
lib/libgnome-keyring.la
lib/pkgconfig/gnome-keyring-1.pc
lib/security/pam_gnome_keyring.la
libexec/gnome-keyring-ask
+share/dbus-1/services/org.gnome.keyring.service
+share/gconf/schemas/gnome-keyring.schemas
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-generic-callbacks.html
share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-item-info.html
@@ -19,6 +23,7 @@
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
@@ -54,6 +59,7 @@
share/locale/fr/LC_MESSAGES/gnome-keyring.mo
share/locale/gl/LC_MESSAGES/gnome-keyring.mo
share/locale/gu/LC_MESSAGES/gnome-keyring.mo
+share/locale/he/LC_MESSAGES/gnome-keyring.mo
share/locale/hi/LC_MESSAGES/gnome-keyring.mo
share/locale/hr/LC_MESSAGES/gnome-keyring.mo
share/locale/hu/LC_MESSAGES/gnome-keyring.mo
@@ -74,6 +80,7 @@
share/locale/nb/LC_MESSAGES/gnome-keyring.mo
share/locale/ne/LC_MESSAGES/gnome-keyring.mo
share/locale/nl/LC_MESSAGES/gnome-keyring.mo
+share/locale/nn/LC_MESSAGES/gnome-keyring.mo
share/locale/oc/LC_MESSAGES/gnome-keyring.mo
share/locale/or/LC_MESSAGES/gnome-keyring.mo
share/locale/pa/LC_MESSAGES/gnome-keyring.mo
@@ -101,4 +108,7 @@
share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo
share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
@dirrm share/gtk-doc/html/gnome-keyring
+@comment in GConf: @dirrm share/gconf/schemas
+@comment in dbus: @dirrm share/dbus-1/services
+@dirrm lib/gnome-keyring
@dirrm include/gnome-keyring-1
diff -r 512b84723559 -r c92c5e428e2e security/gnome-keyring/distinfo
--- a/security/gnome-keyring/distinfo Thu Apr 10 16:46:53 2008 +0000
+++ b/security/gnome-keyring/distinfo Thu Apr 10 16:53:44 2008 +0000
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.23 2008/01/11 14:02:42 drochner Exp $
+$NetBSD: distinfo,v 1.24 2008/04/10 16:53:44 drochner Exp $
-SHA1 (gnome-keyring-2.20.3.tar.bz2) = e6518a9521bc240ac4fb55185747c80ac41739e1
-RMD160 (gnome-keyring-2.20.3.tar.bz2) = 8e85220492cd87b15bb3f1fadbb6673cea3a684c
-Size (gnome-keyring-2.20.3.tar.bz2) = 541431 bytes
-SHA1 (patch-aa) = ba8a85a0f1c66c72a6084aa0677074fa74017039
+SHA1 (gnome-keyring-2.22.1.tar.bz2) = 59956194b110a4e4576db0791e2d2371b39ff49c
+RMD160 (gnome-keyring-2.22.1.tar.bz2) = 83dddadb1c133931151de302e8f33ff1d99ed496
+Size (gnome-keyring-2.22.1.tar.bz2) = 960392 bytes
+SHA1 (patch-aa) = fff624c298f901bb1a81ac7ad4d781cae5a4cff2
SHA1 (patch-ab) = c6fc864a34ae6ccb0fdf891082146f451203494c
+SHA1 (patch-ac) = 550b4ebfdf9ae7653d0174e6857e32c8453f2ca7
+SHA1 (patch-ad) = b0f1633ed5d3e24faf89c96ac730845d1edae8d6
diff -r 512b84723559 -r c92c5e428e2e security/gnome-keyring/patches/patch-aa
--- a/security/gnome-keyring/patches/patch-aa Thu Apr 10 16:46:53 2008 +0000
+++ b/security/gnome-keyring/patches/patch-aa Thu Apr 10 16:53:44 2008 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.6 2007/10/31 20:20:30 drochner Exp $
+$NetBSD: patch-aa,v 1.7 2008/04/10 16:53:44 drochner Exp $
---- configure.orig 2007-09-27 20:36:29.000000000 +0200
+--- configure.orig 2008-03-09 15:25:49.000000000 +0100
+++ configure
-@@ -23462,7 +23462,7 @@ else
- echo "not building tests and unit tests"
+@@ -23793,7 +23793,7 @@ else
+ tests_status="no"
fi
- if test "$enable_tests" == "yes"; then
@@ -11,3 +11,12 @@
WITH_TESTS_TRUE=
WITH_TESTS_FALSE='#'
else
+@@ -25228,7 +25228,7 @@ fi
+
+ dbus_status=$DBUS_VERSION
+ fi
+- if test "$enable_dbus" == "yes"; then
++ if test "$enable_dbus" = "yes"; then
+ WITH_DBUS_TRUE=
+ WITH_DBUS_FALSE='#'
+ else
diff -r 512b84723559 -r c92c5e428e2e security/gnome-keyring/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/gnome-keyring/patches/patch-ac Thu Apr 10 16:53:44 2008 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2008/04/10 16:53:44 drochner Exp $
+
+--- library/gnome-keyring.c.orig 2008-04-02 18:29:58.000000000 +0200
++++ library/gnome-keyring.c
+@@ -1779,6 +1779,7 @@ gnome_keyring_daemon_set_display_sync (c
+ * Return value: %GNOME_KEYRING_RESULT_OK if the operation was succcessful or
+ * an error result otherwise.
+ **/
++extern char **environ;
+ GnomeKeyringResult
+ gnome_keyring_daemon_prepare_environment_sync (void)
+ {
diff -r 512b84723559 -r c92c5e428e2e security/gnome-keyring/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/gnome-keyring/patches/patch-ad Thu Apr 10 16:53:44 2008 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-ad,v 1.1 2008/04/10 16:53:44 drochner Exp $
+
+--- ./common/gkr-unix-credentials.c.orig 2008-02-13 22:07:15.000000000 +0100
++++ ./common/gkr-unix-credentials.c
+@@ -36,6 +36,10 @@
+ #include <ucred.h>
+ #endif
+
++#ifdef __NetBSD__
++#include <sys/un.h> /* for LOCAL_CREDS */
++#endif
++
+ int
+ gkr_unix_credentials_read (int sock, pid_t *pid, uid_t *uid)
+ {
+@@ -125,7 +129,6 @@ gkr_unix_credentials_read (int sock, pid
+ cred = (struct sockcred *) CMSG_DATA (&cmsg.hdr);
+ *pid = 0;
+ *uid = cred->sc_euid;
+- set_local_creds(fd, FALSE);
+ #elif defined(HAVE_GETPEERUCRED)
+ ucred_t *uc = NULL;
+
Home |
Main Index |
Thread Index |
Old Index