From unknown Sat Sep 06 21:08:05 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#60201 <60201@debbugs.gnu.org> To: bug#60201 <60201@debbugs.gnu.org> Subject: Status: [PATCH] gnu: Add libswell Reply-To: bug#60201 <60201@debbugs.gnu.org> Date: Sun, 07 Sep 2025 04:08:05 +0000 retitle 60201 [PATCH] gnu: Add libswell reassign 60201 guix-patches submitter 60201 Sughosha severity 60201 normal tag 60201 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 19 08:49:45 2022 Received: (at submit) by debbugs.gnu.org; 19 Dec 2022 13:49:45 +0000 Received: from localhost ([127.0.0.1]:38548 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7GWX-0002fb-79 for submit@debbugs.gnu.org; Mon, 19 Dec 2022 08:49:45 -0500 Received: from lists.gnu.org ([209.51.188.17]:51622) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7GWT-0002fV-MN for submit@debbugs.gnu.org; Mon, 19 Dec 2022 08:49:43 -0500 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 1p7GWQ-0002vQ-A4 for guix-patches@gnu.org; Mon, 19 Dec 2022 08:49:41 -0500 Received: from mail-4324.protonmail.ch ([185.70.43.24]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p7GWM-0000iL-Ut for guix-patches@gnu.org; Mon, 19 Dec 2022 08:49:37 -0500 Date: Mon, 19 Dec 2022 13:49:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1671457764; x=1671716964; bh=TutFV0BythvwuA9pnU6Dy0MrBnCGSLMsTdBB6a/ePdQ=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=MfG/BbaT25NY9+R3rcgd+NeiylbXMKSZWm8q9AiUTOFYKOGGyY05k83t35yU8L6M4 EZookW3ZU/Ia2/tJt7xd19grMv5IsSjoWZGKovsqpsZlX6p8G3MJrnbKz8GHP7CT1V Zl1/3p4RkPuza2tyWYvCSWz1PHRmATlmXdNn3TpxQzAC1SyiAZo3UNReqEptodS3SM VNI+CjvbZQFFiKKUcRKIEar69WivDayc5rxgH7PI5foFpgQ6ZywHeLHwIc5E8nKkGN V0vabTpNoB23ggzftOs+wTclGctTUgsl9Pd5MIlWxcLkUvfq4mzfWdaEDKA6azNmg3 Vg9iaOIKjYsbA== To: "guix-patches@gnu.org" From: Sughosha Subject: [PATCH] gnu: Add libswell Message-ID: Feedback-ID: 45211691:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=185.70.43.24; envelope-from=Sughosha@proton.me; helo=mail-4324.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/packages/wdl.scm (libswell): New variable. --- gnu/packages/wdl.scm | 75 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 gnu/packages/wdl.scm diff --git a/gnu/packages/wdl.scm b/gnu/packages/wdl.scm new file mode 100644 index 0000000000..e0a7ea8fac --- /dev/null +++ b/gnu/packages/wdl.scm @@ -0,0 +1,75 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright =C2=A9 2022 Sughosha +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages wdl) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix gexp) + #:use-module (guix git-download) + #:use-module (guix build-system gnu) + #:use-module (gnu packages) + #:use-module (gnu packages gtk) + #:use-module (gnu packages pkg-config)) + +(define %wdl-commit "60ef0b41d520813c63303046531c78ec95e64d5c") + +(define %wdl-origin + (origin + (method git-fetch) + (uri (git-reference (url "https://github.com/justinfrankel/WDL.git") + (commit %wdl-commit))) + (sha256 (base32 "0br0b4d230vhib5qm39ggf6m5pfipkjs4xqxkjxjnba7g0bdz7i= v")) + (modules '((guix build utils))) + ;; Unbundle third party libraries which are not needed. + (snippet '(for-each (lambda (dir) (delete-file-recursively + (string-append "WDL/" dir))) + (list "jnetlib" + "libpng" + "giflib" + "jpeglib" + "zlib"))))) + +(define-public libswell + (package + (name "libswell") + (version (git-version "0" "0" %wdl-commit)) + (source %wdl-origin) + (build-system gnu-build-system) + (arguments + `(#:tests? #f + #:phases (modify-phases %standard-phases + (delete 'configure) ;no configure script + (replace 'build + (lambda _ + (chdir "WDL") + (invoke "make" "-Cswell"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (install-file "swell/libSwell.so" + (string-append (assoc-ref outputs + "out") + "/lib"))))))) + (native-inputs (list pkg-config)) + (inputs (list gtk+)) + (home-page "http://www.cockos.com/wdl") + (synopsis "Reasonable subset of the win32 API") + (description + "SWELL is Simple Windows Emulation Layer with support for automatic +(PHP-based) dialog and menu resource conversion and SWELL-specific win32-s= tyle +extensions.") + (license license:zlib))) --=20 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 19 09:04:58 2022 Received: (at 60201) by debbugs.gnu.org; 19 Dec 2022 14:04:58 +0000 Received: from localhost ([127.0.0.1]:38559 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7GlD-0002ob-8T for submit@debbugs.gnu.org; Mon, 19 Dec 2022 09:04:58 -0500 Received: from mail-4324.protonmail.ch ([185.70.43.24]:37403) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Gl5-0002oS-V6 for 60201@debbugs.gnu.org; Mon, 19 Dec 2022 09:04:53 -0500 Date: Mon, 19 Dec 2022 14:04:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1671458681; x=1671717881; bh=lizs3+839o59spfoaMlk4pOqsv4yKj825ke06c5dO8w=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=IyVxJN+mV5c0YMImmSb1Sr74jp7OPEUTAP1QRn0lr9JKjHen0n0RENvjJwugf7eJW K6qwEkFJAVPte65rLfz/Nwjb5PkLbR4TKwB2RWDG/cDzcKrFDLfdsV0xc0n6WJ8EX1 U4m0kj57Txx+QUR7cPMfy4gCQxyGfcCZ8Mc7HWXWb7uqtmQjrgYd282lVW2KzFph2L jNRnlrtJBdpClHk4cZrmaBf5sw85Uf+gGQ52yMzV0n2nimkDxYsodsWvdcOjV59UW/ 9JpCK6ghqutpr0qlKD1MOj82+dXhCwWpxIvYjLE5mKdKtmaok3kdZIiNNwI0LPmkiY 9eL8EtsVhpjOg== To: "60201@debbugs.gnu.org" <60201@debbugs.gnu.org> From: Sughosha Subject: [PATCH v2] gnu: libswell: align properly Message-ID: Feedback-ID: 45211691:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60201 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/wdl.scm (libswell): Align properly. --- gnu/packages/wdl.scm | 52 ++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/gnu/packages/wdl.scm b/gnu/packages/wdl.scm index e0a7ea8fac..8cdea46103 100644 --- a/gnu/packages/wdl.scm +++ b/gnu/packages/wdl.scm @@ -45,31 +45,31 @@ (define %wdl-origin "zlib"))))) =20 (define-public libswell - (package - (name "libswell") - (version (git-version "0" "0" %wdl-commit)) - (source %wdl-origin) - (build-system gnu-build-system) - (arguments - `(#:tests? #f - #:phases (modify-phases %standard-phases - (delete 'configure) ;no configure script - (replace 'build - (lambda _ - (chdir "WDL") - (invoke "make" "-Cswell"))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (install-file "swell/libSwell.so" - (string-append (assoc-ref outputs - "out") - "/lib"))))))) - (native-inputs (list pkg-config)) - (inputs (list gtk+)) - (home-page "http://www.cockos.com/wdl") - (synopsis "Reasonable subset of the win32 API") - (description - "SWELL is Simple Windows Emulation Layer with support for automatic + (package + (name "libswell") + (version (git-version "0" "0" %wdl-commit)) + (source %wdl-origin) + (build-system gnu-build-system) + (arguments + `(#:tests? #f + #:phases (modify-phases %standard-phases + (delete 'configure) ;no configure script + (replace 'build + (lambda _ + (chdir "WDL") + (invoke "make" "-Cswell"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (install-file "swell/libSwell.so" + (string-append (assoc-ref outputs + "out") + "/lib"))))))) + (native-inputs (list pkg-config)) + (inputs (list gtk+)) + (home-page "http://www.cockos.com/wdl") + (synopsis "Reasonable subset of the win32 API") + (description + "SWELL is Simple Windows Emulation Layer with support for automatic (PHP-based) dialog and menu resource conversion and SWELL-specific win32-s= tyle extensions.") - (license license:zlib))) + (license license:zlib))) --=20 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 19 13:16:27 2022 Received: (at 60201) by debbugs.gnu.org; 19 Dec 2022 18:16:27 +0000 Received: from localhost ([127.0.0.1]:39593 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Kgd-0005jA-Fm for submit@debbugs.gnu.org; Mon, 19 Dec 2022 13:16:27 -0500 Received: from mail-40140.protonmail.ch ([185.70.40.140]:41459) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7KgZ-0005j4-SI for 60201@debbugs.gnu.org; Mon, 19 Dec 2022 13:16:26 -0500 Date: Mon, 19 Dec 2022 18:16:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1671473777; x=1671732977; bh=5DcgLL/3JQY/T3dfqklLLPglmSHbcF7+o2R0KGhWlMI=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=nKT+eO/Q0WdWOWMt3G9dJGOlAKXQ4DSSqazOhgVtvrr0bncrdmxBzmukv+rSrmYy8 YjI8DvuKPdBrmj/vE3UrOhkdTYCkJ9X3psw+txf1lmxO4gXaMxlUxlO32m6tV0CRjz e2rwvjczJnz0kVVCgEarmAavFU+9BeeCW0gEb33AWx4ehB9gTc6XQXWLJaIY4dbECT Kr714zMyXVp8yF4e5Bz8rnWnX0q1Em75Jwp0Y/ig5yz+qnIsrXdxwe0WfoEqJvjMJL N0tuaXUtGGzDA2sXw8oYKnlITNklqGUO/yeI5xGmO3kCORXOeLNBObO0WHJRkjzy6M mzLjmoFXe8Gjg== To: "60201@debbugs.gnu.org" <60201@debbugs.gnu.org> From: Sughosha Subject: [PATCH v3] gnu/packages/wdl.scm: Remove unused module Message-ID: Feedback-ID: 45211691:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60201 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/wdl.scm: Remove gexp module since it is not used. --- gnu/packages/wdl.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/wdl.scm b/gnu/packages/wdl.scm index 8cdea46103..d6d03bf568 100644 --- a/gnu/packages/wdl.scm +++ b/gnu/packages/wdl.scm @@ -19,7 +19,6 @@ (define-module (gnu packages wdl) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) - #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (gnu packages) --=20 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 22 13:08:22 2022 Received: (at 60201) by debbugs.gnu.org; 22 Dec 2022 18:08:22 +0000 Received: from localhost ([127.0.0.1]:36146 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8PzS-0001b1-EV for submit@debbugs.gnu.org; Thu, 22 Dec 2022 13:08:22 -0500 Received: from mail-40132.protonmail.ch ([185.70.40.132]:27773) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8PzO-0001as-Aa for 60201@debbugs.gnu.org; Thu, 22 Dec 2022 13:08:21 -0500 Date: Thu, 22 Dec 2022 18:08:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1671732492; x=1671991692; bh=D7YZLt/NTpXZ44YjTVUNutYpzcfNWuUt5uGSB+cU7k4=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=DoPC9vJ92AOG0EhwY476Q72ylXcvdZWN3JLN47seg+76Ed2blMenHmfG+0CzZ5lg+ kyiiTONkP7dWPVeLhp0beNvIo7X1j8rflElFjggvFZXHCXWEZeo2t2DAdMvjrRhqhk MxGhBZODTWdgKbHP3v/PNzKU+TjRg3qcYdyfoHKazWU0kvM0zriokn53jETzNfPES/ NeOP9uTVp1E0WM6BZFtlednLUuiNvMvhR2Ns9ys4vj23s/HWCHkbvu5biUZLl83GzD bOQS07J15w+TWvMLqfxlKyP4WDBwyqqex4ocwU50WO12LzU64RnAosa/fNeagR3naY cesM6mAOfJt7w== To: "60201@debbugs.gnu.org" <60201@debbugs.gnu.org> From: Sughosha Subject: [PATCH v4] gnu: libswell: Modify inputs Message-ID: Feedback-ID: 45211691:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60201 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/wdl.scm (libswell)[inputs]: Add more required packages. --- gnu/packages/wdl.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/wdl.scm b/gnu/packages/wdl.scm index d6d03bf568..f08566f150 100644 --- a/gnu/packages/wdl.scm +++ b/gnu/packages/wdl.scm @@ -64,7 +64,15 @@ (define-public libswell "out") "/lib"))))))) (native-inputs (list pkg-config)) - (inputs (list gtk+)) + (inputs (list cairo + fonyconfig + freetype + gdk-pixbuf + glib + gobject-introspection + gtk+ + mesa + pango)) (home-page "http://www.cockos.com/wdl") (synopsis "Reasonable subset of the win32 API") (description -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 22 14:08:59 2022 Received: (at 60201) by debbugs.gnu.org; 22 Dec 2022 19:08:59 +0000 Received: from localhost ([127.0.0.1]:36215 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8Qw6-0002I9-V3 for submit@debbugs.gnu.org; Thu, 22 Dec 2022 14:08:59 -0500 Received: from mail-4318.protonmail.ch ([185.70.43.18]:35407) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8Qw5-0002I1-Am for 60201@debbugs.gnu.org; Thu, 22 Dec 2022 14:08:58 -0500 Date: Thu, 22 Dec 2022 19:08:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1671736130; x=1671995330; bh=IW/3FRIAu/JFSTJss7lRe27TeaaEs9IONfSCcfDbK58=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=D2WYdvb9/qgv7conPKTZHEGWI0cpDWsxYD6TYIeq9EpWI819RQJBMQV6UrhclnizT xZ8x19L0ezc3w/gpyLhz+oJ622Roe3ZmhBNZxG2r6oZXXwUsFWd0n0mIWw6vFZPsGZ z681k3XVF1X4K68fXwWK1vMPG03dfRPZNRHZOfmtSR9Y/PZpiEdJbT5X3PXKkUEXj1 uqeuymrtqJT8Kq/0tf5hIDuDZCvaCV3/fWA36F8mG5m0h2pmSvUlTx/b2wJtu3abrt H1R9Y+ht23f+htDXRViIAlaWRFqid95Mndg7MYQfq2AAAdobS09XPsVYu7WDLyPzxO 6fYlWtMaoFC6g== To: "60201@debbugs.gnu.org" <60201@debbugs.gnu.org> From: Sughosha Subject: [PATCH v5] gnu: libswell: Lint and fix mistakes. Message-ID: Feedback-ID: 45211691:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60201 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/wdl.scm: Add required modules. (%wdl-origin): Modify URL. (libswell)[inputs]: Fix typo. --- gnu/packages/wdl.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/wdl.scm b/gnu/packages/wdl.scm index f08566f150..afb8000e78 100644 --- a/gnu/packages/wdl.scm +++ b/gnu/packages/wdl.scm @@ -22,6 +22,9 @@ (define-module (gnu packages wdl) #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (gnu packages) + #:use-module (gnu packages fontutils) + #:use-module (gnu packages gl) + #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages pkg-config)) @@ -30,7 +33,7 @@ (define %wdl-commit "60ef0b41d520813c63303046531c78ec95e6= 4d5c") (define %wdl-origin (origin (method git-fetch) - (uri (git-reference (url "https://github.com/justinfrankel/WDL.git") + (uri (git-reference (url "https://github.com/justinfrankel/WDL") (commit %wdl-commit))) (sha256 (base32 "0br0b4d230vhib5qm39ggf6m5pfipkjs4xqxkjxjnba7g0bdz7i= v")) (modules '((guix build utils))) @@ -65,7 +68,7 @@ (define-public libswell "/lib"))))))) (native-inputs (list pkg-config)) (inputs (list cairo - fonyconfig + fontconfig freetype gdk-pixbuf glib -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 30 12:33:33 2022 Received: (at 60201) by debbugs.gnu.org; 30 Dec 2022 17:33:33 +0000 Received: from localhost ([127.0.0.1]:36065 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBJG9-0005hn-9d for submit@debbugs.gnu.org; Fri, 30 Dec 2022 12:33:33 -0500 Received: from mail-4324.protonmail.ch ([185.70.43.24]:28165) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBJG6-0005hY-HJ for 60201@debbugs.gnu.org; Fri, 30 Dec 2022 12:33:31 -0500 Date: Fri, 30 Dec 2022 17:33:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1672421604; x=1672680804; bh=fZTXheTMuGfF3kx0oq8JwyuXPKnKbv1iQXglvQWSpNc=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=hA6Syd4KZUVbiDY5I2hntU9VuXa0qBcqVr/ZuRHaqiGwEka67gNURBaEv5K/aPJDh IxGRapdEBZ1x74av5IIcI0TbMMqcZSJhKIuvgaMsCjEpDaPSE0cPpOHwd66gUhWrhs Qfd72o6RsoIy/77C+D1sByXPAKidYHuPXVscUynmtm1tSKbKWQHVrb0QJyhH9qxTGx MNSsaT3lYDNiVg0Y3aYOZMwDCw3rg//K75QyMZSmYrfphqoVkz+fwjVNt0KpOwoFpV QYqKXhjOZVm0cgDy85FLqOQ5R7X9/K8AVR3QGmpycPWiUsyBgbAfcA2DUo7MXvlJYQ ZT0NFlatWNVlw== To: "60201@debbugs.gnu.org" <60201@debbugs.gnu.org> From: Sughosha Subject: [PATCH v6] gnu/local.mk: Register wdl.scm. Message-ID: Feedback-ID: 45211691:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60201 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/local.mk: Register wdl.scm. --- gnu/local.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/local.mk b/gnu/local.mk index 0d4028a161..823818accc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -623,6 +623,7 @@ GNU_SYSTEM_MODULES =3D=09=09=09=09\ %D%/packages/vulkan.scm=09=09=09\ %D%/packages/w3m.scm=09=09=09=09\ %D%/packages/wdiff.scm=09=09=09\ + %D%/packages/wdl.scm=09=09=09=09\ %D%/packages/weather.scm=09=09=09\ %D%/packages/web.scm=09=09=09=09\ %D%/packages/web-browsers.scm=09=09=09\ --=20 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 30 13:16:24 2022 Received: (at 60201) by debbugs.gnu.org; 30 Dec 2022 18:16:24 +0000 Received: from localhost ([127.0.0.1]:36105 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBJvc-0006tM-B8 for submit@debbugs.gnu.org; Fri, 30 Dec 2022 13:16:24 -0500 Received: from mail-4324.protonmail.ch ([185.70.43.24]:57087) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBJvW-0006t1-8B for 60201@debbugs.gnu.org; Fri, 30 Dec 2022 13:16:22 -0500 Date: Fri, 30 Dec 2022 18:16:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1672424170; x=1672683370; bh=ZaYxTAG0LihvSutGzKxV1eE6ChBbvGi08YVcdxJRrjc=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=bXHfAWCUsVqYiiBILAhp/xDfsJ/ltLbZnZ60+J4YZeCVAeAICee2eeNxHFBhv+Nm8 sN5ZYj77KJVTqCI8ldhhMPizoSVpU7K7Y3Vca1iOWPrrX69T5U7MIrIjAu51C3ds0g L0iSLRSIlidcG6LANAYkyOhVbexq2NUBvo7N5elGWsyW4HqvGVju8QsahkKhzIa07f g+dAuTubv0/DeywIpg3FBPmqWDOGMz3zGG67SKWyex6jKPNJKUjhWlMAr4ZAhJoj3M utUHK+5bInin1nuofPDHAaSfjTjbqViiqeAN009Sr4izBzku1fKwmgK+uFcA730+ig Ca8ATC8hTudyQ== To: "60201@debbugs.gnu.org" <60201@debbugs.gnu.org> From: Sughosha Subject: [PATCH v7] gnu: Add libswell. Message-ID: <2HXsyBKXURVIdF2t0_b1EKzxtjGov3LB8BwE1J2mehqNTufGcWuk8fQHTIsNIEKc0D98lrmC3BdmB2eMf892j0Ndm_3NtKHHmw_TkSfJ7wc=@proton.me> Feedback-ID: 45211691:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60201 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/wdl.scm: New file. (libswell): New public variable. * gnu/local.mk (GNU_SYSTEM_MODULES): Add the new file. --- gnu/local.mk | 1 + gnu/packages/wdl.scm | 85 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 gnu/packages/wdl.scm diff --git a/gnu/local.mk b/gnu/local.mk index 0d4028a161..823818accc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -623,6 +623,7 @@ GNU_SYSTEM_MODULES =3D=09=09=09=09\ %D%/packages/vulkan.scm=09=09=09\ %D%/packages/w3m.scm=09=09=09=09\ %D%/packages/wdiff.scm=09=09=09\ + %D%/packages/wdl.scm=09=09=09=09\ %D%/packages/weather.scm=09=09=09\ %D%/packages/web.scm=09=09=09=09\ %D%/packages/web-browsers.scm=09=09=09\ diff --git a/gnu/packages/wdl.scm b/gnu/packages/wdl.scm new file mode 100644 index 0000000000..afb8000e78 --- /dev/null +++ b/gnu/packages/wdl.scm @@ -0,0 +1,85 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright =C2=A9 2022 Sughosha +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages wdl) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix git-download) + #:use-module (guix build-system gnu) + #:use-module (gnu packages) + #:use-module (gnu packages fontutils) + #:use-module (gnu packages gl) + #:use-module (gnu packages glib) + #:use-module (gnu packages gtk) + #:use-module (gnu packages pkg-config)) + +(define %wdl-commit "60ef0b41d520813c63303046531c78ec95e64d5c") + +(define %wdl-origin + (origin + (method git-fetch) + (uri (git-reference (url "https://github.com/justinfrankel/WDL") + (commit %wdl-commit))) + (sha256 (base32 "0br0b4d230vhib5qm39ggf6m5pfipkjs4xqxkjxjnba7g0bdz7i= v")) + (modules '((guix build utils))) + ;; Unbundle third party libraries which are not needed. + (snippet '(for-each (lambda (dir) (delete-file-recursively + (string-append "WDL/" dir))) + (list "jnetlib" + "libpng" + "giflib" + "jpeglib" + "zlib"))))) + +(define-public libswell + (package + (name "libswell") + (version (git-version "0" "0" %wdl-commit)) + (source %wdl-origin) + (build-system gnu-build-system) + (arguments + `(#:tests? #f + #:phases (modify-phases %standard-phases + (delete 'configure) ;no configure script + (replace 'build + (lambda _ + (chdir "WDL") + (invoke "make" "-Cswell"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (install-file "swell/libSwell.so" + (string-append (assoc-ref outputs + "out") + "/lib"))))))) + (native-inputs (list pkg-config)) + (inputs (list cairo + fontconfig + freetype + gdk-pixbuf + glib + gobject-introspection + gtk+ + mesa + pango)) + (home-page "http://www.cockos.com/wdl") + (synopsis "Reasonable subset of the win32 API") + (description + "SWELL is Simple Windows Emulation Layer with support for automatic +(PHP-based) dialog and menu resource conversion and SWELL-specific win32-s= tyle +extensions.") + (license license:zlib))) --=20 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 02 06:34:16 2023 Received: (at 60201) by debbugs.gnu.org; 2 Jan 2023 11:34:16 +0000 Received: from localhost ([127.0.0.1]:42593 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCJ56-0003e4-Dv for submit@debbugs.gnu.org; Mon, 02 Jan 2023 06:34:16 -0500 Received: from sender4-of-o51.zoho.com ([136.143.188.51]:21115) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCJ54-0003dv-66 for 60201@debbugs.gnu.org; Mon, 02 Jan 2023 06:34:15 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1672659251; cv=none; d=zohomail.com; s=zohoarc; b=ho4K33npOXtvHHEHec/Jtw4FEAF3Hz/flf0P6vykA+6wKrE0JbyZHTZIGv5Iq+7CZPGYUuDsH4m1OTlihRWnO0TBXObGKPJuzNT9r46qoimpgBtjFZnfbqmazUAKASJmfyCps9RZJnLXE2cD1onmy8nJNKEwlFUSUPMNN1qrLxo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672659251; h=Content-Type:Content-Transfer-Encoding:Date:From:MIME-Version:Message-ID:Subject:To; bh=BAgu4G/0Vq/uLO59XB+uy4eTTr6xKnxHnDbU7TQaeyw=; b=VTZnbGJynTblXPi1vIZznCEsrwZckDLx5wI/aXK8zO9cFgqbgf40bYlWvUl/Y0Wb+hizA3n/aV6e+MVO8fhOk4lRRYYiUcridK6UtaCNWkdxYUzvpqv+1K/jq852Pwri0UXy093dMQnuaErPBwyBzf647GCoIDlbut52Xh+g0Ow= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1672659251; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:From:To:To:Subject:Subject:Date:Date:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To:Cc; bh=BAgu4G/0Vq/uLO59XB+uy4eTTr6xKnxHnDbU7TQaeyw=; b=LIUhzl/9BDVE10ViC7mL8JlTQ4nSZ96WA8PZa9db7L+ztdWhMvPXyqAxdq9VFwjB YCWA2b5qRk6NDiHRrzFkvG4GqzsD/zMxHgStVtuHcw5K+2q7qf8V0xeQx+JxvJCBfHj yUC2ZhyX0HTVa4vDxVQD6tyGJ20pzT12zpjioQ3E= Received: from localhost (75-111-142-46.pool.kielnet.net [46.142.111.75]) by mx.zohomail.com with SMTPS id 1672659249501395.75221232051774; Mon, 2 Jan 2023 03:34:09 -0800 (PST) User-agent: mu4e 1.8.13; emacs 28.2 From: Ricardo Wurmus To: 60201@debbugs.gnu.org Subject: [PATCH] gnu: Add libswell Date: Mon, 02 Jan 2023 12:32:19 +0100 X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Message-ID: <87a6315fwx.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60201 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, thank you for the patch! Could you add a comment why tests are disabled? I recommend using a gexp for the phases: (arguments (list ;; There are no tests. #:tests? #false #:phases #~(modify-phases =E2=80=A6 ))) Then you can use #$output instead of binding the =E2=80=98outputs=E2=80=99 = keyword argument and looking up the output with label =E2=80=98out=E2=80=99. Is it really enough to just install the .so? Shouldn=E2=80=99t the headers= also be installed? Why are origin and commit separated as a global definition? That seems unnecessary. --=20 Ricardo From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 03 17:09:16 2023 Received: (at 60201) by debbugs.gnu.org; 3 Jan 2023 22:09:16 +0000 Received: from localhost ([127.0.0.1]:46925 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCpTA-00057H-5G for submit@debbugs.gnu.org; Tue, 03 Jan 2023 17:09:16 -0500 Received: from mail-40135.protonmail.ch ([185.70.40.135]:19105) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCpT5-000570-LQ for 60201@debbugs.gnu.org; Tue, 03 Jan 2023 17:09:14 -0500 Date: Tue, 03 Jan 2023 22:09:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=d4b3ad54yrg3vl7x7rfzbqvvgi.protonmail; t=1672783745; x=1673042945; bh=cJiDfxwP9dlp0mZwhd8lLcvV+CGGo1w56wHR/SzP1mA=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=YIVmIawcRfI0b3KQyq4mnsmcGQ4oDtnlTHDcNQcUtSBhx31Rf+yZlITivJa3+9oRZ h5MxCPeuKzTevHeamYOHh65sz9wR1Gxe8iZFj25hzWhw57EvHRDfPY6fSVDB8QDVoJ lGbfBLf75f4hL1Wvva68RwLI6SFHekaHBJFfUWX0Qd5twhPYQb1s/GahtzTwICUKAg 5GrSXCkY1aP/9ZGHMUpgUDtbRYryHYRz5fE7BFBY/EgU8GvMoflg+rA+6u/zzKC5+r 3NUR8PZxkrT0A0AOyh37uNYVTOv2qEzI4tFrCoIRElHozbZ46E6XPa+7h8FbhYXlur wJYJKDe/dPKvQ== To: "60201@debbugs.gnu.org" <60201@debbugs.gnu.org> From: Sughosha Subject: [PATCH v8] gnu: Add wdl. Message-ID: Feedback-ID: 45211691:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60201 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) I finally moved the whole thing to cpp.scm and hope that this is the right = place. I also changed the name to wdl and included header files, but I don'= t know if I should install .cpp files also, and if yes, I don't know where,= so I left them. * gnu/packages/cpp.scm (wdl): New public variable. * gnu/packages/patches/wdl-link-libs-and-fix-jnetlib.patch: New file. * gnu/local.mk: Register the patch file. --- gnu/local.mk | 1 + gnu/packages/cpp.scm | 123 +++++++++++= +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++= +++++++++++++++++++++++++++++++++++++ gnu/packages/patches/wdl-link-libs-and-fix-jnetlib.patch | 53 +++++++++++= ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 177 insertions(+) create mode 100644 gnu/packages/patches/wdl-link-libs-and-fix-jnetlib.patc= h diff --git a/gnu/local.mk b/gnu/local.mk index f0b1b3f..4b6ef75 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1987,6 +1987,7 @@ dist_patch_DATA =3D=09=09=09=09=09=09\ %D%/packages/patches/wacomtablet-add-missing-includes.patch=09\ %D%/packages/patches/wacomtablet-qt5.15.patch=09=09=09\ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch=09\ + %D%/packages/patches/wdl-link-libs-and-fix-jnetlib.patch=09\ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch=09\ %D%/packages/patches/webrtc-audio-processing-big-endian.patch=09\ %D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch= \ diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index a3df706..f7254e2 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -63,6 +63,7 @@ #:use-module (guix modules) #:use-module (guix gexp) #:use-module (gnu packages) + #:use-module (gnu packages assembly) #:use-module (gnu packages autotools) #:use-module (gnu packages boost) #:use-module (gnu packages build-tools) @@ -73,7 +74,11 @@ #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages documentation) + #:use-module (gnu packages fontutils) #:use-module (gnu packages gcc) + #:use-module (gnu packages gl) + #:use-module (gnu packages glib) + #:use-module (gnu packages gtk) #:use-module (gnu packages libevent) #:use-module (gnu packages libunwind) #:use-module (gnu packages linux) @@ -91,6 +96,7 @@ #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module (gnu packages xml) + #:use-module (gnu packages xorg) #:use-module (ice-9 match)) =20 (define-public argagg @@ -2231,3 +2237,120 @@ also includes a C library that checks casting, mult= iplication, division, addition and subtraction for all combinations of signed and unsigned 32-bi= t and 64-bit integers.") (license license:expat))) + +(define-public wdl + (let ((commit "da86a62d11e46e4ecd8b16f9775cb5188340a0e2") + (revision "0")) + (package + (name "wdl") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/justinfrankel/WDL") + (commit commit))) + (file-name (git-file-name name version)) + (patches + (search-patches "wdl-link-libs-and-fix-jnetlib.patch")) + (sha256 + (base32 + "0hdb604szkbrlyffiw94rz8wx4nvmk3zdkycfirqgjs7mh0l6vbq")) + (modules '((guix build utils))) + ;; Unbundle third party libraries which are not needed. + (snippet '(for-each (lambda (dir) + (delete-file-recursively (string-app= end + "WDL/" dir= ))) + (list "cmath" + "libpng" + "lice/glew" + "giflib" + "jpeglib" + "zlib"))))) + (build-system gnu-build-system) + (arguments + (list #:phases #~(modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (with-directory-excursion "WDL/swell" + (invoke "make" "SWELL_SUPPORT_GTK=3Dtrue") + (invoke "make" "libSwell.colortheme")) + (invoke "make" "-CWDL/eel2") + (invoke "make" "-CWDL/jnetlib"))) + (replace 'check + (lambda _ + (with-directory-excursion "WDL/swell" + (invoke "make" "test")))) + (replace 'install + (lambda _ + (let ((include (string-append #$output + "/include/WDL"= ))) + (with-directory-excursion "WDL" + (delete-file-recursively "lice/test") + (delete-file-recursively + "swell/sample_project") + (for-each (lambda (file) + (mkdir-p (string-append incl= ude + "/" + file= ))) + (list "eel2" + "jnetlib" + "lice" + "localize" + "plush2" + "prvhash" + "swell" + "win32_curses" + "wingui/scrollbar")) + (for-each (lambda (file) + (copy-file file + (string-append + include "/" file= ))) + (find-files "." "\\.h$"))) + (with-directory-excursion "WDL/swell" + (install-file "libSwell.so" + (string-append #$output + "/lib")) + (install-file "libSwell.colortheme" + (string-append #$output + "/share/WDL= "))) + (install-file "WDL/eel2/loose_eel" + (string-append #$output + "/libexec")) + (install-file "WDL/jnetlib/jnl.a" + (string-append #$output + "/lib")))))))= ) + (native-inputs (list pkg-config nasm)) + (inputs (list cairo + fontconfig + freetype + gdk-pixbuf + glib + gtk+ + libxi + libx11 + mesa + zlib)) + (home-page "https://www.cockos.com/wdl/") + (synopsis "Modestly reusable C++ libraries") + (description + "WDL is a C++ library that is designed to be easily used by other c= ode. + +WDL includes the following: +@itemize +@item Inline classes for cleanly managing memory allocations, lists, +queues, resource pools, strings, etc. +@item File reading/writing wrappers +@item Directory scanning API +@item SHA-1 implementation +@item Mergesort implementation +@item Blowfish implementation +@item Fast FFT implementation (based on DJBFFT) +@item Audio tools +@item LICE - Lightweight Image Compositing Engine +@item WDL Virtual Window system +@item Plush2 - Portable, lightweight software 3d rendering engine +@item SWELL - Simple Windows Emulation Layer +@item And more. +@end itemize") + (license license:zlib)))) diff --git a/gnu/packages/patches/wdl-link-libs-and-fix-jnetlib.patch b/gnu= /packages/patches/wdl-link-libs-and-fix-jnetlib.patch new file mode 100644 index 0000000..29ec0f0 --- /dev/null +++ b/gnu/packages/patches/wdl-link-libs-and-fix-jnetlib.patch @@ -0,0 +1,53 @@ +From 2d129502354da4fe39dac13463ea742f8026ab91 Mon Sep 17 00:00:00 2001 +From: Sughosha +Date: Tue, 3 Jan 2023 22:15:09 +0100 +Subject: [PATCH] Link libs and fix jnetlib. + +--- + WDL/eel2/Makefile | 2 +- + WDL/jnetlib/Makefile | 2 +- + WDL/swell/Makefile | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/WDL/eel2/Makefile b/WDL/eel2/Makefile +index ac2e41f1..0ffca97a 100644 +--- a/WDL/eel2/Makefile ++++ b/WDL/eel2/Makefile +@@ -153,7 +153,7 @@ gen-lex: # the output of this, lex.nseel.c, is unused= because we have a handwri + =09$(CXX) $(CXXFLAGS) -c -o $@ $^ +=20 + loose_eel: loose_eel.o $(OBJS) $(OBJS2) +-=09g++ -o $@ $^ $(CXXFLAGS) $(LFLAGS) ++=09g++ -o $@ $^ $(CXXFLAGS) $(LFLAGS) -lGL +=20 + clean: + =09-rm -f -- loose_eel loose_eel.o $(OBJS) +diff --git a/WDL/jnetlib/Makefile b/WDL/jnetlib/Makefile +index 10d9fe8a..85570c5a 100644 +--- a/WDL/jnetlib/Makefile ++++ b/WDL/jnetlib/Makefile +@@ -7,7 +7,7 @@ CC =3D gcc + CPP =3D g++ + CXX =3D g++ +=20 +-OBJS =3D asyncdns.o connection.o httpget.o httpserv.o listen.o util.o ser= con.o ++OBJS =3D asyncdns.o connection.o httpget.o httpserv.o listen.o util.o +=20 + jnl.a: ${OBJS} + =09-rm -f jnl.a +diff --git a/WDL/swell/Makefile b/WDL/swell/Makefile +index 9e7e2d87..8e98a543 100644 +--- a/WDL/swell/Makefile ++++ b/WDL/swell/Makefile +@@ -167,7 +167,7 @@ libSwell$(DLL_EXT): $(OBJS) + =09$(CXX) -shared -o $@ $(CFLAGS) $(LFLAGS) $^ $(LINKEXTRA) +=20 + test: $(OBJS) test.o +-=09$(CXX) -o test $(CFLAGS) $(LFLAGS) $^ $(LINKEXTRA) ++=09$(CXX) -o test $(CFLAGS) $(LFLAGS) $^ $(LINKEXTRA) -lpthread -ldl $(sh= ell $(PKG_CONFIG) --libs gtk+-3.0 freetype2) -lfontconfig -lGL -lXi -lX11 +=20 + libSwell.colortheme: swell-gdi-generic.cpp $(SWELL_HEADERS) + =09$(CXX) $(CFLAGS) -o make-theme -DSWELL__MAKE_THEME swell-gdi-generic.c= pp -lpthread +--=20 +2.38.1 + -- libgit2 1.4.3 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 03 18:16:13 2023 Received: (at 60201) by debbugs.gnu.org; 3 Jan 2023 23:16:13 +0000 Received: from localhost ([127.0.0.1]:47070 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCqVw-0005O1-Lz for submit@debbugs.gnu.org; Tue, 03 Jan 2023 18:16:13 -0500 Received: from mail-40138.protonmail.ch ([185.70.40.138]:54083) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCqVr-0005NV-J5 for 60201@debbugs.gnu.org; Tue, 03 Jan 2023 18:16:11 -0500 Date: Tue, 03 Jan 2023 23:15:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1672787761; x=1673046961; bh=jgYVrQdVhFbU10Eis8EufmfMJqs6Y1SDN/XkKodhocc=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=PO9uPpfHzjUdx/14SwEQ9pAq8Zv1Sh8GBJ1CP4WY3Jre03wHQoeA+3WKShU9tpFWw wPmV6ARJW6ZpFhVl+yAdz98U+VaUMzSvJ70tlhSYluFcsnjA3umTbawwoolnbPLB18 zCK6emOOW8dBJaP9aIIC427rQaZLCUcCBWQN0N3jUIj2Ch/3WqBYsmyH5m5Fdhh5Ug sWP+gjNrO/8lEPr519IAmHuSWiyR4+mzTqlKTzL3P9bhnxbcKmkMNFzRQUBmkqKh4d d6ubHim4hyim3gIA0zHDY+dApd3CXoGiI6E0Ba+DLpSAUtdhNMBsq85QOQFtc/Hr14 oKg7UBjLS+aMw== To: "60201@debbugs.gnu.org" <60201@debbugs.gnu.org> From: Sughosha Subject: [PATCH v9] gnu: Add wdl. Message-ID: Feedback-ID: 45211691:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60201 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Alined and improved the definition, as per the chat in IRC. * gnu/packages/cpp.scm (wdl): New public variable. * gnu/packages/patches/wdl-link-libs-and-fix-jnetlib.patch: New file. * gnu/local.mk: Register the patch file. --- gnu/local.mk | 1 + gnu/packages/cpp.scm | 125 ++++++++++++++++++ .../wdl-link-libs-and-fix-jnetlib.patch | 53 ++++++++ 3 files changed, 179 insertions(+) create mode 100644 gnu/packages/patches/wdl-link-libs-and-fix-jnetlib.patc= h diff --git a/gnu/local.mk b/gnu/local.mk index f0b1b3fd15..4b6ef757ad 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1987,6 +1987,7 @@ dist_patch_DATA =3D=09=09=09=09=09=09\ %D%/packages/patches/wacomtablet-add-missing-includes.patch=09\ %D%/packages/patches/wacomtablet-qt5.15.patch=09=09=09\ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch=09\ + %D%/packages/patches/wdl-link-libs-and-fix-jnetlib.patch=09\ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch=09\ %D%/packages/patches/webrtc-audio-processing-big-endian.patch=09\ %D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch= \ diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index a3df706f43..bcf234187e 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -63,6 +63,7 @@ (define-module (gnu packages cpp) #:use-module (guix modules) #:use-module (guix gexp) #:use-module (gnu packages) + #:use-module (gnu packages assembly) #:use-module (gnu packages autotools) #:use-module (gnu packages boost) #:use-module (gnu packages build-tools) @@ -73,7 +74,11 @@ (define-module (gnu packages cpp) #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages documentation) + #:use-module (gnu packages fontutils) #:use-module (gnu packages gcc) + #:use-module (gnu packages gl) + #:use-module (gnu packages glib) + #:use-module (gnu packages gtk) #:use-module (gnu packages libevent) #:use-module (gnu packages libunwind) #:use-module (gnu packages linux) @@ -91,6 +96,7 @@ (define-module (gnu packages cpp) #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module (gnu packages xml) + #:use-module (gnu packages xorg) #:use-module (ice-9 match)) =20 (define-public argagg @@ -2231,3 +2237,122 @@ (define-public safeint addition and subtraction for all combinations of signed and unsigned 32-bi= t and 64-bit integers.") (license license:expat))) + +(define-public wdl + ;; No tag is available. + (let ((commit "da86a62d11e46e4ecd8b16f9775cb5188340a0e2") + (revision "0")) + (package + (name "wdl") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/justinfrankel/WDL") + (commit commit))) + (file-name (git-file-name name version)) + ;; This patch fixes error of undefined functions, due to n= ot + ;; linking libraries, and invalid object. + (patches + (search-patches "wdl-link-libs-and-fix-jnetlib.patch")) + (sha256 + (base32 + "0hdb604szkbrlyffiw94rz8wx4nvmk3zdkycfirqgjs7mh0l6vbq")) + (modules '((guix build utils))) + ;; Unbundle third party libraries which are not needed. + (snippet + '(for-each + (lambda (dir) + (with-directory-excursion "WDL" + (delete-file-recursively dir))) + (list "cmath" + "libpng" + "lice/glew" + "giflib" + "jpeglib" + "zlib"))))) + (build-system gnu-build-system) + (arguments + (list + #:test-target "test" + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (chdir "WDL") + (invoke "make" "-Ceel2") ;build eel2 + (invoke "make" "-Cjnetlib") ;build jnetlib + + ;; Build swell. + (chdir "swell") + (invoke "make" "SWELL_SUPPORT_GTK=3Dtrue") + (invoke "make" "libSwell.colortheme"))) + (replace 'install + (lambda _ + (let ((include (string-append #$output + "/include/WDL"))) + (chdir "../") + (delete-file-recursively "lice/test") + (delete-file-recursively "swell/sample_project= ") + (for-each + (lambda (file) + (mkdir-p (string-append include "/" file))= ) + (list "eel2" + "jnetlib" + "lice" + "localize" + "plush2" + "prvhash" + "swell" + "win32_curses" + "wingui/scrollbar")) + (for-each + (lambda (file) + (copy-file file + (string-append include "/" file))) + (find-files "." "\\.h$")) + (with-directory-excursion "swell" + (install-file "libSwell.so" + (string-append #$output + "/lib")) + (install-file "libSwell.colortheme" + (string-append #$output + "/share/WDL"))) + (install-file "eel2/loose_eel" + (string-append #$output + "/libexec")) + (install-file "jnetlib/jnl.a" + (string-append #$output + "/lib")))))))) + (native-inputs (list pkg-config nasm)) + (inputs (list cairo + fontconfig + freetype + gdk-pixbuf + glib + gtk+ + libxi + libx11 + mesa + zlib)) + (home-page "https://www.cockos.com/wdl/") + (synopsis "Modestly reusable C++ libraries") + (description + "WDL is a modestly reusable C++ library that offers the following: +@itemize +@item Inline classes for cleanly managing memory allocations, lists, +queues, resource pools, strings, etc. +@item File reading/writing wrappers +@item Directory scanning API +@item SHA-1 implementation +@item Mergesort implementation +@item Blowfish implementation +@item Fast FFT implementation (based on DJBFFT) +@item Audio tools +@item LICE - Lightweight Image Compositing Engine +@item WDL Virtual Window system +@item Plush2 - Portable, lightweight software 3d rendering engine +@item SWELL - Simple Windows Emulation Layer +@item And more. +@end itemize") + (license license:zlib)))) diff --git a/gnu/packages/patches/wdl-link-libs-and-fix-jnetlib.patch b/gnu= /packages/patches/wdl-link-libs-and-fix-jnetlib.patch new file mode 100644 index 0000000000..29ec0f058c --- /dev/null +++ b/gnu/packages/patches/wdl-link-libs-and-fix-jnetlib.patch @@ -0,0 +1,53 @@ +From 2d129502354da4fe39dac13463ea742f8026ab91 Mon Sep 17 00:00:00 2001 +From: Sughosha +Date: Tue, 3 Jan 2023 22:15:09 +0100 +Subject: [PATCH] Link libs and fix jnetlib. + +--- + WDL/eel2/Makefile | 2 +- + WDL/jnetlib/Makefile | 2 +- + WDL/swell/Makefile | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/WDL/eel2/Makefile b/WDL/eel2/Makefile +index ac2e41f1..0ffca97a 100644 +--- a/WDL/eel2/Makefile ++++ b/WDL/eel2/Makefile +@@ -153,7 +153,7 @@ gen-lex: # the output of this, lex.nseel.c, is unused= because we have a handwri + =09$(CXX) $(CXXFLAGS) -c -o $@ $^ +=20 + loose_eel: loose_eel.o $(OBJS) $(OBJS2) +-=09g++ -o $@ $^ $(CXXFLAGS) $(LFLAGS) ++=09g++ -o $@ $^ $(CXXFLAGS) $(LFLAGS) -lGL +=20 + clean: + =09-rm -f -- loose_eel loose_eel.o $(OBJS) +diff --git a/WDL/jnetlib/Makefile b/WDL/jnetlib/Makefile +index 10d9fe8a..85570c5a 100644 +--- a/WDL/jnetlib/Makefile ++++ b/WDL/jnetlib/Makefile +@@ -7,7 +7,7 @@ CC =3D gcc + CPP =3D g++ + CXX =3D g++ +=20 +-OBJS =3D asyncdns.o connection.o httpget.o httpserv.o listen.o util.o ser= con.o ++OBJS =3D asyncdns.o connection.o httpget.o httpserv.o listen.o util.o +=20 + jnl.a: ${OBJS} + =09-rm -f jnl.a +diff --git a/WDL/swell/Makefile b/WDL/swell/Makefile +index 9e7e2d87..8e98a543 100644 +--- a/WDL/swell/Makefile ++++ b/WDL/swell/Makefile +@@ -167,7 +167,7 @@ libSwell$(DLL_EXT): $(OBJS) + =09$(CXX) -shared -o $@ $(CFLAGS) $(LFLAGS) $^ $(LINKEXTRA) +=20 + test: $(OBJS) test.o +-=09$(CXX) -o test $(CFLAGS) $(LFLAGS) $^ $(LINKEXTRA) ++=09$(CXX) -o test $(CFLAGS) $(LFLAGS) $^ $(LINKEXTRA) -lpthread -ldl $(sh= ell $(PKG_CONFIG) --libs gtk+-3.0 freetype2) -lfontconfig -lGL -lXi -lX11 +=20 + libSwell.colortheme: swell-gdi-generic.cpp $(SWELL_HEADERS) + =09$(CXX) $(CFLAGS) -o make-theme -DSWELL__MAKE_THEME swell-gdi-generic.c= pp -lpthread +--=20 +2.38.1 + --=20 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 04 05:27:11 2023 Received: (at 60201-done) by debbugs.gnu.org; 4 Jan 2023 10:27:11 +0000 Received: from localhost ([127.0.0.1]:47810 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pD0zG-0005JR-V5 for submit@debbugs.gnu.org; Wed, 04 Jan 2023 05:27:11 -0500 Received: from sender4-of-o51.zoho.com ([136.143.188.51]:21156) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pD0zF-0005JI-0W for 60201-done@debbugs.gnu.org; Wed, 04 Jan 2023 05:27:09 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1672828025; cv=none; d=zohomail.com; s=zohoarc; b=k+xdDrGTJYtvMnAHsD1VpJwGBedGq763NAl3kR5P/ru3QnyI7Cf5LPEVfq7Hsk0CHohnIOg2kziA7DAR7LWrAzrnR97CeqiIs9s5n+8pgsjEZeEPPENxT850izJX8FVbbYEMBRW9yzF3zPCOYCUUVYdy7s/aUghmgiA4LN794pk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672828025; h=Content-Type:Content-Transfer-Encoding:Date:From:MIME-Version:Message-ID:Subject:To; bh=xfYT67T9WPj3C+6xlNXr+m9n7wfPZGOl/Ecc6psZje0=; b=kK/fvNKmUuVLlDiGjFlRm1UnNXTQ6ERI3pT2ZenPiqXrlXmSteXiRq359GpnaNhFMNugn6HILCEXqz8XjcIH9tVeXWIirGzPocj4bG1gu8OaL6ZazEriIOarU0CuRAFa4U2U/NHIRzl+xkgOGMv2Rm84ydFcaLOS/KT1rCF+RdU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1672828025; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:From:To:To:Subject:Subject:Date:Date:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To:Cc; bh=xfYT67T9WPj3C+6xlNXr+m9n7wfPZGOl/Ecc6psZje0=; b=Fn82CH/8e4KWrRQwT/CZVciDWdydkiJaDJg/Nf656XGQxrdYkri+yd5swIMoM8Ht eAB5LeQ+3kpZutvt6NWHxftk9rInOiSU5K4T1yMUCZqe8SjnMZlt0ERXy53FpSEXf04 UvMlFd3DoNvoajL6/BRAImsz14PCcoUx9de1kFFQ= Received: from localhost (75-111-142-46.pool.kielnet.net [46.142.111.75]) by mx.zohomail.com with SMTPS id 1672828024368370.81110988392277; Wed, 4 Jan 2023 02:27:04 -0800 (PST) User-agent: mu4e 1.8.13; emacs 28.2 From: Ricardo Wurmus To: 60201-done@debbugs.gnu.org Subject: [PATCH] gnu: Add libswell Date: Wed, 04 Jan 2023 11:23:07 +0100 X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Message-ID: <87bkne4mtm.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60201-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Thank you for your patience. I took the liberty of making a few changes: - minor indentation / formatting changes - pulled out the =E2=80=9Cwith-directory-excursion=E2=80=9D to simplify the= snippet - used =E2=80=9Cwith-directory-excursion=E2=80=9D where possible to avoid s= tateful behavior across build phases. - removed the =E2=80=9Cmkdir-p=E2=80=9D which would have only created empty= directories in $out/include, and simplified installation of all headers. - added a copyright line for you It=E2=80=99s all pushed to the =E2=80=9Cmaster=E2=80=9D branch with commit a8f15711508abab85cba3174f68a4343a15fb116. Thanks! --=20 Ricardo From unknown Sat Sep 06 21:08:05 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 01 Feb 2023 12:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator