From patchwork Mon Jul 1 17:07:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Artyom V. Poptsov" X-Patchwork-Id: 65812 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 3016027BBEA; Mon, 1 Jul 2024 18:09:22 +0100 (BST) 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, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 E9B1A27BBE2 for ; Mon, 1 Jul 2024 18:09:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sOKWY-0002xR-DQ; Mon, 01 Jul 2024 13:09:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sOKWW-0002vr-OQ for guix-patches@gnu.org; Mon, 01 Jul 2024 13:09:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sOKWW-0007fS-GC for guix-patches@gnu.org; Mon, 01 Jul 2024 13:09:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sOKWX-0004zK-0l for guix-patches@gnu.org; Mon, 01 Jul 2024 13:09:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70880] [PATCH v2 7/8] gnu: Add prusa-wxwidgets. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Jul 2024 17:09:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70880 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: moreinfo patch To: 70880@debbugs.gnu.org Cc: "Artyom V. Poptsov" , Nikita Domnitskii Received: via spool by 70880-submit@debbugs.gnu.org id=B70880.171985372719082 (code B ref 70880); Mon, 01 Jul 2024 17:09:04 +0000 Received: (at 70880) by debbugs.gnu.org; 1 Jul 2024 17:08:47 +0000 Received: from localhost ([127.0.0.1]:34362 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKWE-0004xb-JM for submit@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:47 -0400 Received: from mail-lf1-f41.google.com ([209.85.167.41]:52414) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKWB-0004wL-Py for 70880@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:44 -0400 Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-52cd80e55efso5665700e87.0 for <70880@debbugs.gnu.org>; Mon, 01 Jul 2024 10:08:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719853657; x=1720458457; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ot7p/nJprPFcVjFf3MfkEfUCkxeX64QFMSOoMeIq3nE=; b=FNUJfiuzgEeSAb5LeQQMCpagPAcQ0HAuLz1XYRNfFwde7wQWBbzrdvtL8RAWLEohXY o7kwohqgAdQQNill9nM9USmBu8v/4PvosZyCu3jhiuJ4QBFljv8wlTttc05p2/TN9/gQ NX1IccWuvamhTZgOTsPmVKuezhcOXGAnB5276dnCWMa5/Hw65PDqIyJ+2WyMW91DH82y Gnf+jHiWXCYVxCAtkKNQCq4f6c3WRtwUWCN0OktZ40fLEfnK4K6rOC869KdIAXRK8JU4 Glf9Au2bzJOaT1HQIX1l+xwnnuMEO2Lm8chp/lX5nuO5ODAxaVLNdOmybIR1tzVkJa0U TgCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719853657; x=1720458457; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ot7p/nJprPFcVjFf3MfkEfUCkxeX64QFMSOoMeIq3nE=; b=whke5BhhLdS2V/ZpcC5PmKclT5abiqCv+xHqMTHh28S281U3HHGFGG4KXljA17nTkJ TKVDdiwWt0ppO4T+GFY/iQ7ghK00f7uhzBacddirxBLx1gjtkVlCrc6XYcQNpdn993Cj UjW+XGC08k5au6KsF9T+SPJoP2HpnCU4Hq+cwpFpWSY2upp/Kq6ppiZSUlQbrMTyWNK7 /KVvKu6diC+o77mwrMqUhGQIlX8icEijrzE5l049vq0IFIQQnxYUJfvvYSXFfws1JHTy ekjYguAZ43cKLbKLdI272ex++GwpHNB6q/E6hIca+AGFpHfwW6Nh7HHeT6+UNcgaYSX+ YXlg== X-Gm-Message-State: AOJu0YzD3+Qh8840MyRCRo+YXAExUk6njUHvPowcFiQdhDjEMonTiXDI SfU9Q6hQvIVT4oOBhZSX2iKRRvMtJE96a7mXtsQIzaXYqvHanKF2Eq/xKA== X-Google-Smtp-Source: AGHT+IHXujTtjFmsrgmG0bZzxnw5Kray7xRMnsQt5FkXvZ1aPpuawCQYzmTnlTs1BkDQ/Z/cJDRU/g== X-Received: by 2002:a05:6512:3da1:b0:52e:76f6:aa5b with SMTP id 2adb3069b0e04-52e8266640dmr5017703e87.17.1719853656281; Mon, 01 Jul 2024 10:07:36 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52e7ab2793fsm1497282e87.123.2024.07.01.10.07.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 10:07:35 -0700 (PDT) From: "Artyom V. Poptsov" Date: Mon, 1 Jul 2024 20:07:09 +0300 Message-ID: <9f39081f248d8efe78b8234a9642a367a3e05827.1719853592.git.poptsov.artyom@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/engineering.scm (prusa-wxwidgets): New variable. * gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch: New file. * gnu/local.mk (dist_patch_DATA): Register "prusa-wxwidgets-makefile-fix.patch". Co-authored-by: Nikita Domnitskii Change-Id: I9043c2acc95986275ee24d9c5d944e5fe2702e99 --- gnu/local.mk | 1 + .../prusa-wxwidgets-makefile-fix.patch | 112 ++++++++++++++++++ gnu/packages/wxwidgets.scm | 29 +++++ 3 files changed, 142 insertions(+) create mode 100644 gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index e263261986..29107a618b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1842,6 +1842,7 @@ dist_patch_DATA = \ %D%/packages/patches/prusa-slicer-boost-fixes.patch \ %D%/packages/patches/prusa-slicer-fix-tests.patch \ %D%/packages/patches/prusa-slicer-with-cereal-1.3.1.patch \ + %D%/packages/patches/prusa-wxwidgets-makefile-fix.patch \ %D%/packages/patches/pthreadpool-system-libraries.patch \ %D%/packages/patches/python-3.12-fix-tests.patch \ %D%/packages/patches/python-accupy-use-matplotx.patch \ diff --git a/gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch b/gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch new file mode 100644 index 0000000000..aadf976588 --- /dev/null +++ b/gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch @@ -0,0 +1,112 @@ +diff --git a/Makefile.in b/Makefile.in +index 8f33aa2ff4..39928382da 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -4358,7 +4358,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \ + monodll_msw_utils.o \ + monodll_utilsexc.o \ + monodll_fswatcher.o \ +- monodll_msw_secretstore.o ++ monodll_msw_secretstore.o \ + monodll_msw_uilocale.o + @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS) + @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \ +@@ -5284,7 +5284,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \ + monodll_uuid.o \ + monodll_msw_evtloop.o \ + monodll_access.o \ +- monodll_dark_mode.o ++ monodll_dark_mode.o \ + monodll_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS = \ +@@ -6196,7 +6196,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \ + monodll_uuid.o \ + monodll_msw_evtloop.o \ + monodll_access.o \ +- monodll_dark_mode.o ++ monodll_dark_mode.o \ + monodll_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \ +@@ -6371,7 +6371,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ + monolib_msw_utils.o \ + monolib_utilsexc.o \ + monolib_fswatcher.o \ +- monolib_msw_secretstore.o ++ monolib_msw_secretstore.o \ + monolib_msw_uilocale.o + @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1) + @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \ +@@ -7297,7 +7297,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \ + monolib_uuid.o \ + monolib_msw_evtloop.o \ + monolib_access.o \ +- monolib_dark_mode.o ++ monolib_dark_mode.o \ + monolib_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_2 = \ +@@ -8209,7 +8209,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \ + monolib_uuid.o \ + monolib_msw_evtloop.o \ + monolib_access.o \ +- monolib_dark_mode.o ++ monolib_dark_mode.o \ + monolib_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \ +@@ -8436,7 +8436,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ + basedll_msw_utils.o \ + basedll_utilsexc.o \ + basedll_fswatcher.o \ +- basedll_msw_secretstore.o ++ basedll_msw_secretstore.o \ + basedll_msw_uilocale.o + @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2) + @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \ +@@ -8523,7 +8523,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ + baselib_msw_utils.o \ + baselib_utilsexc.o \ + baselib_fswatcher.o \ +- baselib_msw_secretstore.o ++ baselib_msw_secretstore.o \ + baselib_msw_uilocale.o + @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3) + @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \ +@@ -9464,7 +9464,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \ + coredll_uuid.o \ + coredll_msw_evtloop.o \ + coredll_access.o \ +- coredll_dark_mode.o ++ coredll_dark_mode.o \ + coredll_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_4 = \ +@@ -10376,7 +10376,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \ + coredll_uuid.o \ + coredll_msw_evtloop.o \ + coredll_access.o \ +- coredll_dark_mode.o ++ coredll_dark_mode.o \ + coredll_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \ +@@ -11204,7 +11204,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \ + corelib_uuid.o \ + corelib_msw_evtloop.o \ + corelib_access.o \ +- corelib_dark_mode.o ++ corelib_dark_mode.o \ + corelib_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_6 = \ +@@ -12116,7 +12116,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \ + corelib_uuid.o \ + corelib_msw_evtloop.o \ + corelib_access.o \ +- corelib_dark_mode.o ++ corelib_dark_mode.o \ + corelib_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \ diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index 973e962fb1..2cf2ceba56 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -265,6 +265,35 @@ (define-public wxwidgets-2 (("-Wall") "-Wall -Wno-narrowing")) #t))))))) +(define-public prusa-wxwidgets + ;; There is no tag/release, all patches are in separate branch. + (let ((commit "78aa2dc0ea7ce99dc19adc1140f74c3e2e3f3a26")) + (package + (inherit wxwidgets) + (name "prusa-wxwidgets") + (version "3.2.0") + (home-page "https://github.com/prusa3d/wxWidgets") + (source + (origin + (inherit (package-source wxwidgets)) + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (patches (search-patches "prusa-wxwidgets-makefile-fix.patch")) + (sha256 + (base32 + "02nd07c23xbclnf1jjfbv6r5vqjb80gsdy2l559c5qzgdcvfd2xd")))) + (arguments + (substitute-keyword-arguments (package-arguments wxwidgets) + ((#:configure-flags flags) + ;; To fix 3D rendering in PrusaSlicer, wxWidgets must be compiled with + ;; "--disable-glcanvasegl" flag. + ;; + ;; See + #~(cons "--disable-glcanvasegl" #$flags))))))) + (define-public python-wxpython (package (name "python-wxpython")