From unknown Sun Jun 22 07:38:36 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26343: [PATCH] gnu: audacity: Update to 2.1.3. Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Apr 2017 15:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 26343 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26343@debbugs.gnu.org Cc: Kei Kebreau X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.149114835928142 (code B ref -1); Sun, 02 Apr 2017 15:53:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 Apr 2017 15:52:39 +0000 Received: from localhost ([127.0.0.1]:57654 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cuhnz-0007Jq-04 for submit@debbugs.gnu.org; Sun, 02 Apr 2017 11:52:39 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41267) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cuhnu-0007JR-I2 for submit@debbugs.gnu.org; Sun, 02 Apr 2017 11:52:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cuhno-0008Ip-8B for submit@debbugs.gnu.org; Sun, 02 Apr 2017 11:52:29 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:57053) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cuhno-0008Ic-4S for submit@debbugs.gnu.org; Sun, 02 Apr 2017 11:52:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60468) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cuhnm-0008Lf-Bb for guix-patches@gnu.org; Sun, 02 Apr 2017 11:52:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cuhni-0008GC-PU for guix-patches@gnu.org; Sun, 02 Apr 2017 11:52:26 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:40984 helo=mail.openmailbox.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cuhni-0008EG-DB for guix-patches@gnu.org; Sun, 02 Apr 2017 11:52:22 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id AAABC50F93F; Sun, 2 Apr 2017 17:52:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1491148339; bh=BHkewYZOw/7AWMigrjMCauE2mp+oIHsRBOcZHYDi9+0=; h=From:To:Cc:Subject:Date:From; b=c2ctz6OBsEoBuotd8N3AJAaZvfSfJALajOnZsQ/R6gT/NkBowi8cg6/vh3IM50L+Z gLg6dFQaDlm+A57zxKnVcmlBNawLoyIWKiTS5sjCqRVDKrPjq2TybqU23vjgmPkVkY ENQ8UR0EXxSTP0Sh14A1mhIRcdGHoSZnOAkgAa34= From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1491148338; bh=BHkewYZOw/7AWMigrjMCauE2mp+oIHsRBOcZHYDi9+0=; h=From:To:Cc:Subject:Date:From; b=ImMyM8pnLaXZUqirEmJtr6roRUWDnIgkQaX3yN3m/y3CDSilI50y0dKZmxrXMHkml IC9W9nidsouoh/JtuW+Z3RuUYiPBko7ULWjm85EcUB35olQYlpXMm3Uy+KssXMXB3I 9twvDq55QXHwf/q2Vt/iY9ufqR74VovVQr18rp7c= Date: Sun, 2 Apr 2017 11:52:11 -0400 Message-Id: <20170402155211.23494-1-kei@openmailbox.org> X-Mailer: git-send-email 2.12.2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) 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: -4.0 (----) * gnu/packages/audacity.scm (audacity): Update to 2.1.3. [source]: Fetch gzipped tar archive instead of a zip archive; add snippet to remove time-dependent code; remove unnecessary patch. [native-inputs]: Add autoconf, automake and libtool. [arguments]: Add autoreconf phase to detect system libraries. * gnu/packages/patches/audacity-fix-ffmpeg-binding.patch: Delete patch. * gnu/local.mk: Remove reference to removed patch. --- gnu/local.mk | 1 - gnu/packages/audacity.scm | 25 +++++++++++++---- .../patches/audacity-fix-ffmpeg-binding.patch | 32 ---------------------- 3 files changed, 20 insertions(+), 38 deletions(-) delete mode 100644 gnu/packages/patches/audacity-fix-ffmpeg-binding.patch diff --git a/gnu/local.mk b/gnu/local.mk index 68f561e95..f03f50855 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -494,7 +494,6 @@ dist_patch_DATA = \ %D%/packages/patches/ath9k-htc-firmware-binutils.patch \ %D%/packages/patches/ath9k-htc-firmware-gcc.patch \ %D%/packages/patches/ath9k-htc-firmware-objcopy.patch \ - %D%/packages/patches/audacity-fix-ffmpeg-binding.patch \ %D%/packages/patches/automake-skip-amhello-tests.patch \ %D%/packages/patches/automake-regexp-syntax.patch \ %D%/packages/patches/automake-test-gzip-warning.patch \ diff --git a/gnu/packages/audacity.scm b/gnu/packages/audacity.scm index a70d0e3a6..a4ac2a6ff 100644 --- a/gnu/packages/audacity.scm +++ b/gnu/packages/audacity.scm @@ -23,6 +23,7 @@ #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages audio) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages gettext) #:use-module (gnu packages gtk) @@ -39,15 +40,20 @@ (define-public audacity (package (name "audacity") - (version "2.1.2") + (version "2.1.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/audacity/audacity/archive" - "/Audacity-" version ".zip")) + "/Audacity-" version ".tar.gz")) (sha256 - (base32 "1642i9d5cdmqzj6r0qdl2ldnqsvpb08znnczncysi72x6zpvb5qq")) - (patches (search-patches "audacity-fix-ffmpeg-binding.patch")))) + (base32 "11mx7gb4dbqrgfp7hm0154x3m76ddnmhf2675q5zkxn7jc5qfc6b")) + ;; Replace time-dependent strings. + (modules '((guix build utils))) + (snippet + '(substitute* "src/AboutDialog.cpp" + (("__DATE__") "\"2017\"") + (("__TIME__") "\"00:00\""))))) (build-system gnu-build-system) (inputs ;; TODO: Add portSMF and libwidgetextra once they're packaged. In-tree @@ -73,7 +79,10 @@ ("lilv" ,lilv) ("portaudio" ,portaudio))) (native-inputs - `(("gettext" ,gettext-minimal) ;for msgfmt + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gettext" ,gettext-minimal) ;for msgfmt + ("libtool" ,libtool) ("pkg-config" ,pkg-config) ("python" ,python-2) ("which" ,which))) @@ -90,6 +99,12 @@ (string-append "ID3TAG_LIBS=-L" libid3tag "/lib -lid3tag -lz") (string-append "LIBMAD_CFLAGS=-I" libmad "/include") (string-append "LIBMAD_LIBS=-L" libmad "/lib -lmad"))) + #:phases + (modify-phases %standard-phases + ;; Ensure the usage of system libraries. + (add-before 'configure 'autoreconf + (lambda _ + (zero? (system* "autoreconf" "-vfi"))))) ;; The test suite is not "well exercised" according to the developers, ;; and fails with various errors. See ;; . diff --git a/gnu/packages/patches/audacity-fix-ffmpeg-binding.patch b/gnu/packages/patches/audacity-fix-ffmpeg-binding.patch deleted file mode 100644 index d6d65338d..000000000 --- a/gnu/packages/patches/audacity-fix-ffmpeg-binding.patch +++ /dev/null @@ -1,32 +0,0 @@ -This resolves some "declaration of C function conflicts with previous -declaration" errors during compilation. - ---- a/src/FFmpeg.h 2015-02-21 00:33:33.853857529 +0100 -+++ b/src/FFmpeg.h 2015-02-21 00:35:09.626497205 +0100 -@@ -688,7 +688,7 @@ - FFMPEG_FUNCTION_WITH_RETURN( - AVOutputFormat*, - av_oformat_next, -- (AVOutputFormat *f), -+ (const AVOutputFormat *f), - (f) - ); - FFMPEG_FUNCTION_WITH_RETURN( -@@ -755,7 +755,7 @@ - FFMPEG_FUNCTION_WITH_RETURN( - int, - av_fifo_size, -- (AVFifoBuffer *f), -+ (const AVFifoBuffer *f), - (f) - ); - FFMPEG_FUNCTION_WITH_RETURN( -@@ -801,7 +801,7 @@ - FFMPEG_FUNCTION_WITH_RETURN( - AVDictionaryEntry *, - av_dict_get, -- (AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags), -+ (const AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags), - (m, key, prev, flags) - ); - FFMPEG_FUNCTION_WITH_RETURN( -- 2.12.2 From unknown Sun Jun 22 07:38:36 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26343: [PATCH] gnu: audacity: Update to 2.1.3. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Apr 2017 22:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26343 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Kei Kebreau , 26343@debbugs.gnu.org Cc: Kei Kebreau Received: via spool by 26343-submit@debbugs.gnu.org id=B26343.14911706144409 (code B ref 26343); Sun, 02 Apr 2017 22:04:01 +0000 Received: (at 26343) by debbugs.gnu.org; 2 Apr 2017 22:03:34 +0000 Received: from localhost ([127.0.0.1]:57830 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cunav-000193-VX for submit@debbugs.gnu.org; Sun, 02 Apr 2017 18:03:34 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:52618) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cunaq-00018s-L5 for 26343@debbugs.gnu.org; Sun, 02 Apr 2017 18:03:32 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 6C514207EE; Sun, 2 Apr 2017 18:03:28 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Sun, 02 Apr 2017 18:03:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=JkJh6wb1fKehhaPHWveTBZz/SdJP4L5y4SQyPk2eF YY=; b=kIohHKaHbpJ3VPknqWzwn04NsKxCrJoO3+6Yfx8ZqIT9+2Sey7PV0ZDCD nQVGGfJ1e0cH8kDL3ONGoiT6V7xmTMSA/R4dcdsId5MGAaI9UrMZzEfLqiqerZDC sJdQyuX4Pdu7T3V98Mh4PFgbzBSq3ogP27xENjbk0+NNlTIq8z0EhDbqi1aCfQhP f4tlZqziLttijH1fycA3A3W/41mL7wE2l0n40DhlUDby51F4R8gwxiOliVlQGeBP 78EN8/KXYk211E/YsGzreNKr3bZJlIh8Rm1YcC5ePIBkwabSH8SHt0PToYWrtlzK fN8UOlYxHQ1DATt+8xyBs4ZBPKFyA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=JkJh6wb1fKehhaPHWv eTBZz/SdJP4L5y4SQyPk2eFYY=; b=X09bx/aJMLNH3PTLJPpqUs1bljTEJVZGag KluUC4QyHdqqmazgHldarIjuo3Njcjx+vw8lkwKUOHq/y9q47U7oqTR5DoLaoYu9 5IPiVuFaJ/YG4ZFG38n+zXxq2XITvqvu7Y+eNFIhi54KSMgfUNtS368Iv6JUYpi1 JxqXctkOwvwTqY6U9X2icJjjNe1GRsr+PFuhoALHyk0n8NtLLmN/In0Ie3xxnLSj G+jaHBOw3j+Fh10eoZB5Z4+TaXTSOvAxPaqU/+8PYn33ENFlb3JpAANIND9WDrUb 2LaqfHJBMjJompSj1fwcL74+q+Q0E6lXCydwKd8TFYc0ODddozZQ== X-ME-Sender: X-Sasl-enc: 1XEQudJimqunECKhgG0+YKug4m3HgCbUVy6vskxH65ZY 1491170608 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 003097E334; Sun, 2 Apr 2017 18:03:27 -0400 (EDT) From: Marius Bakke In-Reply-To: <20170402155211.23494-1-kei@openmailbox.org> References: <20170402155211.23494-1-kei@openmailbox.org> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Mon, 03 Apr 2017 00:03:26 +0200 Message-ID: <87y3viv55d.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) 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: -0.7 (/) --=-=-= Content-Type: text/plain Kei Kebreau writes: > * gnu/packages/audacity.scm (audacity): Update to 2.1.3. > [source]: Fetch gzipped tar archive instead of a zip archive; add > snippet to remove time-dependent code; remove unnecessary patch. > [native-inputs]: Add autoconf, automake and libtool. > [arguments]: Add autoreconf phase to detect system libraries. > * gnu/packages/patches/audacity-fix-ffmpeg-binding.patch: Delete patch. > * gnu/local.mk: Remove reference to removed patch. > --- > gnu/local.mk | 1 - > gnu/packages/audacity.scm | 25 +++++++++++++---- > .../patches/audacity-fix-ffmpeg-binding.patch | 32 ---------------------- > 3 files changed, 20 insertions(+), 38 deletions(-) > delete mode 100644 gnu/packages/patches/audacity-fix-ffmpeg-binding.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index 68f561e95..f03f50855 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -494,7 +494,6 @@ dist_patch_DATA = \ > %D%/packages/patches/ath9k-htc-firmware-binutils.patch \ > %D%/packages/patches/ath9k-htc-firmware-gcc.patch \ > %D%/packages/patches/ath9k-htc-firmware-objcopy.patch \ > - %D%/packages/patches/audacity-fix-ffmpeg-binding.patch \ > %D%/packages/patches/automake-skip-amhello-tests.patch \ > %D%/packages/patches/automake-regexp-syntax.patch \ > %D%/packages/patches/automake-test-gzip-warning.patch \ > diff --git a/gnu/packages/audacity.scm b/gnu/packages/audacity.scm > index a70d0e3a6..a4ac2a6ff 100644 > --- a/gnu/packages/audacity.scm > +++ b/gnu/packages/audacity.scm > @@ -23,6 +23,7 @@ > #:use-module (guix build-system gnu) > #:use-module (gnu packages) > #:use-module (gnu packages audio) > + #:use-module (gnu packages autotools) > #:use-module (gnu packages base) > #:use-module (gnu packages gettext) > #:use-module (gnu packages gtk) > @@ -39,15 +40,20 @@ > (define-public audacity > (package > (name "audacity") > - (version "2.1.2") > + (version "2.1.3") > (source > (origin > (method url-fetch) > (uri (string-append "https://github.com/audacity/audacity/archive" > - "/Audacity-" version ".zip")) > + "/Audacity-" version ".tar.gz")) > (sha256 > - (base32 "1642i9d5cdmqzj6r0qdl2ldnqsvpb08znnczncysi72x6zpvb5qq")) > - (patches (search-patches "audacity-fix-ffmpeg-binding.patch")))) > + (base32 "11mx7gb4dbqrgfp7hm0154x3m76ddnmhf2675q5zkxn7jc5qfc6b")) > + ;; Replace time-dependent strings. > + (modules '((guix build utils))) > + (snippet > + '(substitute* "src/AboutDialog.cpp" > + (("__DATE__") "\"2017\"") > + (("__TIME__") "\"00:00\""))))) Now that we're merging core-updates where GCC have been patched to respect SOURCE_DATE_EPOCH in these macros, this substitution should no longer be necessary. Can you verify? :) > (build-system gnu-build-system) > (inputs > ;; TODO: Add portSMF and libwidgetextra once they're packaged. In-tree > @@ -73,7 +79,10 @@ > ("lilv" ,lilv) > ("portaudio" ,portaudio))) > (native-inputs > - `(("gettext" ,gettext-minimal) ;for msgfmt > + `(("autoconf" ,autoconf) > + ("automake" ,automake) > + ("gettext" ,gettext-minimal) ;for msgfmt > + ("libtool" ,libtool) > ("pkg-config" ,pkg-config) > ("python" ,python-2) > ("which" ,which))) > @@ -90,6 +99,12 @@ > (string-append "ID3TAG_LIBS=-L" libid3tag "/lib -lid3tag -lz") > (string-append "LIBMAD_CFLAGS=-I" libmad "/include") > (string-append "LIBMAD_LIBS=-L" libmad "/lib -lmad"))) > + #:phases > + (modify-phases %standard-phases > + ;; Ensure the usage of system libraries. > + (add-before 'configure 'autoreconf > + (lambda _ > + (zero? (system* "autoreconf" "-vfi"))))) Can you clarify how autoreconf ensures usage of system libraries? Usually it just re-generates configure scripts and Makefiles from templates, but should not make any functional difference. Thanks! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAljhdS4ACgkQoqBt8qM6 VPohTQf/Q0MjAbU0L4Djgg5JfZPRDKf3pl72xyTCZKrr16KxThzuXd5KDIDsI7Jn 7I0khsMZY5IM7W/jRJklCdLcbYZzlFwuj0JGQuFkMpWsgeLMG5A7lcg9qFWi/AB3 1gryxkqj3y/99VfRcH/c4ZbpZiK6mmAg0GbxrhvKsPXqlthaIuUO/8RPf+bUnRAV XCjfbLw4gsOVVuhGwL7hSS5mD92CaMfGmQY8ATg8MIFKDvjOmZei0/77EAtMxVO9 RGkRDIZpjxIrdts2fr+ZjUqT28TkWrpGXPwO9ZtzkjLP9iwJuWNFZbHNtut1i8A3 z34bm6kM2RQ+qgrzYDu8wM1miSkTXA== =s4jq -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 22 07:38:36 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26343: [PATCH] gnu: audacity: Update to 2.1.3. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Apr 2017 22:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26343 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Kei Kebreau , 26343@debbugs.gnu.org Cc: Kei Kebreau Received: via spool by 26343-submit@debbugs.gnu.org id=B26343.14911708514804 (code B ref 26343); Sun, 02 Apr 2017 22:08:02 +0000 Received: (at 26343) by debbugs.gnu.org; 2 Apr 2017 22:07:31 +0000 Received: from localhost ([127.0.0.1]:57846 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cunek-0001FQ-Og for submit@debbugs.gnu.org; Sun, 02 Apr 2017 18:07:30 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:56216) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cunej-0001FJ-Tp for 26343@debbugs.gnu.org; Sun, 02 Apr 2017 18:07:30 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id DFBCC2091B; Sun, 2 Apr 2017 18:07:29 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Sun, 02 Apr 2017 18:07:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=06kFf9SLXLgKAmAlcls/vUx1Dhkb6vQKS3wk7+MW9 FM=; b=4G63mpBo73OhJm6KWE7XFyQOOe70VL2x6fgmyB7KD0p3gBJJh/ge+nt8e SBABJF6FEJie4WWplN/btp76tmgcx8P2r4QQ6kGG0MPlS0enPZ4vy17urCp5UUkb wPG3p9THT8Gk7DA29NCxrnsBNXmdzPeji9KeGiHcIDgTzdYg59/1YwEGQWiHdfCn ErVL4oJjmhs1+lKpoqnZmQ7TdG3yp6MBoAW0U0cK697fYkzLH4B/uAuihjxV7NoP YnLHzk4s0/AWC8nXuawwDtUYLe62iAWpUbnZ48QpELQn261cROPEWiFQIMOG6d5B cSgS0K5Ht3ouD6oLMY5lyEE6rYQ7A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=06kFf9SLXLgKAmAlcl s/vUx1Dhkb6vQKS3wk7+MW9FM=; b=R22Pya6iK8j37cTDIZputMEpPJq3nVaN6e +RBrzEodA4NdCUn049R2phHLHVh10NNqjk0hNO5lCCB9jQc9cifO/Qu/chvS3Ykt CUZcERpx+JkwqXmlWidpqySnVquucDcVhV5ANp+2pcYAZuOP5YSxTYEhN3NX8GZR YSuojfc7CIZhgvvCZB6/HfPfOt5frC5sMC85Tx4WTsVn0udpHsQC1ME6+717ETo2 7pTua/untF6dix1Sqn0T9NIBF85O6eem/SE3bMHQHZLBAqK6gVFwL2W4bk30XJws aFpYpgGEUdgU5QiawC0EHih/wJvtTUX2v30T+8iHJRnBrVfDdHXQ== X-ME-Sender: X-Sasl-enc: FfoSNUnOGD3lPZC7ZuH1OmUoenHUFo3kj+YLL6pGrV47 1491170849 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 840427E21E; Sun, 2 Apr 2017 18:07:29 -0400 (EDT) From: Marius Bakke In-Reply-To: <87y3viv55d.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> References: <20170402155211.23494-1-kei@openmailbox.org> <87y3viv55d.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Mon, 03 Apr 2017 00:07:28 +0200 Message-ID: <87vaqmv4yn.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) 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: -0.7 (/) --=-=-= Content-Type: text/plain >> (build-system gnu-build-system) >> (inputs >> ;; TODO: Add portSMF and libwidgetextra once they're packaged. In-tree >> @@ -73,7 +79,10 @@ >> ("lilv" ,lilv) >> ("portaudio" ,portaudio))) >> (native-inputs >> - `(("gettext" ,gettext-minimal) ;for msgfmt >> + `(("autoconf" ,autoconf) >> + ("automake" ,automake) >> + ("gettext" ,gettext-minimal) ;for msgfmt >> + ("libtool" ,libtool) >> ("pkg-config" ,pkg-config) >> ("python" ,python-2) >> ("which" ,which))) >> @@ -90,6 +99,12 @@ >> (string-append "ID3TAG_LIBS=-L" libid3tag "/lib -lid3tag -lz") >> (string-append "LIBMAD_CFLAGS=-I" libmad "/include") >> (string-append "LIBMAD_LIBS=-L" libmad "/lib -lmad"))) >> + #:phases >> + (modify-phases %standard-phases >> + ;; Ensure the usage of system libraries. >> + (add-before 'configure 'autoreconf >> + (lambda _ >> + (zero? (system* "autoreconf" "-vfi"))))) > > Can you clarify how autoreconf ensures usage of system libraries? > Usually it just re-generates configure scripts and Makefiles from > templates, but should not make any functional difference. I also noticed they offer yet another download on the home page: http://www.audacityteam.org/download/source/ Perhaps this one is properly bootstrapped? --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAljhdiAACgkQoqBt8qM6 VPpkXwf+PNkrkDidLNgSXgZEq8T8FCo8bfPQt4oeQEPL4/PArQr3C2h2SGJza8V2 I5lJ3lsDFVC5M+fD/7DKpXLDyL5T36+IwE4nxNICbQtVIWPRuHiCyLl1YcvP2BKn xt8QcFCiFF3Mg5HzGJiR1PY93FC0dUG1Q1n7hjIE7Y/CPxxAOWo/6dkqFvT+KazE CfSOaOMvvPgaEnUD4Z4u9BffjF59qcrUhaTUgGOjOluefrIPhpu84egcshJxQCLc Abl3PqijqTSnMXUrZ9TniRyTRriY8mHxf4BUOBoqdxvQUWgBNAyVcWbme/qwVXuN 2ZyRRgt2e+bEVZvbP6k7aH9hAFPOOQ== =R9UA -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 22 07:38:36 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26343: [PATCH] gnu: audacity: Update to 2.1.3. Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 03 Apr 2017 01:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26343 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Marius Bakke Cc: 26343@debbugs.gnu.org Received: via spool by 26343-submit@debbugs.gnu.org id=B26343.149118412924634 (code B ref 26343); Mon, 03 Apr 2017 01:49:01 +0000 Received: (at 26343) by debbugs.gnu.org; 3 Apr 2017 01:48:49 +0000 Received: from localhost ([127.0.0.1]:57991 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cur6r-0006PC-D3 for submit@debbugs.gnu.org; Sun, 02 Apr 2017 21:48:49 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:35829 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cur6l-0006P0-H7 for 26343@debbugs.gnu.org; Sun, 02 Apr 2017 21:48:43 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id AF3E350EBDF; Mon, 3 Apr 2017 03:48:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1491184117; bh=9ijvhdjqHra+3B0Qs1vAlWIbMaf/Vvlx73ko02gR0ew=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=T119vcT28YPDtw00IX1wqUkXZegTKclmqcWViEwf8ZU25hsjkMPIy2ZH+wRqjZtXj VOSObh2mMUEj9SY8XiAVKhQQwXeXCbxqLZrM0QvDa9qsdN7vqJjRlcgzG8E5F4Dmpz lUj3ubta3O1W2XbHgd3HuR845mCJ5bQpcHDYs+yk= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ZDZR003 X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=NO_RECEIVED,NO_RELAYS, T_DKIM_INVALID autolearn=disabled version=3.4.0 From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1491184116; bh=9ijvhdjqHra+3B0Qs1vAlWIbMaf/Vvlx73ko02gR0ew=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=FBKptdaLjVndrgYjBAFwz2CJ0Dn71ptZ4NGHOwMPULpBlJdJc8YZqyKmZag19+AUF wQa6ckrItVhoqOl5bHovuuF4XeKoMtwyxuKj+ytzmlLcrx26y0LZVgySSQlSh8LPrs yJY6UWU+sFMgZlrZ7EG9h6wKd8zuPVzB0k8Dbo0I= In-Reply-To: <87y3viv55d.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> (Marius Bakke's message of "Mon, 03 Apr 2017 00:03:26 +0200") References: <20170402155211.23494-1-kei@openmailbox.org> <87y3viv55d.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) Date: Sun, 02 Apr 2017 21:48:20 -0400 Message-ID: <87pogu45y3.fsf@openmailbox.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) 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: 0.0 (/) --=-=-= Content-Type: text/plain Marius Bakke writes: > Kei Kebreau writes: > >> * gnu/packages/audacity.scm (audacity): Update to 2.1.3. >> [source]: Fetch gzipped tar archive instead of a zip archive; add >> snippet to remove time-dependent code; remove unnecessary patch. >> [native-inputs]: Add autoconf, automake and libtool. >> [arguments]: Add autoreconf phase to detect system libraries. >> * gnu/packages/patches/audacity-fix-ffmpeg-binding.patch: Delete patch. >> * gnu/local.mk: Remove reference to removed patch. >> --- >> gnu/local.mk | 1 - >> gnu/packages/audacity.scm | 25 +++++++++++++---- >> .../patches/audacity-fix-ffmpeg-binding.patch | 32 ---------------------- >> 3 files changed, 20 insertions(+), 38 deletions(-) >> delete mode 100644 gnu/packages/patches/audacity-fix-ffmpeg-binding.patch >> >> diff --git a/gnu/local.mk b/gnu/local.mk >> index 68f561e95..f03f50855 100644 >> --- a/gnu/local.mk >> +++ b/gnu/local.mk >> @@ -494,7 +494,6 @@ dist_patch_DATA = \ >> %D%/packages/patches/ath9k-htc-firmware-binutils.patch \ >> %D%/packages/patches/ath9k-htc-firmware-gcc.patch \ >> %D%/packages/patches/ath9k-htc-firmware-objcopy.patch \ >> - %D%/packages/patches/audacity-fix-ffmpeg-binding.patch \ >> %D%/packages/patches/automake-skip-amhello-tests.patch \ >> %D%/packages/patches/automake-regexp-syntax.patch \ >> %D%/packages/patches/automake-test-gzip-warning.patch \ >> diff --git a/gnu/packages/audacity.scm b/gnu/packages/audacity.scm >> index a70d0e3a6..a4ac2a6ff 100644 >> --- a/gnu/packages/audacity.scm >> +++ b/gnu/packages/audacity.scm >> @@ -23,6 +23,7 @@ >> #:use-module (guix build-system gnu) >> #:use-module (gnu packages) >> #:use-module (gnu packages audio) >> + #:use-module (gnu packages autotools) >> #:use-module (gnu packages base) >> #:use-module (gnu packages gettext) >> #:use-module (gnu packages gtk) >> @@ -39,15 +40,20 @@ >> (define-public audacity >> (package >> (name "audacity") >> - (version "2.1.2") >> + (version "2.1.3") >> (source >> (origin >> (method url-fetch) >> (uri (string-append "https://github.com/audacity/audacity/archive" >> - "/Audacity-" version ".zip")) >> + "/Audacity-" version ".tar.gz")) >> (sha256 >> - (base32 "1642i9d5cdmqzj6r0qdl2ldnqsvpb08znnczncysi72x6zpvb5qq")) >> - (patches (search-patches "audacity-fix-ffmpeg-binding.patch")))) >> + (base32 "11mx7gb4dbqrgfp7hm0154x3m76ddnmhf2675q5zkxn7jc5qfc6b")) >> + ;; Replace time-dependent strings. >> + (modules '((guix build utils))) >> + (snippet >> + '(substitute* "src/AboutDialog.cpp" >> + (("__DATE__") "\"2017\"") >> + (("__TIME__") "\"00:00\""))))) > > Now that we're merging core-updates where GCC have been patched to > respect SOURCE_DATE_EPOCH in these macros, this substitution should no > longer be necessary. Can you verify? :) > It works! \o/ >> (build-system gnu-build-system) >> (inputs >> ;; TODO: Add portSMF and libwidgetextra once they're packaged. In-tree >> @@ -73,7 +79,10 @@ >> ("lilv" ,lilv) >> ("portaudio" ,portaudio))) >> (native-inputs >> - `(("gettext" ,gettext-minimal) ;for msgfmt >> + `(("autoconf" ,autoconf) >> + ("automake" ,automake) >> + ("gettext" ,gettext-minimal) ;for msgfmt >> + ("libtool" ,libtool) >> ("pkg-config" ,pkg-config) >> ("python" ,python-2) >> ("which" ,which))) >> @@ -90,6 +99,12 @@ >> (string-append "ID3TAG_LIBS=-L" libid3tag "/lib -lid3tag -lz") >> (string-append "LIBMAD_CFLAGS=-I" libmad "/include") >> (string-append "LIBMAD_LIBS=-L" libmad "/lib -lmad"))) >> + #:phases >> + (modify-phases %standard-phases >> + ;; Ensure the usage of system libraries. >> + (add-before 'configure 'autoreconf >> + (lambda _ >> + (zero? (system* "autoreconf" "-vfi"))))) > > Can you clarify how autoreconf ensures usage of system libraries? > Usually it just re-generates configure scripts and Makefiles from > templates, but should not make any functional difference. > > Thanks! FFmpeg is not detected if autoreconf doesn't run for some reason. With this phase, everything is detected like normal. Also, the audacityteam.org URL leads to another webpage with a seemingly impermanent link to the tarball*. I get the following: https://download.fosshub.com/Protected/expiretime=1491206292;badurl=aHR0cDovL3d3dy5mb3NzaHViLmNvbS9BdWRhY2l0eS5odG1s/c9aee3215609f12a03856bbf4732fa9ddcaf0424361dc96c6919a3b6543265bb/Audacity/audacity-minsrc-2.1.3.tar.xz * Take a look at the following thread to see what happened last time with this topic. I'm not getting the 403 errors that I was getting before though: https://lists.gnu.org/archive/html/guix-devel/2017-01/msg01093.html --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAljhqeQACgkQ5qXuPBlG eg1E/w//etCe7ee2h/WiciyErjuQEF/7I9uGL3qM0FLgl/FFOq15GM3YSJzHFsLt cNk8AGdHvIpEGpVmigUv4FMOUDLaL0ZRoLTKjzAssAMMVsRUhR64j1FCN2JbezlT uZ1yIHIMhBHzEWm2i8xHaUc6C7/kjW6PqarkW80eJxGqir3egMAGmIU7jevJGwNd QVumgoKQnOr8IJ8v/ilbWl8u2dfjH1Z6J/YsNf/iLjXC56OmHo/56e0kj2tujHNU QyPccgNO6tcy5oVN9P+uK/kDuM9cGO1WjsabBFWYlkdAsgWUGNSRlymphbffMBuQ 1tz16xAeiWJe2klZ6Hn4ZYr/v7w30Ehej2qvWKtqAKjW1qxPUCjLuKgMSHCERco7 kAfu28Ifs5Z30eVaW6kQwq8JKI4oL0ETHB81bt+IgzvndIk0IPzgcAWf/6VrH+bI 6vy/vOBzG39O2480JTUIWv86ic9aCuu7eov1EEdCMsvtdDLZipdmjZl+JWwEWCFS FHahz8tDoahIiEECRqHAdci36LfQybB9789xcphcrhlMelQ/gKdHQFMVxNejZ7Zu r5OJA75NkfKAxNpgytIqNusvb0P+LI6h+LxpSfdgOHNt/M0Xj9FZhKz+6QKuXSkM wcseHgpdbH1JQs2XYXtoQHiWx5MRgf/7TWxj3DaCZshf0K3TG68= =ZIUv -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 22 07:38:36 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26343: [PATCH] gnu: audacity: Update to 2.1.3. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 03 Apr 2017 12:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26343 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Kei Kebreau Cc: 26343@debbugs.gnu.org Received: via spool by 26343-submit@debbugs.gnu.org id=B26343.149122321726451 (code B ref 26343); Mon, 03 Apr 2017 12:41:02 +0000 Received: (at 26343) by debbugs.gnu.org; 3 Apr 2017 12:40:17 +0000 Received: from localhost ([127.0.0.1]:58179 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cv1HM-0006sZ-N3 for submit@debbugs.gnu.org; Mon, 03 Apr 2017 08:40:16 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:56760) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cv1HK-0006sQ-UX for 26343@debbugs.gnu.org; Mon, 03 Apr 2017 08:40:15 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 89F73207EE; Mon, 3 Apr 2017 08:40:12 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Mon, 03 Apr 2017 08:40:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=XFHW+dmdFpsK5d44Cb6G//A2XYO+KTmZuD+RMttDN TU=; b=u0eXEUqpj4IaVhZggUhsn2VHoRTGvURqAQVZBD3uDHMKdzdKirtd60dNe P5GbyMuJ0pNB5JBaQw5lTtRTYYw2EwGNpti3yvbBJV7NYaKLiPcqCXp7HX3bRvhD V364vJqDmNp6+eqtu30kUY9BoRFDBOdfbjObwpQhdenSXvKQDCuXH+OepRWpW4su cIdZ5YrQZruxE8O+gI4VhLVUlbgexJEupvm1URxPM2HInl9L5e4AULi80+sa5Uco 3R27a5/Nt3B3HFO9MZwiplub2B+Mg5LxCFoMxg0/fn7cuTEKKvSwbn1WhMv7IXQg 3+2HF+SsfbKGI2eQ4zOVO69JzJ/ow== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=XFHW+dmdFpsK5d44Cb 6G//A2XYO+KTmZuD+RMttDNTU=; b=P/XkTDZr26Srj82L8WVixyw7azf7NxmTem 0t0qdwCBsghahvUwkiygtmMy3oSN0I5pOiDtR0s537SpFq06USN96Q0lLr8f5KHz l34dcgftlJRwWCuIS0lgX4NT1MCPJh4gb0N4QtZ43ny80cl8IdkyZkSnZSU7FMON D1MJPZwlzUVnDuNrQ1kZrWKH/XDjGdYt27N4c1pNrdoPAYfgDOQJsS2YgqlagSUT bepYtI7Edl9O9GBuJW9yjOa0yTwFKAdkdEGo96UF1Cmy8NsQj25uu4+eJsBJXWyD /bTdnYQOA+SwwzBcVHk5TW9vlhOpWVueULufbC9EpwLuqi+kY2Og== X-ME-Sender: X-Sasl-enc: /OwGaEBHv8XOJv4vAW0WASZMQ2mVHV+K8l4ykHVrZn/8 1491223212 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 27CDB240B2; Mon, 3 Apr 2017 08:40:12 -0400 (EDT) From: Marius Bakke In-Reply-To: <87pogu45y3.fsf@openmailbox.org> References: <20170402155211.23494-1-kei@openmailbox.org> <87y3viv55d.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <87pogu45y3.fsf@openmailbox.org> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Mon, 03 Apr 2017 14:40:10 +0200 Message-ID: <87lgrhbr6d.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) 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: -0.7 (/) --=-=-= Content-Type: text/plain Kei Kebreau writes: > Marius Bakke writes: > >>> (build-system gnu-build-system) >>> (inputs >>> ;; TODO: Add portSMF and libwidgetextra once they're packaged. In-tree >>> @@ -73,7 +79,10 @@ >>> ("lilv" ,lilv) >>> ("portaudio" ,portaudio))) >>> (native-inputs >>> - `(("gettext" ,gettext-minimal) ;for msgfmt >>> + `(("autoconf" ,autoconf) >>> + ("automake" ,automake) >>> + ("gettext" ,gettext-minimal) ;for msgfmt >>> + ("libtool" ,libtool) >>> ("pkg-config" ,pkg-config) >>> ("python" ,python-2) >>> ("which" ,which))) >>> @@ -90,6 +99,12 @@ >>> (string-append "ID3TAG_LIBS=-L" libid3tag "/lib -lid3tag -lz") >>> (string-append "LIBMAD_CFLAGS=-I" libmad "/include") >>> (string-append "LIBMAD_LIBS=-L" libmad "/lib -lmad"))) >>> + #:phases >>> + (modify-phases %standard-phases >>> + ;; Ensure the usage of system libraries. >>> + (add-before 'configure 'autoreconf >>> + (lambda _ >>> + (zero? (system* "autoreconf" "-vfi"))))) >> >> Can you clarify how autoreconf ensures usage of system libraries? >> Usually it just re-generates configure scripts and Makefiles from >> templates, but should not make any functional difference. > > FFmpeg is not detected if autoreconf doesn't run for some reason. With > this phase, everything is detected like normal. Oh. Please mention that in the comment then. Thank you! :) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAljiQqoACgkQoqBt8qM6 VPrn/wf/UgDYBmx3M0XCGNX9tEhmUe1GUTefhps5vnXCE0BT3Ek+Yb4PIQjTlZzV ySf73AY80iTLX9VBy3JCCjp5b+dkxmQxbhMcm9BfdLtptHaJARRLbvaydn13DXpk gjL3GGlvHeFCn8qkpbHredvXb3kL1Plw/L+12uySfVeG1c9QMu+vKc9jhdJRx9DC OYZQiFRBETPCAy3QPcFfMr4xy+gp997bR/te8FyxAYHWkVGRnyBK5jmoBdiHUEwS 2TBfXK2eMkZY6KrZpPfp5WAwaN1lUBMC8bdm5uWrw6Kac2AFI7QiCJPyX0EaD4rb +8VZOrCgZVMo8iZptCBm3IqgMM6tgQ== =kvrD -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 22 07:38:36 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Kei Kebreau Subject: bug#26343: closed (Re: bug#26343: [PATCH] gnu: audacity: Update to 2.1.3.) Message-ID: References: <87efx94hes.fsf@openmailbox.org> <20170402155211.23494-1-kei@openmailbox.org> X-Gnu-PR-Message: they-closed 26343 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 26343@debbugs.gnu.org Date: Mon, 03 Apr 2017 15:54:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1491234843-27475-1" This is a multi-part message in MIME format... ------------=_1491234843-27475-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #26343: [PATCH] gnu: audacity: Update to 2.1.3. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 26343@debbugs.gnu.org. --=20 26343: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D26343 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1491234843-27475-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 26343-done) by debbugs.gnu.org; 3 Apr 2017 15:53:08 +0000 Received: from localhost ([127.0.0.1]:59328 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cv4Hz-00077y-O5 for submit@debbugs.gnu.org; Mon, 03 Apr 2017 11:53:07 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:54888 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cv4Hx-00077o-W2 for 26343-done@debbugs.gnu.org; Mon, 03 Apr 2017 11:53:06 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id DFBF1502458; Mon, 3 Apr 2017 17:53:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1491234784; bh=EqYfMREMXJC2nnhUI94E5/pXTyOLtG3simtxTJ/p8BI=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=truKfRCOQDX7VeAhXP60SLg8lRLtFroCL3jV626GylHisirqdKpvNZ17loDy8QmsV xB7QIRHYYrY5mTJNeIBW14LrhqPdLB8ZEwp/D4+Uw75gdRqiCOiRLDMhphz5btU77m C1vyLN/u5P2QtmbtELWqQlkTIbTOPkQZGYIMsYM8= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ZDZR003 X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=NO_RECEIVED,NO_RELAYS, T_DKIM_INVALID autolearn=disabled version=3.4.0 From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1491234784; bh=EqYfMREMXJC2nnhUI94E5/pXTyOLtG3simtxTJ/p8BI=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=truKfRCOQDX7VeAhXP60SLg8lRLtFroCL3jV626GylHisirqdKpvNZ17loDy8QmsV xB7QIRHYYrY5mTJNeIBW14LrhqPdLB8ZEwp/D4+Uw75gdRqiCOiRLDMhphz5btU77m C1vyLN/u5P2QtmbtELWqQlkTIbTOPkQZGYIMsYM8= To: Marius Bakke Subject: Re: bug#26343: [PATCH] gnu: audacity: Update to 2.1.3. References: <20170402155211.23494-1-kei@openmailbox.org> <87y3viv55d.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <87pogu45y3.fsf@openmailbox.org> <87lgrhbr6d.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> Date: Mon, 03 Apr 2017 11:52:59 -0400 In-Reply-To: <87lgrhbr6d.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> (Marius Bakke's message of "Mon, 03 Apr 2017 14:40:10 +0200") Message-ID: <87efx94hes.fsf@openmailbox.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 26343-done Cc: 26343-done@debbugs.gnu.org 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: 0.0 (/) --=-=-= Content-Type: text/plain Marius Bakke writes: > Kei Kebreau writes: > >> Marius Bakke writes: >> >>>> (build-system gnu-build-system) >>>> (inputs >>>> ;; TODO: Add portSMF and libwidgetextra once they're packaged. In-tree >>>> @@ -73,7 +79,10 @@ >>>> ("lilv" ,lilv) >>>> ("portaudio" ,portaudio))) >>>> (native-inputs >>>> - `(("gettext" ,gettext-minimal) ;for msgfmt >>>> + `(("autoconf" ,autoconf) >>>> + ("automake" ,automake) >>>> + ("gettext" ,gettext-minimal) ;for msgfmt >>>> + ("libtool" ,libtool) >>>> ("pkg-config" ,pkg-config) >>>> ("python" ,python-2) >>>> ("which" ,which))) >>>> @@ -90,6 +99,12 @@ >>>> (string-append "ID3TAG_LIBS=-L" libid3tag "/lib -lid3tag -lz") >>>> (string-append "LIBMAD_CFLAGS=-I" libmad "/include") >>>> (string-append "LIBMAD_LIBS=-L" libmad "/lib -lmad"))) >>>> + #:phases >>>> + (modify-phases %standard-phases >>>> + ;; Ensure the usage of system libraries. >>>> + (add-before 'configure 'autoreconf >>>> + (lambda _ >>>> + (zero? (system* "autoreconf" "-vfi"))))) >>> >>> Can you clarify how autoreconf ensures usage of system libraries? >>> Usually it just re-generates configure scripts and Makefiles from >>> templates, but should not make any functional difference. >> >> FFmpeg is not detected if autoreconf doesn't run for some reason. With >> this phase, everything is detected like normal. > > Oh. Please mention that in the comment then. Thank you! :) Pushed to master. Thanks for the review! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAljib9sACgkQ5qXuPBlG eg0AMA//ZB+/bsiBs3KDv5EeMXeKt+KpjjNGRmEZmyLOQyDJspHVAfY2hydU5OGf fT5quqtXykIXWMauZLjsUAHiRenL+F61EZ9FK5NXpilgHIaQlkRCONePbKCNHXN4 5wtpYkQTqVnjXNfphoR0Ei0POrBlWdXCoyOdJVs919WuUx6y9MJbDAgW656B4tYG 2gK1HPUmyI6qTsJgoZDBDTIUV7GKQBYZfnbzmvjY1BlNg7C9RpLnhIp0Zd5YVCvj YUrjnKHQTv4xeIBegEfD8PvytgSNp1pTvZfA1WIa+4P09TEXVCfZlECoMyFe2uFL kE063fJxQvz3vy89ti6GFmBwMx2aFaEzCuZ/ppuKn8QDl/4xwGx4zVACumum7y+M KLoTd3zi2MJCojtiWCqlFQDr6coFOgPu6D96WJjBkHcLKsREhM0IngimFtWt6cdm 8NF/be/hTSHEdD+KNgOKejUJbHro8LoP9Cz69Vpu2S2zuMBjTcW4GYX8UDLXQKP6 mvahZC4Nl+wV9Jx8XDAVDGqOXCH6z6nBje/emKr+ikX1BTZ1V1qLpVgBMkVFrTyA b3Ya3/8FEOqab5AbRx4Fzki3sXO1dHfBf3AExEY5dqxJ3WLhrMfCIiQ/DYSI89bU WoUyTHTQV0U0LQAQoTmDRBUBOdlQEQ9O+g+fS3Fv59lzRsIFQPY= =XWUA -----END PGP SIGNATURE----- --=-=-=-- ------------=_1491234843-27475-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 2 Apr 2017 15:52:39 +0000 Received: from localhost ([127.0.0.1]:57654 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cuhnz-0007Jq-04 for submit@debbugs.gnu.org; Sun, 02 Apr 2017 11:52:39 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41267) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cuhnu-0007JR-I2 for submit@debbugs.gnu.org; Sun, 02 Apr 2017 11:52:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cuhno-0008Ip-8B for submit@debbugs.gnu.org; Sun, 02 Apr 2017 11:52:29 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:57053) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cuhno-0008Ic-4S for submit@debbugs.gnu.org; Sun, 02 Apr 2017 11:52:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60468) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cuhnm-0008Lf-Bb for guix-patches@gnu.org; Sun, 02 Apr 2017 11:52:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cuhni-0008GC-PU for guix-patches@gnu.org; Sun, 02 Apr 2017 11:52:26 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:40984 helo=mail.openmailbox.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cuhni-0008EG-DB for guix-patches@gnu.org; Sun, 02 Apr 2017 11:52:22 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id AAABC50F93F; Sun, 2 Apr 2017 17:52:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1491148339; bh=BHkewYZOw/7AWMigrjMCauE2mp+oIHsRBOcZHYDi9+0=; h=From:To:Cc:Subject:Date:From; b=c2ctz6OBsEoBuotd8N3AJAaZvfSfJALajOnZsQ/R6gT/NkBowi8cg6/vh3IM50L+Z gLg6dFQaDlm+A57zxKnVcmlBNawLoyIWKiTS5sjCqRVDKrPjq2TybqU23vjgmPkVkY ENQ8UR0EXxSTP0Sh14A1mhIRcdGHoSZnOAkgAa34= From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1491148338; bh=BHkewYZOw/7AWMigrjMCauE2mp+oIHsRBOcZHYDi9+0=; h=From:To:Cc:Subject:Date:From; b=ImMyM8pnLaXZUqirEmJtr6roRUWDnIgkQaX3yN3m/y3CDSilI50y0dKZmxrXMHkml IC9W9nidsouoh/JtuW+Z3RuUYiPBko7ULWjm85EcUB35olQYlpXMm3Uy+KssXMXB3I 9twvDq55QXHwf/q2Vt/iY9ufqR74VovVQr18rp7c= To: guix-patches@gnu.org Subject: [PATCH] gnu: audacity: Update to 2.1.3. Date: Sun, 2 Apr 2017 11:52:11 -0400 Message-Id: <20170402155211.23494-1-kei@openmailbox.org> X-Mailer: git-send-email 2.12.2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit Cc: Kei Kebreau 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: -4.0 (----) * gnu/packages/audacity.scm (audacity): Update to 2.1.3. [source]: Fetch gzipped tar archive instead of a zip archive; add snippet to remove time-dependent code; remove unnecessary patch. [native-inputs]: Add autoconf, automake and libtool. [arguments]: Add autoreconf phase to detect system libraries. * gnu/packages/patches/audacity-fix-ffmpeg-binding.patch: Delete patch. * gnu/local.mk: Remove reference to removed patch. --- gnu/local.mk | 1 - gnu/packages/audacity.scm | 25 +++++++++++++---- .../patches/audacity-fix-ffmpeg-binding.patch | 32 ---------------------- 3 files changed, 20 insertions(+), 38 deletions(-) delete mode 100644 gnu/packages/patches/audacity-fix-ffmpeg-binding.patch diff --git a/gnu/local.mk b/gnu/local.mk index 68f561e95..f03f50855 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -494,7 +494,6 @@ dist_patch_DATA = \ %D%/packages/patches/ath9k-htc-firmware-binutils.patch \ %D%/packages/patches/ath9k-htc-firmware-gcc.patch \ %D%/packages/patches/ath9k-htc-firmware-objcopy.patch \ - %D%/packages/patches/audacity-fix-ffmpeg-binding.patch \ %D%/packages/patches/automake-skip-amhello-tests.patch \ %D%/packages/patches/automake-regexp-syntax.patch \ %D%/packages/patches/automake-test-gzip-warning.patch \ diff --git a/gnu/packages/audacity.scm b/gnu/packages/audacity.scm index a70d0e3a6..a4ac2a6ff 100644 --- a/gnu/packages/audacity.scm +++ b/gnu/packages/audacity.scm @@ -23,6 +23,7 @@ #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages audio) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages gettext) #:use-module (gnu packages gtk) @@ -39,15 +40,20 @@ (define-public audacity (package (name "audacity") - (version "2.1.2") + (version "2.1.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/audacity/audacity/archive" - "/Audacity-" version ".zip")) + "/Audacity-" version ".tar.gz")) (sha256 - (base32 "1642i9d5cdmqzj6r0qdl2ldnqsvpb08znnczncysi72x6zpvb5qq")) - (patches (search-patches "audacity-fix-ffmpeg-binding.patch")))) + (base32 "11mx7gb4dbqrgfp7hm0154x3m76ddnmhf2675q5zkxn7jc5qfc6b")) + ;; Replace time-dependent strings. + (modules '((guix build utils))) + (snippet + '(substitute* "src/AboutDialog.cpp" + (("__DATE__") "\"2017\"") + (("__TIME__") "\"00:00\""))))) (build-system gnu-build-system) (inputs ;; TODO: Add portSMF and libwidgetextra once they're packaged. In-tree @@ -73,7 +79,10 @@ ("lilv" ,lilv) ("portaudio" ,portaudio))) (native-inputs - `(("gettext" ,gettext-minimal) ;for msgfmt + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gettext" ,gettext-minimal) ;for msgfmt + ("libtool" ,libtool) ("pkg-config" ,pkg-config) ("python" ,python-2) ("which" ,which))) @@ -90,6 +99,12 @@ (string-append "ID3TAG_LIBS=-L" libid3tag "/lib -lid3tag -lz") (string-append "LIBMAD_CFLAGS=-I" libmad "/include") (string-append "LIBMAD_LIBS=-L" libmad "/lib -lmad"))) + #:phases + (modify-phases %standard-phases + ;; Ensure the usage of system libraries. + (add-before 'configure 'autoreconf + (lambda _ + (zero? (system* "autoreconf" "-vfi"))))) ;; The test suite is not "well exercised" according to the developers, ;; and fails with various errors. See ;; . diff --git a/gnu/packages/patches/audacity-fix-ffmpeg-binding.patch b/gnu/packages/patches/audacity-fix-ffmpeg-binding.patch deleted file mode 100644 index d6d65338d..000000000 --- a/gnu/packages/patches/audacity-fix-ffmpeg-binding.patch +++ /dev/null @@ -1,32 +0,0 @@ -This resolves some "declaration of C function conflicts with previous -declaration" errors during compilation. - ---- a/src/FFmpeg.h 2015-02-21 00:33:33.853857529 +0100 -+++ b/src/FFmpeg.h 2015-02-21 00:35:09.626497205 +0100 -@@ -688,7 +688,7 @@ - FFMPEG_FUNCTION_WITH_RETURN( - AVOutputFormat*, - av_oformat_next, -- (AVOutputFormat *f), -+ (const AVOutputFormat *f), - (f) - ); - FFMPEG_FUNCTION_WITH_RETURN( -@@ -755,7 +755,7 @@ - FFMPEG_FUNCTION_WITH_RETURN( - int, - av_fifo_size, -- (AVFifoBuffer *f), -+ (const AVFifoBuffer *f), - (f) - ); - FFMPEG_FUNCTION_WITH_RETURN( -@@ -801,7 +801,7 @@ - FFMPEG_FUNCTION_WITH_RETURN( - AVDictionaryEntry *, - av_dict_get, -- (AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags), -+ (const AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags), - (m, key, prev, flags) - ); - FFMPEG_FUNCTION_WITH_RETURN( -- 2.12.2 ------------=_1491234843-27475-1--