From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id YBf8CdXzjWYcUgAAqHPOHw:P1 (envelope-from ) for ; Wed, 10 Jul 2024 02:37:09 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id YBf8CdXzjWYcUgAAqHPOHw (envelope-from ) for ; Wed, 10 Jul 2024 04:37:09 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=ZUTs+V7S; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1720579029; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=qZCcZKjRQ/vMhvZD9Whzz9w5dYE8AECn1dEkE59BuMA=; b=NDCS/OJPxa1X2wES8nifbfddrew0pNVjq0ORG7MukTpV91HRDO09P56PXX90ywwOdARP6/ t3BM8gXTRRzqNv3qtnTwpzoi/4Sy8Ie+EL4wNKJJG+FWL8q4yWNzcE5TaKr4XAJS0nhY+o qhGkldMOR3NPZDfex0i2YhA5Jt1VSATmD13BPZUNVWjaWe0cIUKBAT51kntjTAB25n4Kj2 TasoyLQOje5WgrDH6iwWmdoVL3M1NpTyzjU+TfntMXcns4FBHbskGe/vM0a89qwxNEkWna 7Bb7LjfjCYub563E8OvqFVCIcRTPzIkS+91pO7EmlgPtloxCnsZJBcuu4YeFNQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1720579029; a=rsa-sha256; cv=none; b=MOy1C+kFXiVZa9EdyfziQ+aMocuUoxo+FGtkmN7I/M93QJuxpQTFortEBOlqL1FJDAfNfM gSVM8qh9bwdDjGAUQhxG+WI71bzNeIIaIOxjhjixKfCFiaI6XPztYDCXujJvhe4QIS6TbP ugKVcT85Zr218eRUY752NPZ41K4c73in8g4nkh+sMi2Gx28RPBU4GpEjBZOjx73i4q8S7G 0xp98DVJY0Zxz6/33ySbb/CNEup34RQfP3KwxT58xbwp9kCD8J65O3Mrr51ZnnyyVlFWmM 4xugDd2larSzdJj4+l1+p7bG/b2TNreKBKQooWkTOyjwRV3GP52JyonHo71a/g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=ZUTs+V7S; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E99556A67F for ; Wed, 10 Jul 2024 04:37:08 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sRNCU-0001Jc-BQ; Tue, 09 Jul 2024 22:36:58 -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 1sRNCS-0001BP-9P for guix-patches@gnu.org; Tue, 09 Jul 2024 22:36:56 -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 1sRNCS-0004FT-1X for guix-patches@gnu.org; Tue, 09 Jul 2024 22:36:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sRNCX-0006jn-S0 for guix-patches@gnu.org; Tue, 09 Jul 2024 22:37:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70880] [PATCH v2 7/8] gnu: Add prusa-wxwidgets. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jul 2024 02:37:01 +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: "Artyom V. Poptsov" Cc: 70880@debbugs.gnu.org, Nikita Domnitskii Received: via spool by 70880-submit@debbugs.gnu.org id=B70880.172057900525873 (code B ref 70880); Wed, 10 Jul 2024 02:37:01 +0000 Received: (at 70880) by debbugs.gnu.org; 10 Jul 2024 02:36:45 +0000 Received: from localhost ([127.0.0.1]:54568 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRNCG-0006jE-VD for submit@debbugs.gnu.org; Tue, 09 Jul 2024 22:36:45 -0400 Received: from mail-qt1-f175.google.com ([209.85.160.175]:42121) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRNCD-0006iy-PN for 70880@debbugs.gnu.org; Tue, 09 Jul 2024 22:36:43 -0400 Received: by mail-qt1-f175.google.com with SMTP id d75a77b69052e-447e2d719afso3017151cf.0 for <70880@debbugs.gnu.org>; Tue, 09 Jul 2024 19:36:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720578930; x=1721183730; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=qZCcZKjRQ/vMhvZD9Whzz9w5dYE8AECn1dEkE59BuMA=; b=ZUTs+V7SopYORlu82KbqtKyvzZrB8tDAWZlRRWlx+iwU2DrQ3XzkaCHlCaqv4y8hNl XmHa7Iino1gS6c2jrTI3xorpUCen5quZG7fbtzTTKwTUbspNLvhq1LkfOsib3MheSOWN bZ3ismunCL4vjIXc7QyE/nyLPpFwcAolv2uQ4zrLfeVw/JAE44Z+FEH61++ihpVyLcSp Kbs2Czv3JswzOe5OWMTd4NCXvmre6bL9VvQzufmCxumyZ4pfo63JZJO3YU7hOIlmuiO9 dAfbRrAFMV5ZYJKAiQQu1g1rpdoqVA5V0bd8slFrhTSmmIUpi7LLrZwKcaImuxDYsICH U3aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720578930; x=1721183730; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=qZCcZKjRQ/vMhvZD9Whzz9w5dYE8AECn1dEkE59BuMA=; b=T+Dv1VJ10jG6iUzVUjhVFvxgM3CT16stAWTDttk6MkcmcfxO2lhutgxs5e/s1UPoMS ARTbE/rjIzdlDeEwFqk0BvCNcDfg10KH0zWZQSESgut3tIj5PWKfXxtkhqSqWkSqTHkF wsbLfBS1lRIiY1+6lNJ7j/LWGww3C25Pvw7E0OP74i5qJIaaNusc3HzEZKetixt7JfI+ 7kY38NtKTjpfBS1nK+qQ2oSTLjfz3SKobcxs2tSP845jYuthilekXqLQcc72kMm6MGvW /zz0Kl6ZdBlbdmTJyTT7PPCbD/KF7TTDOqqJQQyeLezPNGtLy3+LeZlqWrxIcoIM8aor MqZA== X-Gm-Message-State: AOJu0Yx3ErUHBU/0K9++EYsKDDdvJugBNiuzWF0i5D6XZnCyq25fGFSv Mr8+2AumqTLZOqltxeSBH4VtiYrSRIdXp8BtvIAMNPt6hn3G+T9wejr0xA== X-Google-Smtp-Source: AGHT+IE4AAesQxcuLhTDUySFQjVAFEsu4rmbou20cuLlduRb7Hbw2+w+Losd7tQbJT7ihzYSYPPf4Q== X-Received: by 2002:ac8:4a0d:0:b0:444:f6d2:be89 with SMTP id d75a77b69052e-447fc36846bmr63161731cf.5.1720578930402; Tue, 09 Jul 2024 19:35:30 -0700 (PDT) Received: from hurd (dsl-205-236-230-124.b2b2c.ca. [205.236.230.124]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-447f9b3c50asm16277231cf.31.2024.07.09.19.35.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 19:35:29 -0700 (PDT) From: Maxim Cournoyer In-Reply-To: <9f39081f248d8efe78b8234a9642a367a3e05827.1719853592.git.poptsov.artyom@gmail.com> (Artyom V. Poptsov's message of "Mon, 1 Jul 2024 20:07:09 +0300") References: <9f39081f248d8efe78b8234a9642a367a3e05827.1719853592.git.poptsov.artyom@gmail.com> Date: Tue, 09 Jul 2024 22:35:28 -0400 Message-ID: <87sewiug7j.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: E99556A67F X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -5.30 X-Spam-Score: -5.30 X-TUID: GkLPFYXEMyfT Hello, "Artyom V. Poptsov" writes: > * 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 @@ There ideally should be some info as to how this patch came into existence. Is it pulled from upstream? From which commit/URL ? If it's custom work, briefly explain why it is necessary at the top of the diff/patch. > +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 I think the convention is to use a variable name like 'wxwidgets-for-prusa'. > + ;; There is no tag/release, all patches are in separate branch. What does "all patches are in separate branch" mean? > + (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))))))) Otherwise LGTM. -- Thanks, Maxim