Date: Monday, January 19, 2015 @ 10:53:28 Author: jgc Revision: 229575
upgpkg: seahorse 3.14.0-2 Added: seahorse/trunk/0001-Don-t-hide-GtkBuilder-errors.patch seahorse/trunk/0002-ssh-generation-Fix-invalid-ui-file.patch seahorse/trunk/0003-Remove-more-invalid-properties.patch seahorse/trunk/gpg-2.1.patch Modified: seahorse/trunk/PKGBUILD -----------------------------------------------+ 0001-Don-t-hide-GtkBuilder-errors.patch | 42 ++++++++++++++++++++++++ 0002-ssh-generation-Fix-invalid-ui-file.patch | 28 ++++++++++++++++ 0003-Remove-more-invalid-properties.patch | 26 ++++++++++++++ PKGBUILD | 22 ++++++++++++ gpg-2.1.patch | 11 ++++++ 5 files changed, 128 insertions(+), 1 deletion(-) Added: 0001-Don-t-hide-GtkBuilder-errors.patch =================================================================== --- 0001-Don-t-hide-GtkBuilder-errors.patch (rev 0) +++ 0001-Don-t-hide-GtkBuilder-errors.patch 2015-01-19 09:53:28 UTC (rev 229575) @@ -0,0 +1,42 @@ +From d51b3db2211e806891384798c0c028502bb2b50b Mon Sep 17 00:00:00 2001 +From: Matthias Clasen <[email protected]> +Date: Fri, 14 Nov 2014 04:37:10 -0500 +Subject: [PATCH 1/4] Don't hide GtkBuilder errors + +This makes it unnecessarily hard to track down invalid +ui files. + +https://bugzilla.gnome.org/show_bug.cgi?id=740138 +--- + libseahorse/seahorse-widget.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/libseahorse/seahorse-widget.c b/libseahorse/seahorse-widget.c +index 963dfd2..49284e4 100644 +--- a/libseahorse/seahorse-widget.c ++++ b/libseahorse/seahorse-widget.c +@@ -259,6 +259,7 @@ object_set_property (GObject *object, guint prop_id, const GValue *value, GParam + SeahorseWidget *swidget; + GtkWidget *w; + char *path; ++ GError *error = NULL; + + swidget = SEAHORSE_WIDGET (object); + +@@ -270,7 +271,12 @@ object_set_property (GObject *object, guint prop_id, const GValue *value, GParam + path = g_strdup_printf ("%sseahorse-%s.xml", + SEAHORSE_UIDIR, swidget->name); + swidget->gtkbuilder = gtk_builder_new (); +- gtk_builder_add_from_file (swidget->gtkbuilder, path, NULL); ++ gtk_builder_add_from_file (swidget->gtkbuilder, path, &error); ++ if (error) ++ { ++ g_warning ("Error parsing %s: %s\n", path, error->message); ++ g_error_free (error); ++ } + g_free (path); + g_return_if_fail (swidget->gtkbuilder != NULL); + +-- +2.1.0 + Added: 0002-ssh-generation-Fix-invalid-ui-file.patch =================================================================== --- 0002-ssh-generation-Fix-invalid-ui-file.patch (rev 0) +++ 0002-ssh-generation-Fix-invalid-ui-file.patch 2015-01-19 09:53:28 UTC (rev 229575) @@ -0,0 +1,28 @@ +From 20536a1282bb506bb4a3f11a83ddb6d46669e552 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen <[email protected]> +Date: Fri, 14 Nov 2014 04:38:00 -0500 +Subject: [PATCH 2/4] ssh generation: Fix invalid ui file + +GtkGrid does not have :n-rows or :n-columns properties. + +https://bugzilla.gnome.org/show_bug.cgi?id=740138 +--- + ssh/seahorse-ssh-generate.xml | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/ssh/seahorse-ssh-generate.xml b/ssh/seahorse-ssh-generate.xml +index 03defd9..9cb9e04 100644 +--- a/ssh/seahorse-ssh-generate.xml ++++ b/ssh/seahorse-ssh-generate.xml +@@ -196,8 +196,6 @@ + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> +- <property name="n_rows">2</property> +- <property name="n_columns">2</property> + <child> + <object class="GtkLabel" id="label46"> + <property name="visible">True</property> +-- +2.1.0 + Added: 0003-Remove-more-invalid-properties.patch =================================================================== --- 0003-Remove-more-invalid-properties.patch (rev 0) +++ 0003-Remove-more-invalid-properties.patch 2015-01-19 09:53:28 UTC (rev 229575) @@ -0,0 +1,26 @@ +From e9917a0a81fd58e1555c71a29c9f5fea80e327b2 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen <[email protected]> +Date: Sat, 15 Nov 2014 12:05:14 -0500 +Subject: [PATCH 4/4] Remove more invalid properties + +This was overlooked in the previous commit. +--- + ssh/seahorse-ssh-generate.xml | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/ssh/seahorse-ssh-generate.xml b/ssh/seahorse-ssh-generate.xml +index 9cb9e04..d918617 100644 +--- a/ssh/seahorse-ssh-generate.xml ++++ b/ssh/seahorse-ssh-generate.xml +@@ -279,8 +279,6 @@ + <property name="margin_left">20</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> +- <property name="n_rows">2</property> +- <property name="n_columns">2</property> + <child> + <object class="GtkLabel" id="label49"> + <property name="visible">True</property> +-- +2.1.0 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-01-19 09:49:56 UTC (rev 229574) +++ PKGBUILD 2015-01-19 09:53:28 UTC (rev 229575) @@ -5,7 +5,7 @@ pkgname=seahorse pkgver=3.14.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME application for managing PGP keys." arch=(i686 x86_64) license=(GPL) @@ -18,10 +18,30 @@ groups=(gnome-extra) install=seahorse.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz + 0001-Don-t-hide-GtkBuilder-errors.patch + 0002-ssh-generation-Fix-invalid-ui-file.patch + 0003-Remove-more-invalid-properties.patch + gpg-2.1.patch seahorse-ssh-askpass.sh) sha256sums=('2ea22830f5af1a11fadbdd8da6b34513410f2c371d9ec75fbf9b9b2d9177fc8a' + '302ed86a8848d5e1c5931173696301267ab7a14f5521a9b4895337b507f5baf8' + 'd19b38972612823dd203aefa51782c21f0b3c8e905ab1cb71fdf15950f11eecc' + '2217f60541e37ba49072fe17f6354fd6ba1bfa0d2958a6c7b2e7fd472063ea69' + '491cacc029e6eac1c13b7808806cc45b49413570e73e1fa7668c28efe10427a0' '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c') +prepare() { + cd "$pkgname-$pkgver" + patch -Np1 -i ../0001-Don-t-hide-GtkBuilder-errors.patch + patch -Np1 -i ../0002-ssh-generation-Fix-invalid-ui-file.patch + patch -Np1 -i ../0003-Remove-more-invalid-properties.patch + + # Quick fix for now + patch -Np1 -i ../gpg-2.1.patch + + autoreconf -fi +} + build() { cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ Added: gpg-2.1.patch =================================================================== --- gpg-2.1.patch (rev 0) +++ gpg-2.1.patch 2015-01-19 09:53:28 UTC (rev 229575) @@ -0,0 +1,11 @@ +--- a/configure.ac 2015-01-19 09:47:35.260129636 +0000 ++++ b/configure.ac 2015-01-19 09:47:41.363436425 +0000 +@@ -9,7 +9,7 @@ + GTK_REQ=3.4.0 + GTK_MAX=GTK_VERSION_3_4 + +-GNUPG_ACCEPTED="1.2 1.4 2.0" ++GNUPG_ACCEPTED="1.2 1.4 2.0 2.1" + GPGME_REQUIRED=1.0.0 + LIBSECRET_REQUIRED=0.16 + AVAHI_GLIB_REQUIRED=0.6
