From patchwork Thu Dec 30 14:23:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 35884 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 5092C27BBE9; Sun, 2 Jan 2022 10:27:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6A72227BBEA for ; Sun, 2 Jan 2022 10:27:13 +0000 (GMT) Received: from localhost ([::1]:49808 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n3y52-000777-Jn for patchwork@mira.cbaines.net; Sun, 02 Jan 2022 05:27:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58454) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n3y4s-00076p-Mp for guix-patches@gnu.org; Sun, 02 Jan 2022 05:27:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48408) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n3y4s-0000PP-CL for guix-patches@gnu.org; Sun, 02 Jan 2022 05:27:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n3y4s-0003si-7C for guix-patches@gnu.org; Sun, 02 Jan 2022 05:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52946] [PATCH 1/2] gnu: wxwidgets-3.1: Update to 3.1.5. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Jan 2022 10:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52946 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52946@debbugs.gnu.org Received: via spool by 52946-submit@debbugs.gnu.org id=B52946.164111916714838 (code B ref 52946); Sun, 02 Jan 2022 10:27:02 +0000 Received: (at 52946) by debbugs.gnu.org; 2 Jan 2022 10:26:07 +0000 Received: from localhost ([127.0.0.1]:59952 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n3y3y-0003rF-Nq for submit@debbugs.gnu.org; Sun, 02 Jan 2022 05:26:07 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:39724) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n3y3v-0003qc-Lt for 52946@debbugs.gnu.org; Sun, 02 Jan 2022 05:26:04 -0500 Received: by mail-wr1-f67.google.com with SMTP id s1so64381628wra.6 for <52946@debbugs.gnu.org>; Sun, 02 Jan 2022 02:26:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:mime-version:to:content-transfer-encoding :message-id; bh=apbiCjdoKzebJs3pPQYjOjm4mQKzVd2ueSzxpwkLb2M=; b=n/kZ223bJ2UagaGV0IcEbOdB26/eIHoqcvG0GnqUWVLor43MZiLA+Z/BCW541VxTvT oYF52KhEA41KnZDnjAJ/7K1BjuEhz17658a7cAkcOljHGfAsog43o/TbtLa+T3ytmV1O KuV6jujKP+HdShvPP8duwplGrv8gSEqY2Yz1WSaXS470sHSJ7mxSnHLg9vUWpAwmJDXp UCPJQppfFv2CQ1uWdBpFAqyH298/qPeZCztPO2hutdQVFwE41UGwS6C6yzXGvVzt9Jwp odOO6ZTcxVGfqJunrYgwF3hHxn3OXRTQCgClUOVxyKjaUrX/gvAOiksQ1vmW6tJZeN7X j8xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:mime-version:to :content-transfer-encoding:message-id; bh=apbiCjdoKzebJs3pPQYjOjm4mQKzVd2ueSzxpwkLb2M=; b=EQ/0oNAePI2Qe9iJLgQGAcPCAbk4BNLILGfsZngHGALpH5anrHtplL6GqtDTmO2r7z YO2Hlj77HX+dKpuhUkLSsMlB0MXILN9CJqTV1mb/bcflZlsfZ4ixrnt073lG35s31VfI JUpVF//MN0/5sa71IABm7wgZEOs+fQWVc6EiT52mMP+MEqzr3p2DCy44TUoD0HhJeKWQ RYoNbq+pexz5xDqDPJn2pqiVEN4/v3p3wwxBxOsvxWKdSkv5szH7MTogBDzhD+iVO1YZ CgoutvuzE6ndnaXeOUhPr6MBVnssMnX2Jp/gLcTxASOSaIQQjpmmeYSByAeQsfqYupcW yfQw== X-Gm-Message-State: AOAM531MMOlN6Edq7WuO2b2oIzlPniptAoLt0Nq1r5qkxg+yLdZnYVJv 6w4KiHs5axb2CqQDRr92BdEPREVcwzam+A== X-Google-Smtp-Source: ABdhPJythh2RehuqDwDSgTu9OJJ2MV2HXlEFPcGIqG59pqfQX2VRcF8qowG31dXXOhwn5vKSEZNs2g== X-Received: by 2002:a5d:47cd:: with SMTP id o13mr35218900wrc.669.1641119157817; Sun, 02 Jan 2022 02:25:57 -0800 (PST) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id a2sm35414123wri.17.2022.01.02.02.25.56 for <52946@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jan 2022 02:25:57 -0800 (PST) From: Liliana Marie Prikler Date: Thu, 30 Dec 2021 15:23:51 +0100 MIME-Version: 1.0 Message-ID: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 * gnu/packages/wxwidgets.scm (wxwidgets-3.1): Update to 3.1.5. [inputs]: Add catch-framework. [#:configure-flags]: List out all flags. [#:phases]: Add ‘add-catch’ phase. Replace ‘configure’ with manual configuration. --- gnu/packages/wxwidgets.scm | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index 1776532..41ea99f 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -26,6 +26,7 @@ (define-module (gnu packages wxwidgets) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix l:) @@ -33,6 +34,7 @@ (define-module (gnu packages wxwidgets) #:use-module (guix build-system python) #:use-module (guix utils) #:use-module (gnu packages) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages databases) #:use-module (gnu packages freedesktop) @@ -162,7 +164,7 @@ (define-public wxwidgets-gtk2 ;; This can be removed when wxWidgets is updated to the next stable version. (define-public wxwidgets-3.1 (package (inherit wxwidgets) - (version "3.1.0") + (version "3.1.5") (source (origin (method git-fetch) @@ -172,13 +174,32 @@ (define-public wxwidgets-3.1 (file-name (git-file-name "wxwidgets" version)) (sha256 (base32 - "14kl1rsngm70v3mbyv1mal15iz2b18k97avjx8jn7s81znha1c7f")))) + "0j998nzqmycafignclxmahgqm5kgs1fiqbsiyvzm7bnpnafi333y")))) (inputs (modify-inputs (package-inputs wxwidgets) - (prepend gstreamer gst-plugins-base))) + (prepend catch-framework gstreamer gst-plugins-base))) (arguments (substitute-keyword-arguments (package-arguments wxwidgets) ((#:configure-flags flags) - `(cons "--enable-mediactrl" ,flags)))))) + '(list "--with-regex" "--with-libmspack" "--with-sdl" + "--enable-mediactrl" "--enable-webviewwebkit")) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'add-catch + (lambda* (#:key inputs #:allow-other-keys) + (install-file + (search-input-file inputs "include/catch.hpp") + "3rdparty/catch/include/"))) + (replace 'configure + (lambda* (#:key configure-flags inputs native-inputs outputs + #:allow-other-keys) + (let ((sh (search-input-file (or native-inputs inputs) + "bin/sh"))) + (apply invoke "./configure" + (string-append "SHELL=" sh) + (string-append "CONFIG_SHELL=" sh) + (string-append "--prefix=" + (assoc-ref outputs "out")) + configure-flags)))))))))) (define-public wxwidgets-gtk2-3.1 (package/inherit wxwidgets-3.1