From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60953) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cunbS-0002tf-3y for guix-patches@gnu.org; Sun, 02 Apr 2017 18:04:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cunbO-0007mO-UK for guix-patches@gnu.org; Sun, 02 Apr 2017 18:04:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:59641) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cunbO-0007lV-70 for guix-patches@gnu.org; Sun, 02 Apr 2017 18:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cunbN-0001A6-SD for guix-patches@gnu.org; Sun, 02 Apr 2017 18:04:01 -0400 Subject: bug#26343: [PATCH] gnu: audacity: Update to 2.1.3. Resent-Message-ID: From: Marius Bakke In-Reply-To: <20170402155211.23494-1-kei@openmailbox.org> References: <20170402155211.23494-1-kei@openmailbox.org> 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" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Kei Kebreau , 26343@debbugs.gnu.org --=-=-= 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----- --=-=-=--