From patchwork Fri Feb 14 03:51:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 38582 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 29FEA27BBEA; Fri, 14 Feb 2025 03:54:26 +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=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 149C027BBE9 for ; Fri, 14 Feb 2025 03:54:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1timmF-0003hG-7x; Thu, 13 Feb 2025 22:54:07 -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 1timmB-0003gl-Nz for guix-patches@gnu.org; Thu, 13 Feb 2025 22:54:03 -0500 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 1timmA-0008JP-99 for guix-patches@gnu.org; Thu, 13 Feb 2025 22:54:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=nBeafdcefkbRCF+4za2zYl7J5PjDerl6iBGhQzVB+e0=; b=k/c+QNxUjFr8FVWJnlwBcOzN87UPmh7eb6tE7kVkkOvULqu4KEKMlSMnHkeLwDaUE2e5Vz+vf7GEeMWB5LzP6DVI56GlWWervPuEXFGh8KzZQJEfK7Bg9HVENwl9UmlZBnayvSDZWbWxH9snmVtZ7CpZivqR/w1YpFB5M4HYxNGMkEwAUyrF90SxyMmKf65v888dUGOVl8FJJIc8C/7DJCQ3ngjBqFKzFbwj56um/QLUBNTPkAP97u4kNxozxRtqlQBqZQi9Jdhv95TZ5xjvqZEaf3OKPJ29ZP2ZSMBs6qBJZvz1Ay2zCZiSoD9Bpm9k73MjWPSVrnolRjypM5BndQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1timmA-0001EH-3h for guix-patches@gnu.org; Thu, 13 Feb 2025 22:54:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76276] [PATCH] gnu: wdl: Update to 0-1.c9bc5ff. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 14 Feb 2025 03:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 76276 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76276@debbugs.gnu.org Cc: Sughosha X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17395051914622 (code B ref -1); Fri, 14 Feb 2025 03:54:01 +0000 Received: (at submit) by debbugs.gnu.org; 14 Feb 2025 03:53:11 +0000 Received: from localhost ([127.0.0.1]:46436 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1timlK-0001CT-JU for submit@debbugs.gnu.org; Thu, 13 Feb 2025 22:53:11 -0500 Received: from lists.gnu.org ([2001:470:142::17]:37698) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1timlI-0001Bw-1l for submit@debbugs.gnu.org; Thu, 13 Feb 2025 22:53:08 -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 1timlC-0003YV-87 for guix-patches@gnu.org; Thu, 13 Feb 2025 22:53:02 -0500 Received: from layka.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1timl9-0008Ft-Qf for guix-patches@gnu.org; Thu, 13 Feb 2025 22:53:01 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 1145725E8F; Fri, 14 Feb 2025 04:52:57 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id IaOesyKrnYyv; Fri, 14 Feb 2025 04:52:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1739505171; bh=IYPbOkOBwi0/6bPSf34L6VoFTeJ06lsQ6E1+BHaN7sw=; h=From:To:Cc:Subject:Date; b=BI9bsarAD9bOCdq1LBaETf3gWrQY8RT73DW7AoTf/RU6walzR8XWP+pKXngzz7m9j 2wBvNVZsUj1zey/MP4dEyAHy+TZTV/kTj2HZF7x3clNT0oMuchj6iKb/AZ2Hpn5Eng xp8NU4wSL/TDosGbbDFbjS7xxgHI2VGr/RIAMRx6BeNAfvmdRCeN8p4joMV17Lgt4j 4XHSl2HuTzd2ZVG7urWeY0v4JFAvPDgQnVX6hmNX4+Dbqz4pwxxjWEesieCKTAuJC3 ozjNA1tPDqJQn25pjl8mAHhleHTPJu44gqFtM7cip18whB/s3/yzclLBhBJSVvnsIR QgOtS8MYXg7hw== Date: Fri, 14 Feb 2025 09:21:11 +0530 Message-ID: <1f77d2e3572930ae269a8de40670bafd340ec37b.1739505070.git.sughosha@disroot.org> MIME-Version: 1.0 Received-SPF: pass client-ip=178.21.23.139; envelope-from=sughosha@disroot.org; helo=layka.disroot.org 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_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha 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/cpp.scm (wdl): Update to 0-1.c9bc5ff. [source]: Remove patches. [arguments]<#:test-target>: Remove argument. <#:tests?>: Disable. <#:make-flags>: Add "SWELL_SUPPORT_GTK=true". <#:phases>: In chdir phase, change directory to "WDL". In build phase, rewrite it to honor key arguments and do not build eel2 and jnetlib. In install phase, do not change directory. In install phase, install "libSwell.so" to its own "WDL" directory and do not install "loose_eel" and "jnl.a". * gnu/packages/patches/wdl-link-libs-and-fix-jnetlib.patch: Delete file. * gnu/local.mk: Deregister it. Change-Id: Iad1fd1a2513f76daa2daf1d81598e1b772509693 --- gnu/local.mk | 1 - gnu/packages/cpp.scm | 43 +++++++-------- .../wdl-link-libs-and-fix-jnetlib.patch | 53 ------------------- 3 files changed, 20 insertions(+), 77 deletions(-) delete mode 100644 gnu/packages/patches/wdl-link-libs-and-fix-jnetlib.patch base-commit: 4c05f513fdc225c1b5cdb7f2f61aab5d30bcbfe5 diff --git a/gnu/local.mk b/gnu/local.mk index 244420fc76..0354d86ea9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2379,7 +2379,6 @@ dist_patch_DATA = \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/waybar-0.11.0-fix-tray-icons.patch \ %D%/packages/patches/wcstools-extend-makefiles.patch \ - %D%/packages/patches/wdl-link-libs-and-fix-jnetlib.patch \ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \ %D%/packages/patches/webrtc-audio-processing-byte-order-pointer-size.patch \ diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index c6c63d3ffc..23f5689323 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -3058,8 +3058,8 @@ (define-public wide-integer (define-public wdl ;; No tag is available. - (let ((commit "da86a62d11e46e4ecd8b16f9775cb5188340a0e2") - (revision "0")) + (let ((commit "c9bc5ffb7babcc57b3104e379d2d1179276be54e") + (revision "1")) (package (name "wdl") (version (git-version "0" revision commit)) @@ -3069,13 +3069,9 @@ (define-public wdl (url "https://github.com/justinfrankel/WDL") (commit commit))) (file-name (git-file-name name version)) - ;; This patch fixes error of undefined functions, due to not - ;; linking libraries, and invalid object. - (patches - (search-patches "wdl-link-libs-and-fix-jnetlib.patch")) (sha256 (base32 - "0hdb604szkbrlyffiw94rz8wx4nvmk3zdkycfirqgjs7mh0l6vbq")) + "1j3q9h965a1nqhgh7wff05wa7a1f9y0wrfn5ai9iyd7jvmx69pr7")) (modules '((guix build utils))) ;; Unbundle third party libraries which are not needed. (snippet @@ -3090,23 +3086,28 @@ (define-public wdl (build-system gnu-build-system) (arguments (list - #:test-target "test" + #:tests? #f ;no test rule + #:make-flags #~(list "SWELL_SUPPORT_GTK=true") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'chdir - (lambda _ (chdir "WDL/swell"))) + (lambda _ (chdir "WDL"))) (delete 'configure) (replace 'build - (lambda _ - (with-directory-excursion ".." - (invoke "make" "-Ceel2") ;build eel2 - (invoke "make" "-Cjnetlib")) ;build jnetlib - (invoke "make" "SWELL_SUPPORT_GTK=true") - (invoke "make" "libSwell.colortheme"))) + (lambda* (#:key (make-flags '()) (parallel-build? #t) + #:allow-other-keys) + (let ((make-flags + (append (if parallel-build? + `(,(string-append "-j" + (number->string + (parallel-job-count)))) + '()) + make-flags))) + (with-directory-excursion "swell" + (apply invoke "make" make-flags) + (apply invoke "make" "libSwell.colortheme" make-flags))))) (replace 'install (lambda _ - (chdir "..") - ;; Do not install these directories (delete-file-recursively "lice/test") (delete-file-recursively "swell/sample_project") @@ -3119,14 +3120,10 @@ (define-public wdl (string-append include "/" (dirname file)))) (find-files "." "\\.h$"))) - (install-file "swell/libSwell.so" + (install-file "swell/WDL/libSwell.so" (string-append #$output "/lib")) (install-file "swell/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"))))))) + (string-append #$output "/share/WDL"))))))) (native-inputs (list pkg-config nasm)) (inputs (list cairo diff --git a/gnu/packages/patches/wdl-link-libs-and-fix-jnetlib.patch b/gnu/packages/patches/wdl-link-libs-and-fix-jnetlib.patch deleted file mode 100644 index 29ec0f058c..0000000000 --- a/gnu/packages/patches/wdl-link-libs-and-fix-jnetlib.patch +++ /dev/null @@ -1,53 +0,0 @@ -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 - $(CXX) $(CXXFLAGS) -c -o $@ $^ - - loose_eel: loose_eel.o $(OBJS) $(OBJS2) -- g++ -o $@ $^ $(CXXFLAGS) $(LFLAGS) -+ g++ -o $@ $^ $(CXXFLAGS) $(LFLAGS) -lGL - - clean: - -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 = gcc - CPP = g++ - CXX = g++ - --OBJS = asyncdns.o connection.o httpget.o httpserv.o listen.o util.o sercon.o -+OBJS = asyncdns.o connection.o httpget.o httpserv.o listen.o util.o - - jnl.a: ${OBJS} - -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) - $(CXX) -shared -o $@ $(CFLAGS) $(LFLAGS) $^ $(LINKEXTRA) - - test: $(OBJS) test.o -- $(CXX) -o test $(CFLAGS) $(LFLAGS) $^ $(LINKEXTRA) -+ $(CXX) -o test $(CFLAGS) $(LFLAGS) $^ $(LINKEXTRA) -lpthread -ldl $(shell $(PKG_CONFIG) --libs gtk+-3.0 freetype2) -lfontconfig -lGL -lXi -lX11 - - libSwell.colortheme: swell-gdi-generic.cpp $(SWELL_HEADERS) - $(CXX) $(CFLAGS) -o make-theme -DSWELL__MAKE_THEME swell-gdi-generic.cpp -lpthread --- -2.38.1 -