From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id iENEHTcQs146LAAA0tVLHw (envelope-from ) for ; Wed, 06 May 2020 19:29:59 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id SCvVFkMQs15dAwAA1q6Kng (envelope-from ) for ; Wed, 06 May 2020 19:30:11 +0000 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::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 450D0940292 for ; Wed, 6 May 2020 19:30:08 +0000 (UTC) Received: from localhost ([::1]:37844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jWPk7-0004j6-Tn for larch@yhetil.org; Wed, 06 May 2020 15:30:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45740) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWPk3-0004iz-9H for guix-patches@gnu.org; Wed, 06 May 2020 15:30:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57915) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jWPk2-00081R-Vk for guix-patches@gnu.org; Wed, 06 May 2020 15:30:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jWPk2-0001nK-Q0 for guix-patches@gnu.org; Wed, 06 May 2020 15:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40994] patch#40994 Programs With Movie Titles (PWMT) Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 06 May 2020 19:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40994 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Raghav Gururajan , Brice Waegeneire Cc: 40994@debbugs.gnu.org Received: via spool by 40994-submit@debbugs.gnu.org id=B40994.15887933836850 (code B ref 40994); Wed, 06 May 2020 19:30:02 +0000 Received: (at 40994) by debbugs.gnu.org; 6 May 2020 19:29:43 +0000 Received: from localhost ([127.0.0.1]:41227 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWPjb-0001mI-Gg for submit@debbugs.gnu.org; Wed, 06 May 2020 15:29:43 -0400 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:57647) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWPjZ-0001m2-23 for 40994@debbugs.gnu.org; Wed, 06 May 2020 15:29:34 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 40CF46B0; Wed, 6 May 2020 15:29:25 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 06 May 2020 15:29:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm2; bh=bdn2wmNdEZcCKUNHg+bflyGnpH G6Ihx6P5dCDqe4BOM=; b=S03c1xvJeTFM8BseAM5hLf0nrB0la/ps/9RXxbeXX7 Ufocfdm7GqpVh4k4iptcrnv7b98bcLoUobFrzxlsaPNvcLZ0/Ba5CX1ak5ytezWr KvSTZlgGmyCfNb0f0Hz0+CM5AlGO7mZ5gKYYJt39MS+vwWLILj9g1DerUEHegOw0 1Z67in/4Tf1mgDYxUjJupeFVdsBGb+QZ9I7RbdT9grVTH9ph2EJL7DFPnIYyb62F aY9+1pMXMNXXuYqA7NMOJJXv6NHs5w8++VorHDHmKJSajSfhWjGM9gmr4g6HCkR+ JupfMt8vND1r7qyKmoB2mooG4JQ9eHZD+Is4A6m95LPA== 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-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=bdn2wm NdEZcCKUNHg+bflyGnpHG6Ihx6P5dCDqe4BOM=; b=EBo4IABGKLho2J//O6RKNI 4lsndezmQvsODW/nJOI2SmBi0y4D9xsgDqbl6rSTv4pMYAITsvo5Q5610tmUY43C 3T+bPR2xh9P+seuCzEnuJRUbvupuJDgyNcsjZBUy5T4yOp3dGsOiKYc53fmTa0vW xqhhJeO30NFyWZl3WkyS4DN1claDasGOraOGldOUrSTnX5gYx9LZMEeZjNbsGjRG 1ooeE5r60EGUOvbBaJzhpB/H7kPLf6Nbp3p6TKxa0+UqcgwDlBnP0Cn1kW8MnXdj AcwtbXwu54g8UUnjLRyNOejBBGsLt7lRH3OU7DqVEhe6M8c7sQMK6kJVeTNM2RKQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrjeekgddufeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufgjfhgffffkgggtsehgtderredtreejnecuhfhrohhmpeforghrihhu shcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmqeenucggtffrrg htthgvrhhnpeeuveektdeuudefgfffleeuledvvdfhvdetgedtteejteeffffhtefhffdv feeltdenucffohhmrghinhepphifmhhtrdhorhhgnecukfhppeekgedrvddtvddrieekrd ejheenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehm sggrkhhkvgesfhgrshhtmhgrihhlrdgtohhm X-ME-Proxy: Received: from localhost (ti0006q161-2604.bb.online.no [84.202.68.75]) by mail.messagingengine.com (Postfix) with ESMTPA id 1B8E9328006C; Wed, 6 May 2020 15:29:23 -0400 (EDT) From: Marius Bakke In-Reply-To: <20200502120901.36d80711.raghavgururajan@disroot.org> References: <76c18088643dcab9d395a0f9760d3a74@waegenei.re> <20200502120901.36d80711.raghavgururajan@disroot.org> User-Agent: Notmuch/0.29.3 (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) Date: Wed, 06 May 2020 21:29:21 +0200 Message-ID: <87d07g50by.fsf@devup.no> 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 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 X-Spam-Score: -2.01 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=fastmail.com header.s=fm2 header.b=S03c1xvJ; dkim=fail (rsa verify failed) header.d=messagingengine.com header.s=fm2 header.b=EBo4IABG; dmarc=fail reason="SPF not aligned (relaxed)" header.from=fastmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 2001:470:142::17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Scan-Result: default: False [-2.01 / 13.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; GENERIC_REPUTATION(0.00)[-0.49685293486623]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[fastmail.com]; IP_REPUTATION_HAM(0.00)[asn: 22989(0.11), country: US(-0.00), ip: 2001:470:142::17(-0.50)]; DWL_DNSWL_FAIL(0.00)[2001:470:142::17:server fail]; R_SPF_ALLOW(-0.20)[+ip6:2001:470:142::/48]; R_DKIM_REJECT(1.00)[fastmail.com:s=fm2,messagingengine.com:s=fm2]; MX_GOOD(-0.50)[cached: eggs.gnu.org]; DKIM_TRACE(0.00)[fastmail.com:-,messagingengine.com:-]; MAILLIST(-0.20)[mailman]; SIGNED_PGP(-2.00)[]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_IN_DNSWL_FAIL(0.00)[2001:470:142::17:server fail]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:22989, ipnet:2001:470:142::/48, country:US]; TAGGED_FROM(0.00)[larch=yhetil.org]; FROM_NEQ_ENVFROM(0.00)[mbakke@fastmail.com,guix-patches-bounces@gnu.org]; ARC_NA(0.00)[]; URIBL_BLOCKED(0.00)[denknerd.org:email,tobias.gr:email,n0.is:email,fastmail.com:email,openmailbox.org:email,pwmt.org:url,disroot.org:email]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; SPF_REPUTATION_HAM(0.00)[-0.57189084117014]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; HAS_LIST_UNSUB(-0.01)[]; RCVD_COUNT_SEVEN(0.00)[10]; FORGED_SENDER_MAILLIST(0.00)[]; DMARC_POLICY_SOFTFAIL(0.10)[fastmail.com : SPF not aligned (relaxed),none] X-TUID: yG7JixUpwVId --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Raghav, Raghav Gururajan writes: > Please find the attachments with this email, for moving stuffs. All the m= oved > packages only refer to each other. So no need of altering any other packa= ge > definitions. I'm not convinced that moving these packages are worth the effort, though I'm not opposed to it either. What is the rationale? I do have a few nits to pick though :-) > From a05c5d174a9ee40e433a64c50f19c7f106381903 Mon Sep 17 00:00:00 2001 > From: Raghav Gururajan > Date: Sat, 2 May 2020 11:16:04 -0400 > Subject: [PATCH 1/7] gnu: Move girara from gtk.scm to pwmt.scm. > > * gnu/packages/gtk.scm (girara): Move to [...] > * gnu/packages/pwmt.scm (girara): [...] here. > --- > gnu/packages/gtk.scm | 49 ----------------------- > gnu/packages/pwmt.scm | 91 +++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 91 insertions(+), 49 deletions(-) > create mode 100644 gnu/packages/pwmt.scm > > diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm > index bea4850d15..4d093a0e0a 100644 > --- a/gnu/packages/gtk.scm > +++ b/gnu/packages/gtk.scm > @@ -1445,55 +1445,6 @@ In addition to the low level layout rendering rout= ines, Pango includes > and routines to assist in editing internationalized text.") > (license license:lgpl2.1+))) >=20=20 > -(define-public girara > - (package > - (name "girara") > - (version "0.3.4") > - (source > - (origin > - (method git-fetch) > - (uri (git-reference > - (url "https://git.pwmt.org/pwmt/girara") > - (commit version))) > - (file-name (git-file-name name version)) > - (sha256 > - (base32 "08rpw9hkaprm4r853xy1d35i2af1pji8c3mzzl01mmwmyr9p0x8k"))= )) > - (native-inputs `(("pkg-config" ,pkg-config) > - ("check" ,check) > - ("gettext" ,gettext-minimal) > - ("glib:bin" ,glib "bin") > - ("xorg-server" ,xorg-server-for-tests))) > - ;; Listed in 'Requires.private' of 'girara.pc'. > - (propagated-inputs `(("gtk+" ,gtk+))) > - (arguments > - `(#:phases (modify-phases %standard-phases > - (add-before 'check 'start-xserver > - ;; Tests require a running X server. > - (lambda* (#:key inputs #:allow-other-keys) > - (let ((xorg-server (assoc-ref inputs "xorg-server"= )) > - (display ":1")) > - (setenv "DISPLAY" display) > - > - ;; On busy machines, tests may take longer than > - ;; the default of four seconds. > - (setenv "CK_DEFAULT_TIMEOUT" "20") > - > - ;; Don't fail due to missing '/etc/machine-id'. > - (setenv "DBUS_FATAL_WARNINGS" "0") > - (zero? (system (string-append xorg-server "/bin/= Xvfb " > - display " &"))))))= ))) > - (build-system meson-build-system) > - (home-page "https://pwmt.org/projects/girara/") > - (synopsis "Library for minimalistic gtk+3 user interfaces") > - (description "Girara is a library that implements a user interface t= hat > -focuses on simplicity and minimalism. Currently based on GTK+, a > -cross-platform widget toolkit, it provides an interface that focuses on = three > -main components: a so-called view widget that represents the actual > -application, an input bar that is used to execute commands of the > -application and the status bar which provides the user with current > -information.") > - (license license:zlib))) > - > (define-public gtk-doc > (package > (name "gtk-doc") > diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm > new file mode 100644 > index 0000000000..8185cc40d9 > --- /dev/null > +++ b/gnu/packages/pwmt.scm > @@ -0,0 +1,91 @@ > +;;; GNU Guix --- Functional package management for GNU > +;;; > +;;; Copyright =C2=A9 2015 Paul van der Walt > +;;; Copyright =C2=A9 2016 ng0 > +;;; Copyright =C2=A9 2017 2018 Marius Bakke > +;;; Copyright =C2=A9 2017 Kei Kebreau > +;;; Copyright =C2=A9 2018 2019 2020 Tobias Geerinckx-Rice > +;;; Copyright =C2=A9 2020 Raghav Gururajan For each patch, please include the copyright information for that package only. I don't think all of these people worked on girara. That makes it easier to track when someone decides to move these packages to gtk.scm and pdf.scm in the future. ;-) > +(define-module (gnu packages pwmt) > + #:use-module (gnu packages) > + #:use-module (gnu packages check) > + #:use-module (gnu packages documentation) > + #:use-module (gnu packages gettext) > + #:use-module (gnu packages glib) > + #:use-module (gnu packages gnome) > + #:use-module (gnu packages gtk) > + #:use-module (gnu packages pkg-config) > + #:use-module (gnu packages web) > + #:use-module (gnu packages xorg) > + #:use-module (gnu packages xdisorg) Likewise for modules: gnome, web, xorg and xdisorg seems unused for girara.=20 > + #:use-module ((guix licenses) #:prefix license:) > + #:use-module (guix packages) > + #:use-module (guix download) And (guix download). > + #:use-module (guix git-download) > + #:use-module (guix build-system gnu) And gnu-build-system. > + #:use-module (guix build-system meson)) > + > +(define-public girara > + (package > + (name "girara") > + (version "0.3.4") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://git.pwmt.org/pwmt/girara") > + (commit version))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 "08rpw9hkaprm4r853xy1d35i2af1pji8c3mzzl01mmwmyr9p0x8k"))= )) > + (native-inputs `(("pkg-config" ,pkg-config) > + ("check" ,check) > + ("gettext" ,gettext-minimal) > + ("glib:bin" ,glib "bin") > + ("xorg-server" ,xorg-server-for-tests))) > + ;; Listed in 'Requires.private' of 'girara.pc'. > + (propagated-inputs `(("gtk+" ,gtk+))) > + (arguments > + `(#:phases (modify-phases %standard-phases > + (add-before 'check 'start-xserver > + ;; Tests require a running X server. > + (lambda* (#:key inputs #:allow-other-keys) > + (let ((xorg-server (assoc-ref inputs "xorg-server"= )) > + (display ":1")) > + (setenv "DISPLAY" display) > + > + ;; On busy machines, tests may take longer than > + ;; the default of four seconds. > + (setenv "CK_DEFAULT_TIMEOUT" "20") > + > + ;; Don't fail due to missing '/etc/machine-id'. > + (setenv "DBUS_FATAL_WARNINGS" "0") > + (zero? (system (string-append xorg-server "/bin/= Xvfb " > + display " &"))))))= ))) > + (build-system meson-build-system) > + (home-page "https://pwmt.org/projects/girara/") > + (synopsis "Library for minimalistic gtk+3 user interfaces") > + (description "Girara is a library that implements a user interface t= hat > +focuses on simplicity and minimalism. Currently based on GTK+, a > +cross-platform widget toolkit, it provides an interface that focuses on = three > +main components: a so-called view widget that represents the actual > +application, an input bar that is used to execute commands of the > +application and the status bar which provides the user with current > +information.") > + (license license:zlib))) > \ No newline at end of file Also make sure that the files end with a newline, like all other files in Guix. For the remainder in this series, please also check whether module imports can be removed from pdf.scm (that makes it worth it IMO). --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl6zEBEACgkQoqBt8qM6 VPpfYggAg2bAIpcFCzHBfyArcZOOQlnFVgDcGSMxGDeBoHgwwSAvy64Ev8y3KLk3 /iu/AFlh6SRMmnkf9ObIVdowi1mevIkiYgAin0rHuHOIP+gERNKNHy9sjxbnmQBU xT+shNmP6c4J5DvnMilzQFg4G6j/pAHdckop12zoDW+d9oBcXLhdcpXZYP4r68Ei kYM70r4/XdQ9SV7fTcy1fIimLYcxYCd5v1D7rkxp8SazlnRPX5+22Il3fhzD9Qnl j0CWleZyMgZOlw57giePoyB8z51ALuU3iH98N8cPkIQBfU7m28hLzmgqqUUGmWFr 24uaMp39B0SfI14eN7MwTiG7qvf7Kw== =xUlU -----END PGP SIGNATURE----- --=-=-=--