[arch-commits] Commit in seahorse-nautilus/trunk (1.patch PKGBUILD)

[Jan Steffens]

    Date: Sunday, February 9, 2020 @ 19:07:09
  Author: heftig
Revision: 375144

3.11.92+66+g02c81f1-1

Added:
  seahorse-nautilus/trunk/1.patch
Modified:
  seahorse-nautilus/trunk/PKGBUILD

----------+
 1.patch  |   64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD |   14 +++++++++----
 2 files changed, 74 insertions(+), 4 deletions(-)

Added: 1.patch
===================================================================
--- 1.patch	                        (rev 0)
+++ 1.patch	2020-02-09 19:07:09 UTC (rev 375144)
@@ -0,0 +1,64 @@
+From aaa6af5f6249fc1e25c6913bb4dfe2561fda4a40 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Thu, 13 Dec 2018 22:08:12 +0100
+Subject: [PATCH] Fix UI files usage
+
+This was incomplete in the meson port.
+---
+ meson.build            | 2 --
+ tool/meson.build       | 2 +-
+ tool/seahorse-widget.c | 4 ++--
+ 3 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 2fe05ee..7af175a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -19,7 +19,6 @@ po_dir = join_paths(meson.source_root(), 'po')
+ datadir = join_paths(seahorse_nautilus_prefix, get_option('datadir'))
+ bindir = join_paths(seahorse_nautilus_prefix, get_option('bindir'))
+ localedir = join_paths(seahorse_nautilus_prefix, get_option('localedir'))
+-uidir = join_paths(datadir, 'seahorse-nautilus', 'ui')
+ config_h_dir = include_directories('.')
+ 
+ # Dependencies
+@@ -75,7 +74,6 @@ conf.set_quoted('G_LOG_DOMAIN', meson.project_name())
+ conf.set_quoted('DATA_DIR', datadir)
+ conf.set_quoted('LOCALEDIR', localedir)
+ conf.set_quoted('GNOMELOCALEDIR', localedir)
+-conf.set_quoted('SEAHORSE_UIDIR', uidir)
+ conf.set('HAVE_LIBNOTIFY', libnotify_enabled)
+ config_file = configure_file(
+   output: 'config.h',
+diff --git a/tool/meson.build b/tool/meson.build
+index b2e4194..7791305 100644
+--- a/tool/meson.build
++++ b/tool/meson.build
+@@ -43,7 +43,7 @@ seahorse_tool_cflags = [
+ ]
+ 
+ seahorse_tool = executable('seahorse-tool',
+-  seahorse_tool_sources,
++  seahorse_tool_sources, resources,
+   dependencies: seahorse_tool_dependencies,
+   c_args: seahorse_tool_cflags,
+   include_directories: config_h_dir,
+diff --git a/tool/seahorse-widget.c b/tool/seahorse-widget.c
+index 57e0117..1955823 100644
+--- a/tool/seahorse-widget.c
++++ b/tool/seahorse-widget.c
+@@ -204,9 +204,9 @@ object_set_property (GObject *object, guint prop_id, const GValue *value, GParam
+         g_return_if_fail (swidget->name == NULL);
+         swidget->name = g_value_dup_string (value);
+         path = g_strdup_printf ("%sseahorse-%s.ui",
+-                                SEAHORSE_UIDIR, swidget->name);
++                                "/org/gnome/Seahorse/", swidget->name);
+         swidget->gtkbuilder = gtk_builder_new ();
+-        gtk_builder_add_from_file (swidget->gtkbuilder, path, &error);
++        gtk_builder_add_from_resource (swidget->gtkbuilder, path, &error);
+         if (error != NULL) {
+             g_warning ("couldn't load ui file: %s", error->message);
+             g_error_free (error);
+-- 
+2.24.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-09 19:06:05 UTC (rev 375143)
+++ PKGBUILD	2020-02-09 19:07:09 UTC (rev 375144)
@@ -2,7 +2,7 @@
 # Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=seahorse-nautilus
-pkgver=3.11.92+57+g390364d
+pkgver=3.11.92+66+g02c81f1
 pkgrel=1
 pkgdesc="PGP encryption and signing for nautilus"
 arch=(x86_64)
@@ -10,9 +10,11 @@
 license=(GPL)
 depends=(libcryptui nautilus libgnome-keyring)
 makedepends=(meson git)
-_commit=390364db3bb09d7f6e07e3de90c872112584442a  # master
-source=("git+https://gitlab.gnome.org/GNOME/seahorse-nautilus.git#commit=$_commit")
-sha256sums=('SKIP')
+_commit=02c81f1dda64571f837fc2cc9180fe2a86d8d8b6  # master
+source=("git+https://gitlab.gnome.org/GNOME/seahorse-nautilus.git#commit=$_commit"
+        1.patch)
+sha256sums=('SKIP'
+            '7e27ab3bc132bc3c3039da1490c1a972297469b97caeb7236a01779933251a47')
 
 pkgver() {
   cd $pkgname
@@ -21,6 +23,10 @@
 
 prepare() {
   cd $pkgname
+
+  # https://bugs.archlinux.org/task/61061
+  # https://gitlab.gnome.org/GNOME/seahorse-nautilus/merge_requests/1
+  git apply -3 ../1.patch
 }
 
 build() {