Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (d2d0e070e9ea8ff9b364c36c8295b931f0ae1486)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (d2d0e070e9ea8ff9b364c36c8295b931f0ae1486)
  • Date: Tue, 22 Feb 2022 00:07:05 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

FUNCTIONS
| 2
crypto/seahorse/DETAILS
| 5 -
crypto/seahorse/HISTORY
| 5 +

crypto/seahorse/patches/0001-Fix-segfault-when-built-with-ldap-disabled.patch
| 31 ----------
4 files changed, 8 insertions(+), 35 deletions(-)

New commits:
commit d2d0e070e9ea8ff9b364c36c8295b931f0ae1486
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

seahorse 41.0

commit 3684e6d453d8da3d35fc1836a51b5d291b00060d
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

FUNCTIONS: Fix calling apply_patch_dir with an empty dir

diff --git a/FUNCTIONS b/FUNCTIONS
index 8351f59..3d3e22e 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -290,7 +290,7 @@ function install_www_files ()
function apply_patch_dir() {
[ -d "$SPELL_DIRECTORY/$1" ] || return 0
find "$SPELL_DIRECTORY/$1" \( -name \*.patch -o -name \*.diff \) -print0 |
- sort -zV | xargs -0 -n 1 -t patch -fp1 -i
+ sort -zV | xargs -r -0 -n 1 -t patch -fp1 -i
}

#---------------------------------------------------------------------
diff --git a/crypto/seahorse/DETAILS b/crypto/seahorse/DETAILS
index 0d53940..6295172 100755
--- a/crypto/seahorse/DETAILS
+++ b/crypto/seahorse/DETAILS
@@ -1,9 +1,8 @@
. "$GRIMOIRE/MESON_FUNCTIONS"
SPELL=seahorse
- VERSION=40.0
- PATCHLEVEL=1
+ VERSION=41.0
SOURCE=$SPELL-$VERSION.tar.xz
-
SOURCE_HASH=sha512:c389420fb1b3d54c1b9a1004f2c8b9e50118a1ffcba02aa8cfdd2223d1bc117368c9a1ad875c59abd319d95eb93ec3de2e9cedadbfc1d6a0997d613c8256c60b
+
SOURCE_HASH=sha512:cc51e27a55ed646ee376aa1b1bffe28369d80e4b8c484c9711de6bdf190694714ef208579d0399b5c199b5619491d72dede1b1f6c03b89cf3a53e8519a4d4fcf
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/${VERSION%.*}/$SOURCE

SOURCE_URL[1]=https://download-fallback.gnome.org/sources/$SPELL/${VERSION%.*}/$SOURCE
diff --git a/crypto/seahorse/HISTORY b/crypto/seahorse/HISTORY
index 4e5fd46..0f12572 100644
--- a/crypto/seahorse/HISTORY
+++ b/crypto/seahorse/HISTORY
@@ -1,3 +1,8 @@
+2022-02-22 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 41.0
+ * patches/0001-Fix-segfault-when-built-with-ldap-disabled.patch:
removed,
+ no longer needed
+
2021-05-17 Ismael Luceno <ismael AT sourcemage.org>
* patches/0001-Fix-segfault-when-built-with-ldap-disabled.patch,
PRE_BUILD: added patch to fix null dereference with ldap disabled
diff --git
a/crypto/seahorse/patches/0001-Fix-segfault-when-built-with-ldap-disabled.patch

b/crypto/seahorse/patches/0001-Fix-segfault-when-built-with-ldap-disabled.patch
deleted file mode 100644
index 8da93d0..0000000
---
a/crypto/seahorse/patches/0001-Fix-segfault-when-built-with-ldap-disabled.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 6fc0e3e321cdf0bf7e047234561fe8a8084a93f9 Mon Sep 17 00:00:00 2001
-From: Xi Ruoyao <xry111 AT mengyan1223.wang>
-Date: Wed, 14 Apr 2021 23:18:06 +0800
-Subject: [PATCH] Fix segfault when built with ldap disabled
-
-Fixes #321.
-
-Upstream-Status: Backport
----
- pgp/seahorse-pgp-backend.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/pgp/seahorse-pgp-backend.c b/pgp/seahorse-pgp-backend.c
-index 25febf31..8c10e7e3 100644
---- a/pgp/seahorse-pgp-backend.c
-+++ b/pgp/seahorse-pgp-backend.c
-@@ -445,7 +445,10 @@ seahorse_pgp_backend_add_remote (SeahorsePgpBackend
*self,
- /* Don't persist, so just immediately create a ServerSource */
- g_autoptr(SeahorseServerSource) ssrc = NULL;
- ssrc = seahorse_server_category_create_server (uri);
-- g_list_store_append (G_LIST_STORE (self->remotes), ssrc);
-+ /* If the scheme of the uri is ldap, but ldap support is disabled
-+ * in the build, ssrc will be NULL. */
-+ if (ssrc)
-+ g_list_store_append (G_LIST_STORE (self->remotes), ssrc);
- }
- }
-
---
-GitLab
-



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (d2d0e070e9ea8ff9b364c36c8295b931f0ae1486), Ismael Luceno, 02/21/2022

Archive powered by MHonArc 2.6.24.

Top of Page