diff options
Diffstat (limited to 'security/gcr')
| -rw-r--r-- | security/gcr/Makefile | 4 | ||||
| -rw-r--r-- | security/gcr/distinfo | 4 | ||||
| -rw-r--r-- | security/gcr/files/patch-gcr_gcr-crypto-types.xml | 119 | ||||
| -rw-r--r-- | security/gcr/files/patch-introspection | 145 | ||||
| -rw-r--r-- | security/gcr/pkg-plist | 1 |
5 files changed, 150 insertions, 123 deletions
diff --git a/security/gcr/Makefile b/security/gcr/Makefile index 50f4632ef..2d92f077c 100644 --- a/security/gcr/Makefile +++ b/security/gcr/Makefile @@ -3,7 +3,7 @@ # $MCom: ports/trunk/security/gcr/Makefile 17271 2013-04-01 15:16:27Z kwm $ PORTNAME= gcr -PORTVERSION= 3.4.1 +PORTVERSION= 3.6.2 CATEGORIES= security gnome MASTER_SITES= GNOME @@ -17,7 +17,7 @@ LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus \ p11-kit:${PORTSDIR}/security/p11-kit \ gcrypt:${PORTSDIR}/security/libgcrypt -CONFLICTS= gnome-keyring-3.[0-2].[0-9]* gnome-keyring-2.[0-9]* +CONFLICTS= gnome-keyring-2.[0-9]* USE_XZ= yes USE_GNOME= gtk30 intlhack diff --git a/security/gcr/distinfo b/security/gcr/distinfo index 47f140d77..2f6a07578 100644 --- a/security/gcr/distinfo +++ b/security/gcr/distinfo @@ -1,2 +1,2 @@ -SHA256 (gcr-3.4.1.tar.xz) = a0812b6e9623465b0053f4b1b09f3b9316317b2c6ed69a73bc2c5b3b6b849609 -SIZE (gcr-3.4.1.tar.xz) = 1335160 +SHA256 (gcr-3.6.2.tar.xz) = f709db2435e3635b68d8aa212863e0a8e81b1cc33442852a5183762876c7be9b +SIZE (gcr-3.6.2.tar.xz) = 1365124 diff --git a/security/gcr/files/patch-gcr_gcr-crypto-types.xml b/security/gcr/files/patch-gcr_gcr-crypto-types.xml deleted file mode 100644 index 70a64b30d..000000000 --- a/security/gcr/files/patch-gcr_gcr-crypto-types.xml +++ /dev/null @@ -1,119 +0,0 @@ ---- gcr/gcr-crypto-types.xml.orig 2011-11-24 18:50:38.000000000 +0100 -+++ gcr/gcr-crypto-types.xml 2012-05-26 13:48:09.000000000 +0200 -@@ -9,20 +9,6 @@ - <glob weight="50" pattern="*.pem"/> - </mime-type> - -- <!-- Defined in: http://www.ietf.org/rfc/rfc2585.txt --> -- <mime-type type="application/pkix-cert"> -- <comment>X.509 Certificate</comment> -- <glob weight="75" pattern="*.cer"/> -- -- <!-- Non standard: Common practice --> -- <glob weight="55" pattern="*.crt"/> -- <glob weight="55" pattern="*.cert"/> -- -- <!-- Non standard: Common practice --> -- <alias type="application/x-x509-ca-cert"/> -- <alias type="application/x-x509-user-cert"/> -- </mime-type> -- - <!-- Non standard: OpenSSL PEM format --> - <mime-type type="application/pkix-cert+pem"> - <comment>X.509 Certificate in PEM format</comment> -@@ -32,14 +18,6 @@ - </magic> - </mime-type> - -- <!-- Defined in: http://www.ietf.org/rfc/rfc2585.txt --> -- <mime-type type="application/pkix-crl"> -- <comment>Certificate Revocation List</comment> -- <acronym>CRL</acronym> -- <expanded-acronym>Certificate Revocation List</expanded-acronym> -- <glob weight="75" pattern="*.crl"/> -- </mime-type> -- - <!-- Non standard: OpenSSL PEM format --> - <mime-type type="application/pkix-crl+pem"> - <comment>Certificate Revocation List in PEM format</comment> -@@ -49,19 +27,6 @@ - </magic> - </mime-type> - -- <!-- Non standard: Common practice --> -- <mime-type type="application/x-pkcs12"> -- <comment>PKCS#12 Personal Key and Certificates</comment> -- <acronym>PKCS#12</acronym> -- <glob weight="75" pattern="*.p12"/> -- -- <!-- Non standard: Microsoft practice --> -- <glob weight="55" pattern="*.pfx"/> -- -- <!-- Non standard: Rare practice, unclear this actually got into a spec --> -- <alias type="application/pkcs12"/> -- </mime-type> -- - <!-- Non standard: OpenSSL PEM format --> - <mime-type type="application/pkcs12+pem"> - <comment>PKCS#12 Personal Key and Certificates in PEM format</comment> -@@ -71,16 +36,6 @@ - </magic> - </mime-type> - -- <!-- Defined in: http://www.ietf.org/rfc/rfc5958.txt --> -- <mime-type type="application/pkcs8"> -- <comment>PKCS#8 Personal Key</comment> -- <acronym>PKCS#8</acronym> -- <glob weight="75" pattern="*.p8"/> -- -- <!-- Non standard: Gnome keyring practice --> -- <glob weight="55" pattern="*.pkcs8"/> -- </mime-type> -- - <!-- Non standard: OpenSSL PEM format --> - <mime-type type="application/pkcs8+pem"> - <comment>PKCS#8 Personal Key in PEM format</comment> -@@ -91,21 +46,6 @@ - </magic> - </mime-type> - -- <!-- Defined in: http://www.ietf.org/rfc/rfc2311.txt --> -- <mime-type type="application/pkcs7-mime"> -- <comment>PKCS#7 Message and Certificates</comment> -- <acronym>PKCS#7</acronym> -- <glob pattern="*.p7c"/> -- <glob pattern="*.p7m"/> -- -- <!-- Not standard: Microsoft practice --> -- <glob pattern="*.spc"/> -- <glob pattern="*.p7b"/> -- -- <!-- Non standard: Microsoft practice --> -- <alias type="application/x-pkcs7-certificates"/> -- </mime-type> -- - <!-- Non standard: OpenSSL PEM format --> - <mime-type type="application/pkcs7-mime+pem"> - <comment>PKCS#7 Message and Certificates in PEM format</comment> -@@ -115,21 +55,6 @@ - </magic> - </mime-type> - -- <!-- Defined in http://www.ietf.org/rfc/rfc2311.txt --> -- <mime-type type="application/pkcs7-signature"> -- <comment>PKCS#7 Signature</comment> -- <acronym>PKCS#7</acronym> -- <glob pattern="*.p7s"/> -- </mime-type> -- -- <!-- Defined in http://www.ietf.org/rfc/rfc2311.txt --> -- <mime-type type="application/pkcs10"> -- <comment>PKCS#10 Certificate Request</comment> -- <acronym>PKCS#10</acronym> -- <glob pattern="*.p10"/> -- <glob pattern="*.csr"/> -- </mime-type> -- - <!-- Non standard: OpenSSL PEM format --> - <mime-type type="application/pkcs10+pem"> - <comment>PKCS#10 Certificate Request in PEM format</comment> diff --git a/security/gcr/files/patch-introspection b/security/gcr/files/patch-introspection new file mode 100644 index 000000000..a35185476 --- /dev/null +++ b/security/gcr/files/patch-introspection @@ -0,0 +1,145 @@ +From 458b52862334a5b440ebda33f6ab8f5914f1ea59 Mon Sep 17 00:00:00 2001 +From: Stef Walter <stefw@gnome.org> +Date: Mon, 11 Feb 2013 17:43:54 +0100 +Subject: [PATCH] Use GObject.Object instead of GLib.Object in introspection + annotations + +A gobject-introspection change broke the former. + +https://bugzilla.gnome.org/show_bug.cgi?id=693440 +--- + gck/gck-misc.c | 6 +++--- + gcr/gcr-collection.c | 6 +++--- + ui/gcr-collection-model.c | 4 ++-- + ui/gcr-list-selector.c | 4 ++-- + ui/gcr-tree-selector.c | 4 ++-- + 5 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/gck/gck-misc.c b/gck/gck-misc.c +index 42780ff..9471404 100644 +--- gck/gck-misc.c ++++ gck/gck-misc.c +@@ -261,7 +261,7 @@ gck_list_get_boxed_type (void) + + /** + * gck_list_unref_free: (skip) +- * @reflist: (element-type GLib.Object): list of Gobject reference counted pointers ++ * @reflist: (element-type GObject.Object): list of Gobject reference counted pointers + * + * Free a list of GObject based pointers. All objects in the list + * will be unreffed and then the list itself will be freed. +@@ -279,13 +279,13 @@ gck_list_unref_free (GList *reflist) + + /** + * gck_list_ref_copy: (skip) +- * @reflist: (element-type GLib.Object): list of GObject reference counted ++ * @reflist: (element-type GObject.Object): list of GObject reference counted + * objects + * + * Copy a list of GObject based pointers. All objects + * in the list will be reffed and the list will be copied. + * +- * Return value: (transfer full) (element-type GLib.Object): the copied and ++ * Return value: (transfer full) (element-type GObject.Object): the copied and + * reffed list, when done, free it with gck_list_unref_free () + **/ + GList * +diff --git a/gcr/gcr-collection.c b/gcr/gcr-collection.c +index cb0c29b..4975c3c 100644 +--- gcr/gcr-collection.c ++++ gcr/gcr-collection.c +@@ -65,7 +65,7 @@ gcr_collection_default_init (GcrCollectionIface *iface) + /** + * GcrCollection::added: + * @self: the collection +- * @object: (type GLib.Object): object that was added ++ * @object: (type GObject.Object): object that was added + * + * This signal is emitted when an object is added to the collection. + */ +@@ -77,7 +77,7 @@ gcr_collection_default_init (GcrCollectionIface *iface) + /** + * GcrCollection::removed: + * @self: the collection +- * @object: (type GLib.Object): object that was removed ++ * @object: (type GObject.Object): object that was removed + * + * This signal is emitted when an object is removed from the collection. + */ +@@ -117,7 +117,7 @@ gcr_collection_get_length (GcrCollection *self) + * + * Get a list of the objects in this collection. + * +- * Returns: (transfer container) (element-type GLib.Object): a list of the objects ++ * Returns: (transfer container) (element-type GObject.Object): a list of the objects + * in this collection, which should be freed with g_list_free() + */ + GList* +diff --git a/ui/gcr-collection-model.c b/ui/gcr-collection-model.c +index 58cf64f..d9bd688 100644 +--- gcr/gcr-collection-model.c ++++ gcr/gcr-collection-model.c +@@ -1587,7 +1587,7 @@ gcr_collection_model_is_selected (GcrCollectionModel *self, GtkTreeIter *iter) + * + * Get a list of checked/selected objects. + * +- * Returns: (transfer container) (element-type GLib.Object): a list of selected ++ * Returns: (transfer container) (element-type GObject.Object): a list of selected + * objects, which should be freed with g_list_free() + */ + GList * +@@ -1611,7 +1611,7 @@ gcr_collection_model_get_selected_objects (GcrCollectionModel *self) + /** + * gcr_collection_model_set_selected_objects: + * @self: the collection model +- * @selected: (element-type GLib.Object): a list of objects to select ++ * @selected: (element-type GObject.Object): a list of objects to select + * + * Set the checked/selected objects. + */ +diff --git a/ui/gcr-list-selector.c b/ui/gcr-list-selector.c +index 64a3e62..326e91b 100644 +--- ui/gcr-list-selector.c ++++ gcr/gcr-list-selector.c +@@ -397,7 +397,7 @@ gcr_list_selector_get_collection (GcrListSelector *self) + * + * Get a list of selected objects. + * +- * Returns: (transfer container) (element-type GLib.Object): the list of ++ * Returns: (transfer container) (element-type GObject.Object): the list of + * selected objects, to be released with g_list_free() + */ + GList* +@@ -410,7 +410,7 @@ gcr_list_selector_get_selected (GcrListSelector *self) + /** + * gcr_list_selector_set_selected: + * @self: The selector +- * @selected: (element-type GLib.Object): the list of objects to select ++ * @selected: (element-type GObject.Object): the list of objects to select + * + * Select certain objects in the selector. + */ +diff --git a/ui/gcr-tree-selector.c b/ui/gcr-tree-selector.c +index 6766b5e..b5324bb 100644 +--- ui/gcr-tree-selector.c ++++ gcr/gcr-tree-selector.c +@@ -338,7 +338,7 @@ gcr_tree_selector_get_columns (GcrTreeSelector *self) + * + * Get a list of selected objects. + * +- * Returns: (transfer container) (element-type GLib.Object): the list of selected ++ * Returns: (transfer container) (element-type GObject.Object): the list of selected + * objects, to be released with g_list_free() + */ + GList* +@@ -351,7 +351,7 @@ gcr_tree_selector_get_selected (GcrTreeSelector *self) + /** + * gcr_tree_selector_set_selected: + * @self: The selector +- * @selected: (element-type GLib.Object): The list of objects to select. ++ * @selected: (element-type GObject.Object): the list of objects to select + * + * Select certain objects in the selector. + */ +-- +1.8.1 diff --git a/security/gcr/pkg-plist b/security/gcr/pkg-plist index f34627a5d..eb0b32030 100644 --- a/security/gcr/pkg-plist +++ b/security/gcr/pkg-plist @@ -139,6 +139,7 @@ share/gtk-doc/html/gcr-3/gcr-3.devhelp2 share/gtk-doc/html/gcr-3/gcr-GcrCertificateRequest.html share/gtk-doc/html/gcr-3/gcr-GcrColumn.html share/gtk-doc/html/gcr-3/gcr-GcrComparable.html +share/gtk-doc/html/gcr-3/gcr-GcrImportInteraction.html share/gtk-doc/html/gcr-3/gcr-Key-Fingerprints.html share/gtk-doc/html/gcr-3/gcr-Library-Settings.html share/gtk-doc/html/gcr-3/gcr-Non-pageable-Memory.html |