From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 8G6eIC3KY1+AYQAA0tVLHw (envelope-from ) for ; Thu, 17 Sep 2020 20:42:21 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 2HV3HC3KY18ufwAAB5/wlQ (envelope-from ) for ; Thu, 17 Sep 2020 20:42:21 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 87FA8940390 for ; Thu, 17 Sep 2020 20:42:20 +0000 (UTC) Received: from localhost ([::1]:42574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJ0jS-00053z-EA for larch@yhetil.org; Thu, 17 Sep 2020 16:42:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40430) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJ0jH-00053W-CD for guix-patches@gnu.org; Thu, 17 Sep 2020 16:42:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55913) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kJ0jC-0003HE-8l for guix-patches@gnu.org; Thu, 17 Sep 2020 16:42:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kJ0jC-0008Ey-60 for guix-patches@gnu.org; Thu, 17 Sep 2020 16:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43433] [PATCH v2] gnu: Add cozy. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 17 Sep 2020 20:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43433 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43433@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 43433-submit@debbugs.gnu.org id=B43433.160037529331640 (code B ref 43433); Thu, 17 Sep 2020 20:42:02 +0000 Received: (at 43433) by debbugs.gnu.org; 17 Sep 2020 20:41:33 +0000 Received: from localhost ([127.0.0.1]:39226 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kJ0ie-0008EB-Eg for submit@debbugs.gnu.org; Thu, 17 Sep 2020 16:41:33 -0400 Received: from mout02.posteo.de ([185.67.36.66]:33607) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kJ0ib-0008Dw-8j for 43433@debbugs.gnu.org; Thu, 17 Sep 2020 16:41:26 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id A79812400FE for <43433@debbugs.gnu.org>; Thu, 17 Sep 2020 22:41:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1600375278; bh=YvjAMZrD6v4w20cdthHqOiwPrTNpoGnsBvJ7glyhMC8=; h=From:To:Cc:Subject:Date:From; b=APtwLyywjc9PLQY2BGaWtAYS4f54bCBJrdzEV0wX5DWljK5+i64vniA2448oRHChi 4B2g7m+1Ab/VF5004i7KXwBk2AOFs+7cAUGsASYk096hpvVtJOS1BzhWvYW1pSIO73 p9sTiEOqPMPte4zndbD7syJ2b9N48o0wNgf7ysx5CFpm/i7tx2R1ODfo7MhEbeBRdn vC3nZQSB1XlWErJq8XdT0+8yOlcwU0ppdNFw/u3wQi7VZWLoIY2Mgoi+Z8SwTzyaPY AxeoNI+hg4rdrfxbiDjSjXMRYTLW94CAq5OL62SqC3bkir0+8tYP766TsVMWriI3vd TyzJdUoD7ppGg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Bsplc4tJMz6tmG; Thu, 17 Sep 2020 22:41:16 +0200 (CEST) From: Vinicius Monego Date: Thu, 17 Sep 2020 17:40:29 -0300 Message-Id: <20200917204029.51254-1-monego@posteo.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <87een07b4a.fsf@gnu.org> References: <87een07b4a.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=posteo.net header.s=2017 header.b=APtwLyyw; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 1.09 X-TUID: UYQ5SRoEQGBJ * gnu/packages/ebook.scm (cozy): New variable. --- Added phase to rename the executable. Added phase to patch desktop file for the renamed executable. Added python-wrapper as native-input because it's checked for in configure phase. Wrapped lines to fit under the 78 columns limit. Added license information for the bundled python-inject. Removed comment about python-magic. gnu/packages/ebook.scm | 105 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index b7c78b6a64..a8212df031 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,26 +27,32 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix git-download) #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages databases) + #:use-module (gnu packages file) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages fribidi) #:use-module (gnu packages gcc) + #:use-module (gnu packages gettext) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) #:use-module (gnu packages glib) + #:use-module (gnu packages gstreamer) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages javascript) #:use-module (gnu packages libusb) #:use-module (gnu packages libreoffice) + #:use-module (gnu packages music) #:use-module (gnu packages pdf) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -405,6 +412,104 @@ following formats: @end enumerate") (license license:gpl2+))) +(define-public cozy + (package + (name "cozy") + (version "0.6.19") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/geigi/cozy") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1f1qydjs8sz39yhlg9qdjf31vrsmdk2pxiimw4fzsy1k2zr5dr34")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-desktop-file + (lambda _ + (substitute* "data/com.github.geigi.cozy.desktop.in" + (("com.github.geigi.cozy") "cozy")) + #t)) + (add-after 'install 'patch-executable-name + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion + (string-append (assoc-ref outputs "out") "/bin") + (rename-file "com.github.geigi.cozy" "cozy")) + #t)) + (add-after 'wrap 'wrap-libs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (pylib (string-append + out "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH")) + (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")) + (libmagic-path (string-append + (assoc-ref %build-inputs "file") + "/lib")) + (python-path (getenv "PYTHONPATH"))) + (wrap-program (string-append out "/bin/cozy") + `("LD_LIBRARY_PATH" ":" prefix (,libmagic-path)) + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) + `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)) + `("PYTHONPATH" ":" prefix (,python-path ,pylib)))) + #t))))) + (native-inputs + `(("desktop-file-utils" ,desktop-file-utils) + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("gtk+:bin" ,gtk+ "bin") + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) + (inputs + `(("file" ,file) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gst-libav" ,gst-libav) + ("gst-plugins-bad" ,gst-plugins-bad) + ("gst-plugins-good" ,gst-plugins-good) + ("gst-plugins-ugly" ,gst-plugins-ugly) + ("gtk+" ,gtk+) + ("python-apsw" ,python-apsw) + ("python-distro" ,python-distro) + ("python-gst" ,python-gst) + ("python-mutagen" ,python-mutagen) + ("python-peewee" ,python-peewee) + ("python-pycairo" ,python-pycairo) + ("python-pygobject" ,python-pygobject) + ("python-pytz" ,python-pytz) + ("python-requests" ,python-requests))) + (home-page "https://cozy.geigi.de/") + (synopsis "Modern audiobook player using GTK+") + (description + "Cozy is a modern audiobook player written in GTK+. + +Some of the current features: + +@itemize +@item Import your audiobooks into Cozy to browse them comfortably +@item Sort your audio books by author, reader & name +@item Remembers your playback position +@item Sleep timer +@item Playback speed control +@item Search your library +@item Offline mode +@item Add multiple storage locations +@item Drag & Drop to import new audio books +@item Support for DRM free mp3, m4a (aac, ALAC, …), flac, ogg, opus, wav files +@item Mpris integration (Media keys & playback info for desktop environment) +@end itemize") + ;; TODO: Unbundle python-inject. + (license (list license:gpl3+ ;cozy + license:asl2.0)))) ;python-inject (bundled dependency) + (define-public xchm (package (name "xchm") -- 2.20.1