Date: Thursday, August 30, 2018 @ 19:49:15 Author: heftig Revision: 333137
3.29.92+6+gdd81db31-1 Modified: seahorse/trunk/PKGBUILD (contents, properties) Deleted: seahorse/trunk/0001-LDAP-source-Fix-non-debug-build.patch --------------------------------------------+ 0001-LDAP-source-Fix-non-debug-build.patch | 89 --------------------------- PKGBUILD | 17 +---- 2 files changed, 6 insertions(+), 100 deletions(-) Deleted: 0001-LDAP-source-Fix-non-debug-build.patch =================================================================== --- 0001-LDAP-source-Fix-non-debug-build.patch 2018-08-30 19:35:09 UTC (rev 333136) +++ 0001-LDAP-source-Fix-non-debug-build.patch 2018-08-30 19:49:15 UTC (rev 333137) @@ -1,89 +0,0 @@ -From b82bf06c54f648e2d795b567a5d824f40c27614f Mon Sep 17 00:00:00 2001 -Message-Id: <b82bf06c54f648e2d795b567a5d824f40c27614f.1521136846.git.jan.steff...@gmail.com> -From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> -Date: Thu, 15 Mar 2018 18:57:47 +0100 -Subject: [PATCH] LDAP source: Fix non-debug build - -In non-debug builds, WITH_DEBUG is defined but set to 0. - -Simplify the use of dump_ldap_entry by making it do nothing in non-debug -builds. ---- - pgp/seahorse-ldap-source.c | 12 ++---------- - 1 file changed, 2 insertions(+), 10 deletions(-) - -diff --git a/pgp/seahorse-ldap-source.c b/pgp/seahorse-ldap-source.c -index 4819c918..0dd72446 100644 ---- a/pgp/seahorse-ldap-source.c -+++ b/pgp/seahorse-ldap-source.c -@@ -125,35 +125,33 @@ get_ldap_values (LDAP *ld, LDAPMessage *entry, const char *attribute) - return (gchar**)g_array_free (array, FALSE); - } - --#if WITH_DEBUG -- - static void - dump_ldap_entry (LDAP *ld, LDAPMessage *res) - { -+#if WITH_DEBUG - BerElement *pos; - gchar **values; - gchar **v; - char *t; - - t = ldap_get_dn (ld, res); - g_debug ("dn: %s\n", t); - ldap_memfree (t); - - for (t = ldap_first_attribute (ld, res, &pos); t; - t = ldap_next_attribute (ld, res, pos)) { - - values = get_ldap_values (ld, res, t); - for (v = values; *v; v++) - g_debug ("%s: %s\n", t, *v); - - g_strfreev (values); - ldap_memfree (t); - } - - ber_free (pos, 0); --} -- - #endif /* WITH_DEBUG */ -+} - - static GQuark - get_ldap_error_domain () -@@ -474,9 +472,7 @@ on_connect_server_info_completed (LDAPMessage *result, - if (type == LDAP_RES_SEARCH_ENTRY) { - - g_debug ("Server Info Result"); --#ifdef WITH_DEBUG - dump_ldap_entry (closure->ldap, result); --#endif - - /* NOTE: When adding attributes here make sure to add them to kServerAttributes */ - sinfo = g_new0 (LDAPServerInfo, 1); -@@ -867,9 +863,7 @@ on_search_search_completed (LDAPMessage *result, - /* An LDAP entry */ - if (type == LDAP_RES_SEARCH_ENTRY) { - g_debug ("Retrieved Key Entry"); --#ifdef WITH_DEBUG - dump_ldap_entry (closure->ldap, result); --#endif - - search_parse_key_from_ldap_entry (self, closure->results, - closure->ldap, result); -@@ -1238,9 +1232,7 @@ on_export_search_completed (LDAPMessage *result, - if (type == LDAP_RES_SEARCH_ENTRY) { - - g_debug ("Server Info Result"); --#ifdef WITH_DEBUG - dump_ldap_entry (closure->ldap, result); --#endif - - key = get_string_attribute (closure->ldap, result, sinfo->key_attr); - --- -2.16.2 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-08-30 19:35:09 UTC (rev 333136) +++ PKGBUILD 2018-08-30 19:49:15 UTC (rev 333137) @@ -1,10 +1,9 @@ -# $Id$ # Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> # Contributor: Jan de Groot <j...@archlinux.org> # Contributor: Michel Brabants <michel.li...@tiscali.be> pkgname=seahorse -pkgver=3.20.0+288+gce2340dc +pkgver=3.29.92+6+gdd81db31 pkgrel=1 pkgdesc="GNOME application for managing PGP keys." url="https://wiki.gnome.org/Apps/Seahorse" @@ -13,11 +12,9 @@ depends=(gtk3 gcr libsecret libsoup gpgme gnome-keyring) makedepends=(libldap yelp-tools gobject-introspection vala git meson) provides=(x11-ssh-askpass) -_commit=ce2340dc80820a130f9a65d0084e54443cc9c82d # master -source=("git+https://git.gnome.org/browse/seahorse#commit=$_commit" - 0001-LDAP-source-Fix-non-debug-build.patch) -sha256sums=('SKIP' - '7c45e55f9d98510e1f9305af71d9a11d66fd15100ed29239493c94d591eb9e98') +_commit=dd81db3139dff1a8afa47ea0146b510e0f0a3abb # master +source=("git+https://gitlab.gnome.org/GNOME/seahorse.git#commit=$_commit") +sha256sums=('SKIP') pkgver() { cd $pkgname @@ -26,7 +23,6 @@ prepare() { cd $pkgname - patch -Np1 -i ../0001-LDAP-source-Fix-non-debug-build.patch } build() { @@ -35,10 +31,9 @@ } check() { - cd build - meson test + meson test -C build } package() { - DESTDIR="$pkgdir" ninja -C build install + DESTDIR="$pkgdir" meson install -C build } Property changes on: seahorse/trunk/PKGBUILD ___________________________________________________________________ Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property