From patchwork Sun Oct 13 12:35:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 15714 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4A9CC1758B; Sun, 13 Oct 2019 17:10:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id C49191748F for ; Sun, 13 Oct 2019 17:10:13 +0100 (BST) Received: from localhost ([::1]:40882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iJgRh-0007jc-5k for patchwork@mira.cbaines.net; Sun, 13 Oct 2019 12:10:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42163) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iJgRZ-0007jP-5j for guix-patches@gnu.org; Sun, 13 Oct 2019 12:10:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iJgRW-0007e2-QJ for guix-patches@gnu.org; Sun, 13 Oct 2019 12:10:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56175) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iJgRW-0007dP-2e for guix-patches@gnu.org; Sun, 13 Oct 2019 12:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iJgRV-0003D4-Qb for guix-patches@gnu.org; Sun, 13 Oct 2019 12:10:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37693] Seahorse build Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Oct 2019 16:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37693 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 37693@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.157098295812278 (code B ref -1); Sun, 13 Oct 2019 16:10:01 +0000 Received: (at submit) by debbugs.gnu.org; 13 Oct 2019 16:09:18 +0000 Received: from localhost ([127.0.0.1]:36763 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iJgQl-0003Bv-66 for submit@debbugs.gnu.org; Sun, 13 Oct 2019 12:09:18 -0400 Received: from lists.gnu.org ([209.51.188.17]:36685) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iJdAZ-0006IT-AL for submit@debbugs.gnu.org; Sun, 13 Oct 2019 08:40:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39917) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iJdAV-00012v-LG for guix-patches@gnu.org; Sun, 13 Oct 2019 08:40:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iJd6S-0000xC-T1 for guix-patches@gnu.org; Sun, 13 Oct 2019 08:36:08 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:27117) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iJd6S-0000vb-Bu for guix-patches@gnu.org; Sun, 13 Oct 2019 08:36:04 -0400 Received: from nijino.local (194-118-175-91.hdsl.highway.telekom.at [194.118.175.91]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 46rh4W68V7z1LLyM for ; Sun, 13 Oct 2019 14:35:55 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 46rh4W68V7z1LLyM DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1570970155; bh=TdwQPs0s6MgLvXCt2SbD7txoxlyYmGXTLW264S7MdmQ=; h=Subject:From:To:Date:In-Reply-To:References:From; b=QcJ/XfeQOAmJmL1q1WpRLYviHGFP4UtBZhcbYcSMUJcKHvshCyaK7mNiz0SJoIqEW jLdOIBmlluHz6cf5tvnPdNmXz4v0zFRg+V1ZiaF0/6oILh1/m3B2NdBkUft4BKQ6ZN 0HiKrdiwAlMw2h7nSu3DCwYeQmNArj0aybJELvv8= Message-ID: <9144ccebdec3d9cb0e3de1f9877a43a0547d44c1.camel@student.tugraz.at> From: Leo Prikler Date: Sun, 13 Oct 2019 14:35:54 +0200 In-Reply-To: References: User-Agent: Evolution 3.30.5 MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Mailman-Approved-At: Sun, 13 Oct 2019 12:09:12 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This is a fixup to the previous patch, which adds the patches to gnu/local.mk. Unfortunately, the message I've sent along with the previous patch went missing, so I'm trying to reconstruct it here: "This patch fixes the currently broken Seahorse build. Seahorse has switched to the Meson build system upstream, so this change is reflected in the package and inputs were adjusted. Two upstream patches are also applied, one of them with adjusted offset." From 9fcae57f90d48249a274482e888982588fda6b9f Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Sun, 13 Oct 2019 14:29:56 +0200 Subject: [PATCH 2/2] gnu: add seahorse patches to local.mk * /gnu/local.mk: Add seahorse patches. --- gnu/local.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/local.mk b/gnu/local.mk index 0a4ee7c986..9e3687b075 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1315,6 +1315,8 @@ dist_patch_DATA = \ %D%/packages/patches/scotch-build-parallelism.patch \ %D%/packages/patches/scotch-integer-declarations.patch \ %D%/packages/patches/sdl-libx11-1.6.patch \ + %D%/packages/patches/seahorse-fix-libsecret-breakage.patch \ + %D%/packages/patches/seahorse-fix-type-mismatches.patch \ %D%/packages/patches/seq24-rename-mutex.patch \ %D%/packages/patches/sharutils-CVE-2018-1000097.patch \ %D%/packages/patches/shishi-fix-libgcrypt-detection.patch \ -- 2.23.0