From 18e780d77e5ea746a0122d9016b70014dd567b4d Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Mon, 18 Oct 2010 11:26:13 +0200 Subject: [PATCH] - Update to 2.91.1 --- .gitignore | 2 + seahorse-2.91.1-gtk3.patch | 21 +++++++ seahorse-2.91.1-new-gcr-patch.patch | 96 +++++++++++++++++++++++++++++ seahorse.spec | 25 ++++++-- sources | 2 +- 5 files changed, 139 insertions(+), 7 deletions(-) create mode 100644 seahorse-2.91.1-gtk3.patch create mode 100644 seahorse-2.91.1-new-gcr-patch.patch diff --git a/.gitignore b/.gitignore index 6e9ea8d..1c8f613 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ seahorse-2.30.0.tar.bz2 /seahorse-2.31.91.tar.bz2 +/seahorse-2.91.0.tar.bz2 +/seahorse-2.91.1.tar.bz2 diff --git a/seahorse-2.91.1-gtk3.patch b/seahorse-2.91.1-gtk3.patch new file mode 100644 index 0000000..c5a8fce --- /dev/null +++ b/seahorse-2.91.1-gtk3.patch @@ -0,0 +1,21 @@ +diff -up seahorse-2.91.1/pkcs11/seahorse-pkcs11-certificate-props.c.bak seahorse-2.91.1/pkcs11/seahorse-pkcs11-certificate-props.c +--- seahorse-2.91.1/pkcs11/seahorse-pkcs11-certificate-props.c.bak 2010-10-18 11:12:03.000000000 +0200 ++++ seahorse-2.91.1/pkcs11/seahorse-pkcs11-certificate-props.c 2010-10-18 11:14:36.000000000 +0200 +@@ -57,7 +57,7 @@ seahorse_pkcs11_certificate_props_init ( + GtkWidget *button; + + pv->tabs = GTK_NOTEBOOK (gtk_notebook_new ()); +- gtk_container_add (GTK_CONTAINER (GTK_DIALOG (self)->vbox), GTK_WIDGET (pv->tabs)); ++ gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (self))), GTK_WIDGET (pv->tabs)); + gtk_container_set_border_width (GTK_CONTAINER (self), 5); + gtk_container_set_border_width (GTK_CONTAINER (pv->tabs), 5); + gtk_widget_show (GTK_WIDGET (pv->tabs)); +@@ -69,8 +69,6 @@ seahorse_pkcs11_certificate_props_init ( + button = gtk_button_new_from_stock (GTK_STOCK_CLOSE); + gtk_dialog_add_action_widget (GTK_DIALOG (self), button, GTK_RESPONSE_CLOSE); + gtk_widget_show (button); +- +- gtk_dialog_set_has_separator (GTK_DIALOG (self), FALSE); + } + + static void diff --git a/seahorse-2.91.1-new-gcr-patch.patch b/seahorse-2.91.1-new-gcr-patch.patch new file mode 100644 index 0000000..3d034f5 --- /dev/null +++ b/seahorse-2.91.1-new-gcr-patch.patch @@ -0,0 +1,96 @@ +From 2610cddc7cae34a3db0716f0bf24ddceea25d533 Mon Sep 17 00:00:00 2001 +From: Martin Paljak +Date: Wed, 13 Oct 2010 09:59:00 +0000 +Subject: build with latest gcr which only has GcrCertificateWidget + +--- +diff --git a/pkcs11/seahorse-pkcs11-certificate-props.c b/pkcs11/seahorse-pkcs11-certificate-props.c +index c6676ce..fb44e95 100644 +--- a/pkcs11/seahorse-pkcs11-certificate-props.c ++++ b/pkcs11/seahorse-pkcs11-certificate-props.c +@@ -24,8 +24,7 @@ + #include "seahorse-pkcs11-certificate.h" + #include "seahorse-pkcs11-certificate-props.h" + +-#include +-#include ++#include + + enum { + PROP_0, +@@ -34,8 +33,7 @@ enum { + + struct _SeahorsePkcs11CertificatePropsPrivate { + GtkNotebook *tabs; +- GcrCertificateBasicsWidget *basics; +- GcrCertificateDetailsWidget *details; ++ GcrCertificateWidget *widget; + }; + + G_DEFINE_TYPE (SeahorsePkcs11CertificateProps, seahorse_pkcs11_certificate_props, GTK_TYPE_DIALOG); +@@ -64,13 +62,9 @@ seahorse_pkcs11_certificate_props_init (SeahorsePkcs11CertificateProps *self) + gtk_container_set_border_width (GTK_CONTAINER (pv->tabs), 5); + gtk_widget_show (GTK_WIDGET (pv->tabs)); + +- pv->basics = gcr_certificate_basics_widget_new (NULL); +- seahorse_pkcs11_certificate_props_add_view (self, _("Certificate"), GTK_WIDGET (pv->basics)); +- gtk_widget_show (GTK_WIDGET (pv->basics)); +- +- pv->details = gcr_certificate_details_widget_new (NULL); +- seahorse_pkcs11_certificate_props_add_view (self, _("Details"), GTK_WIDGET (pv->details)); +- gtk_widget_show (GTK_WIDGET (pv->details)); ++ pv->widget = gcr_certificate_widget_new (NULL); ++ seahorse_pkcs11_certificate_props_add_view (self, _("Certificate"), GTK_WIDGET (pv->widget)); ++ gtk_widget_show (GTK_WIDGET (pv->widget)); + + button = gtk_button_new_from_stock (GTK_STOCK_CLOSE); + gtk_dialog_add_action_widget (GTK_DIALOG (self), button, GTK_RESPONSE_CLOSE); +@@ -85,14 +79,9 @@ seahorse_pkcs11_certificate_props_dispose (GObject *obj) + SeahorsePkcs11CertificateProps *self = SEAHORSE_PKCS11_CERTIFICATE_PROPS (obj); + SeahorsePkcs11CertificatePropsPrivate *pv = SEAHORSE_PKCS11_CERTIFICATE_PROPS_GET_PRIVATE (self); + +- if (pv->basics) { +- seahorse_pkcs11_certificate_props_remove_view (self, GTK_WIDGET (pv->basics)); +- pv->basics = NULL; +- } +- +- if (pv->details) { +- seahorse_pkcs11_certificate_props_remove_view (self, GTK_WIDGET (pv->details)); +- pv->details = NULL; ++ if (pv->widget) { ++ seahorse_pkcs11_certificate_props_remove_view (self, GTK_WIDGET (pv->widget)); ++ pv->widget = NULL; + } + + G_OBJECT_CLASS (seahorse_pkcs11_certificate_props_parent_class)->dispose (obj); +@@ -104,8 +93,7 @@ seahorse_pkcs11_certificate_props_finalize (GObject *obj) + SeahorsePkcs11CertificateProps *self = SEAHORSE_PKCS11_CERTIFICATE_PROPS (obj); + SeahorsePkcs11CertificatePropsPrivate *pv = SEAHORSE_PKCS11_CERTIFICATE_PROPS_GET_PRIVATE (self); + +- g_assert (pv->basics == NULL); +- g_assert (pv->details == NULL); ++ g_assert (pv->widget == NULL); + + G_OBJECT_CLASS (seahorse_pkcs11_certificate_props_parent_class)->finalize (obj); + } +@@ -176,8 +164,7 @@ seahorse_pkcs11_certificate_props_set_certificate (SeahorsePkcs11CertificateProp + SeahorsePkcs11CertificatePropsPrivate *pv = SEAHORSE_PKCS11_CERTIFICATE_PROPS_GET_PRIVATE (self); + g_return_if_fail (SEAHORSE_IS_PKCS11_CERTIFICATE_PROPS (self)); + +- gcr_certificate_basics_widget_set_certificate (pv->basics, cert); +- gcr_certificate_details_widget_set_certificate (pv->details, cert); ++ gcr_certificate_widget_set_certificate (pv->widget, cert); + g_object_notify (G_OBJECT (self), "certificate"); + } + +@@ -187,7 +174,7 @@ seahorse_pkcs11_certificate_props_get_certificate (SeahorsePkcs11CertificateProp + SeahorsePkcs11CertificatePropsPrivate *pv = SEAHORSE_PKCS11_CERTIFICATE_PROPS_GET_PRIVATE (self); + g_return_val_if_fail (SEAHORSE_IS_PKCS11_CERTIFICATE_PROPS (self), NULL); + +- return gcr_certificate_basics_widget_get_certificate (pv->basics); ++ return gcr_certificate_widget_get_certificate (pv->widget); + } + + void +-- +cgit v0.8.3.1 diff --git a/seahorse.spec b/seahorse.spec index ff88c3d..0f2f7aa 100644 --- a/seahorse.spec +++ b/seahorse.spec @@ -1,5 +1,5 @@ Name: seahorse -Version: 2.32.0 +Version: 2.91.1 Release: 1%{?dist} Summary: A GNOME application for managing encryption keys Group: User Interface/Desktops @@ -8,18 +8,17 @@ Group: User Interface/Desktops License: GPLv2+ and LGPLv2+ URL: http://projects.gnome.org/seahorse/ #VCS: git:git://git.gnome.org/seahorse -Source: http://download.gnome.org/sources/seahorse/2.32/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/seahorse/2.91/%{name}-%{version}.tar.bz2 +BuildRequires: glib2-devel +BuildRequires: gtk3-devel BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: gpgme-devel >= 1.0 BuildRequires: gnupg2 -BuildRequires: libgnome-devel -BuildRequires: libgnomeui-devel BuildRequires: scrollkeeper BuildRequires: libsoup-devel BuildRequires: openldap-devel -BuildRequires: gnome-panel-devel BuildRequires: libnotify-devel BuildRequires: openssh-clients BuildRequires: gnome-doc-utils >= 0.3.2 @@ -45,6 +44,14 @@ Requires: pinentry-gui Obsoletes: gnome-keyring-manager + +# https://bugzilla.gnome.org/show_bug.cgi?id=632436 +Patch0: seahorse-2.91.1-gtk3.patch + +# from upstream +Patch1: seahorse-2.91.1-new-gcr-patch.patch + + %description Seahorse is a graphical interface for managing and using encryption keys. It also integrates with nautilus, gedit and other places for encryption @@ -64,9 +71,12 @@ library that belongs to seahorse. %prep %setup -q +%patch0 -p1 -b .gtk3 +%patch1 -p1 -b .new-gcr + %build -GNUPG=/usr/bin/gpg2 ; export GNUPG ; %configure --disable-scrollkeeper +GNUPG=/usr/bin/gpg2 ; export GNUPG ; %configure --disable-scrollkeeper --with-gtk=3.0 # drop unneeded direct library deps with --as-needed # libtool doesn't make this easy, so we do it the hard way @@ -160,6 +170,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : %{_datadir}/gir-1.0 %changelog +* Mon Oct 18 2010 Tomas Bzatek 2.91.1-1 +- Update to 2.91.1 + * Wed Sep 29 2010 Tomas Bzatek 2.32.0-1 - Update to 2.32.0 diff --git a/sources b/sources index 1770967..d4a2bc6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bffb5ba78efb7eae760e05d8473ee7ad seahorse-2.32.0.tar.bz2 +8440260d1d9948aeb5a653c4d839e1c9 seahorse-2.91.1.tar.bz2