From patchwork Sat Aug 6 20:42:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 41315 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 6EBEB27BBEA; Sat, 6 Aug 2022 21:43:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 BC41027BBE9 for ; Sat, 6 Aug 2022 21:43:14 +0100 (BST) Received: from localhost ([::1]:49082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oKQdd-0003bM-SR for patchwork@mira.cbaines.net; Sat, 06 Aug 2022 16:43:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37350) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oKQdS-0003YS-Nd for guix-patches@gnu.org; Sat, 06 Aug 2022 16:43:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45733) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oKQdS-00015J-FF for guix-patches@gnu.org; Sat, 06 Aug 2022 16:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oKQdS-00057y-7t for guix-patches@gnu.org; Sat, 06 Aug 2022 16:43:02 -0400 Subject: bug#56668: [PATCH] gnu: Add wavbreaker Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Sat, 06 Aug 2022 20:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 56668 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Joeke de Graaf Cc: Maxime Devos , 56668-done@debbugs.gnu.org Mail-Followup-To: 56668@debbugs.gnu.org, ludo@gnu.org, joeke@posteo.net Received: via spool by 56668-done@debbugs.gnu.org id=D56668.165981856019676 (code D ref 56668); Sat, 06 Aug 2022 20:43:02 +0000 Received: (at 56668-done) by debbugs.gnu.org; 6 Aug 2022 20:42:40 +0000 Received: from localhost ([127.0.0.1]:35481 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oKQd5-00057H-Jr for submit@debbugs.gnu.org; Sat, 06 Aug 2022 16:42:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52612) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oKQd1-000572-1S for 56668-done@debbugs.gnu.org; Sat, 06 Aug 2022 16:42:38 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:42442) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oKQcu-000144-Pl; Sat, 06 Aug 2022 16:42:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=SABEff3xsVIjESDj/RIH4yGHkbKDs+Dvn67+xocPsyo=; b=B1WFdl6KQaM4qV11tGL/ u0LBHWDMFLbGckiMotrq4XzTLPAC6SyV+YgTUfW7OMJAG3mMfPzZROqgS+0Of3FRi28KPGGArQUUj aTZ8f2uo3lubnCvf3H4i682I8M/jlRDkMQSCnx1JdjdojP5aBOZpUjMl5vdpwCDr0pXFg285hemlZ ySh4u4c/MW4WLi5LvtEm59EffEondkIck+Epj6GI4ksawd3XjtCKj5bL4nfUDAedrDPYuFrnVczLk P7K4nj/tZv7kpZiB4zE9lA2pI0qbFTJ3MKS3lM6iBn41h2sPEUn79onufDUpwojCn4ektVxyQzrUk 5qrYRJDTV1yuOg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:57126 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oKQcu-0007kB-CV; Sat, 06 Aug 2022 16:42:28 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= References: <87r12gj8bt.fsf@bolo-santosi.mail-host-address-is-not-set> <714ebc67b8a09e7f37fdd51c1e83c018@posteo.net> Date: Sat, 06 Aug 2022 22:42:23 +0200 In-Reply-To: <714ebc67b8a09e7f37fdd51c1e83c018@posteo.net> (Joeke de Graaf's message of "Wed, 27 Jul 2022 23:43:38 +0000") Message-ID: <87iln5dryo.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi Joeke, Joeke de Graaf skribis: > I've modified my patch to make wavbreaker work in pure environments. > > The only thing I haven't been able to fix is the program's own icon in > Gnome's activity overview (the overview of open programs one gets when > one presses the super key). > If wavbreaker is run in a pure environment, this icon does not show > up. Otherwise, the program seems to run fine. Sounds good. Applied with the formatting changes below: keeping inputs fields next to one another, avoiding long lines, replacing tabulations with spaces (as suggested by ‘guix lint’), and removing extra space from the description. I also added a commit log that follows our conventions¹. Thank you, and thanks Maxime for reviewing! Ludo’. ¹ https://guix.gnu.org/manual/devel/en/html_node/Submitting-Patches.html diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 406ebb9233..e2b112832b 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -752,55 +752,64 @@ (define-public wavbreaker (name "wavbreaker") (version "0.15") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/thp/wavbreaker/") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "16h0sfcb8av6a368giizzwv9m0lq5c3bnf4b9vyyh9nkbbsc7c3j")))) + (method git-fetch) + (uri (git-reference + (url "https://github.com/thp/wavbreaker/") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "16h0sfcb8av6a368giizzwv9m0lq5c3bnf4b9vyyh9nkbbsc7c3j")))) (build-system meson-build-system) - (native-inputs - (list pkg-config cmake)) (arguments '(#:modules ((guix build utils) - (guix build meson-build-system)) + (guix build meson-build-system)) #:phases (modify-phases %standard-phases - (add-after 'install 'wrap-program - ;; This wrapping is necessary to make wavbreaker find things it needs in pure environments - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (adwaita-icons (assoc-ref inputs "adwaita-icon-theme")) - (hicolor-icons (assoc-ref inputs "hicolor-icon-theme")) - (shared-mime (assoc-ref inputs "shared-mime-info"))) - (wrap-program (string-append out "/bin/wavbreaker") - ;; Needed in order for wavbreakere to find the icons it needs - `("XDG_DATA_DIRS" ":" prefix ,(map (lambda (package) - (string-append package - "/share")) - `(,out ;; For wavbreaker's icon - ,adwaita-icons - ,hicolor-icons - ,shared-mime))) - ;; This is necessary to load some pixbufs like Adwaita's check-symbolic.svg - ;; and wavbreaker's own logo in the 'about' section - `("GDK_PIXBUF_MODULE_FILE" = - (,(getenv "GDK_PIXBUF_MODULE_FILE"))) - ;; Needed for GTK's file chooser to not crash - `("GSETTINGS_SCHEMA_DIR" = + (add-after 'install 'wrap-program + ;; This wrapping is necessary to make wavbreaker find things it + ;; needs in pure environments. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (adwaita-icons (assoc-ref inputs "adwaita-icon-theme")) + (hicolor-icons (assoc-ref inputs "hicolor-icon-theme")) + (shared-mime (assoc-ref inputs "shared-mime-info"))) + (wrap-program (string-append out "/bin/wavbreaker") + ;; Needed in order for wavbreakere to find the icons it needs + `("XDG_DATA_DIRS" ":" prefix + ,(map (lambda (package) + (string-append package "/share")) + `(,out ;for wavbreaker's icon + ,adwaita-icons + ,hicolor-icons + ,shared-mime))) + ;; This is necessary to load some pixbufs like Adwaita's + ;; check-symbolic.svg and wavbreaker's own logo in the + ;; 'about' section. + `("GDK_PIXBUF_MODULE_FILE" = + (,(getenv "GDK_PIXBUF_MODULE_FILE"))) + ;; Needed for GTK's file chooser to not crash. + `("GSETTINGS_SCHEMA_DIR" = (,(string-append (assoc-ref inputs "gtk+") "/share/glib-2.0/schemas")))))))))) - (inputs (list glib gtk+ ao bash-minimal adwaita-icon-theme shared-mime-info hicolor-icon-theme gsettings-desktop-schemas)) + (native-inputs + (list pkg-config cmake)) + (inputs + (list glib + gtk+ + ao + bash-minimal + adwaita-icon-theme + shared-mime-info + hicolor-icon-theme + gsettings-desktop-schemas)) (home-page "https://wavbreaker.sourceforge.io/") (synopsis "WAV and MP3 file splitter with a GUI") (description - "Wavbreaker is a WAV and MP3 file splitter. It can be used to - break up a WAV or MP3 audio file into multiple WAV files. - Wavbreaker contains a helpful waveform display of the audio file - being edited, to help the user in splitting the file at the right - point. Wavbreaker also supports splitting MP3 files without - re-encoding them, to preserve their original audio quality.") + "Wavbreaker is a WAV and MP3 file splitter. It can be used to break up a +WAV or MP3 audio file into multiple WAV files. Wavbreaker contains a helpful +waveform display of the audio file being edited, to help the user in splitting +the file at the right point. Wavbreaker also supports splitting MP3 files +without re-encoding them, to preserve their original audio quality.") (license license:gpl2+)))