From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53591) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddYQn-0007r9-L2 for guix-patches@gnu.org; Fri, 04 Aug 2017 04:58:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddYQk-0000Og-N2 for guix-patches@gnu.org; Fri, 04 Aug 2017 04:58:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:38167) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ddYQk-0000OX-IE for guix-patches@gnu.org; Fri, 04 Aug 2017 04:58:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ddYQk-0000r5-Bb for guix-patches@gnu.org; Fri, 04 Aug 2017 04:58:02 -0400 Subject: [bug#27944] perl-net-psyc: Update to 1.2 Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53513) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddYQ5-0007mJ-JW for guix-patches@gnu.org; Fri, 04 Aug 2017 04:57:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddYQ2-0008Mz-IF for guix-patches@gnu.org; Fri, 04 Aug 2017 04:57:21 -0400 Received: from aibo.runbox.com ([91.220.196.211]:55644) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ddYQ2-0008Gp-5B for guix-patches@gnu.org; Fri, 04 Aug 2017 04:57:18 -0400 Received: from [10.9.9.211] (helo=mailfront11.runbox.com) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1ddYPt-00026E-Fz for guix-patches@gnu.org; Fri, 04 Aug 2017 10:57:09 +0200 Received: from [193.90.12.90] (helo=localhost) by mailfront11.runbox.com with esmtpsa (uid:892961 ) (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) id 1ddYPj-0000km-6o for guix-patches@gnu.org; Fri, 04 Aug 2017 10:56:59 +0200 Date: Fri, 4 Aug 2017 08:56:56 +0000 From: ng0 Message-ID: <20170804085656.utv6roedtv5p56bz@abyayala> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="lqkx5sjreemrezui" Content-Disposition: inline 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: 27944@debbugs.gnu.org --lqkx5sjreemrezui Content-Type: multipart/mixed; boundary="vmwi3a2emau2ncfn" Content-Disposition: inline --vmwi3a2emau2ncfn Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable The appended patch updates to 1.2, as it builds from git I have included the commit + revision numbers in the version. Changes: Dependency on rxaudio is removed, the author has worked on a new version of the binary which required this with primarily mplayer support. rxaudio is now optional. It can still be used, but you have to have it in the path and pass a switch to psycamp. This is all commented in the perl script, the overall impression I have is that it no longer promotes rxaudio because mplayer is supported. Issues: I ran into the "dotless @INC" issue here. Is this fixed on core-updates? user@abyayala ~$ psycion Can't locate Net/PSYC.pm in @INC (you may need to install the Net::PSYC mod= ule) (@INC contains: /usr/depot/lib/perl5 /usr/depot/lib/perl5 /gnu/store/l= v3g88j8wf7pbwrravydmn4fvgjfv462-perl-5.24.0/lib/perl5/site_perl/5.24.0/x86_= 64-linux-thread-multi /gnu/store/lv3g88j8wf7pbwrravydmn4fvgjfv462-perl-5.24= =2E0/lib/perl5/site_perl/5.24.0 /gnu/store/lv3g88j8wf7pbwrravydmn4fvgjfv462= -perl-5.24.0/lib/perl5/site_perl /gnu/store/h5qwfvgn7ns5f7bjnz8bwyj3b3r2ckg= g-perl-curses-1.36/lib/perl5/site_perl/5.24.0/x86_64-linux-thread-multi /gn= u/store/h5qwfvgn7ns5f7bjnz8bwyj3b3r2ckgg-perl-curses-1.36/lib/perl5/site_pe= rl/5.24.0 /gnu/store/h5qwfvgn7ns5f7bjnz8bwyj3b3r2ckgg-perl-curses-1.36/lib/= perl5/site_perl /gnu/store/ymh0x4dcnhz262h8zk6k46ij6pbv10w6-perl-io-socket-= ssl-2.038/lib/perl5/site_perl/5.24.0/x86_64-linux-thread-multi /gnu/store/y= mh0x4dcnhz262h8zk6k46ij6pbv10w6-perl-io-socket-ssl-2.038/lib/perl5/site_per= l/5.24.0 /gnu/store/ymh0x4dcnhz262h8zk6k46ij6pbv10w6-perl-io-socket-ssl-2.0= 38/lib/perl5/site_perl /gnu/store/q2bkhyk4izn6i4589z36ifs9i28yrvpl-perl-uri= -1.71/lib/perl5/site_perl/5.24.0/x86_64-linux-thread-multi /gnu/store/q2bkh= yk4izn6i4589z36ifs9i28yrvpl-perl-uri-1.71/lib/perl5/site_perl/5.24.0 /gnu/s= tore/q2bkhyk4izn6i4589z36ifs9i28yrvpl-perl-uri-1.71/lib/perl5/site_perl /gn= u/store/p32jc6bd92bf6xmpa8x3w4mba6w8pg0l-perl-net-ssleay-1.68/lib/perl5/sit= e_perl/5.24.0/x86_64-linux-thread-multi /gnu/store/p32jc6bd92bf6xmpa8x3w4mb= a6w8pg0l-perl-net-ssleay-1.68/lib/perl5/site_perl/5.24.0 /gnu/store/p32jc6b= d92bf6xmpa8x3w4mba6w8pg0l-perl-net-ssleay-1.68/lib/perl5/site_perl /gnu/sto= re/lv3g88j8wf7pbwrravydmn4fvgjfv462-perl-5.24.0/lib/perl5/site_perl/5.24.0/= x86_64-linux-thread-multi /gnu/store/lv3g88j8wf7pbwrravydmn4fvgjfv462-perl-= 5.24.0/lib/perl5/site_perl/5.24.0 /gnu/store/lv3g88j8wf7pbwrravydmn4fvgjfv4= 62-perl-5.24.0/lib/perl5/5.24.0/x86_64-linux-thread-multi /gnu/store/lv3g88= j8wf7pbwrravydmn4fvgjfv462-perl-5.24.0/lib/perl5/5.24.0 .) at /gnu/store/kx= scm40rignddlas7qxpdb4bmi0qrqld-perl-net-psyc-1.2-1.5a24e0e/bin/.psycion-rea= l line 25. BEGIN failed--compilation aborted at /gnu/store/kxscm40rignddlas7qxpdb4bmi0= qrqld-perl-net-psyc-1.2-1.5a24e0e/bin/.psycion-real line 41. --=20 ng0 GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 GnuPG: https://n0is.noblogs.org/my-keys https://www.infotropique.org https://krosos.org --vmwi3a2emau2ncfn Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-gnu-perl-net-psyc-Update-to-1.2.patch" Content-Transfer-Encoding: quoted-printable =46rom 03691625a0ec0b05407601f32686aeb9bf3fd76a Mon Sep 17 00:00:00 2001 =46rom: ng0 Date: Fri, 4 Aug 2017 08:06:37 +0000 Subject: [PATCH] gnu: perl-net-psyc: Update to 1.2. * gnu/packages/messaging.scm (perl-net-psyc): Update to 1.2. (source): Switch to git. --- gnu/packages/messaging.scm | 149 +++++++++++++++++++++++------------------= ---- 1 file changed, 75 insertions(+), 74 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index eb9e86915..07c06d3fe 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -5,7 +5,7 @@ ;;; Copyright =C2=A9 2015 Andreas Enge ;;; Copyright =C2=A9 2015, 2016, 2017 Ricardo Wurmus ;;; Copyright =C2=A9 2015 Efraim Flashner -;;; Copyright =C2=A9 2016, 2017 +;;; Copyright =C2=A9 2016, 2017 ;;; Copyright =C2=A9 2016 Andy Patterson ;;; Copyright =C2=A9 2016, 2017 Cl=C3=A9ment Lassieur ;;; Copyright =C2=A9 2017 Mekeor Melire @@ -939,84 +939,85 @@ into existing applications.") (home-page "https://camaya.net/gloox") (license license:gpl3))) =20 +;; There is no release tarball of this release version. (define-public perl-net-psyc - (package - (name "perl-net-psyc") - (version "1.1") - (source - (origin - (method url-fetch) - (uri (string-append "http://perlpsyc.psyc.eu/" - "perlpsyc-" version ".zip")) - (file-name (string-append name "-" version ".zip")) - (sha256 - (base32 - "1lw6807qrbmvzbrjn1rna1dhir2k70xpcjvyjn45y35hav333a42")) - ;; psycmp3 currently depends on MP3::List and rxaudio (shareware), - ;; we can add it back when this is no longer the case. - (snippet '(delete-file "contrib/psycmp3")))) - (build-system perl-build-system) - (inputs - `(("perl-curses" ,perl-curses) - ("perl-io-socket-ssl" ,perl-io-socket-ssl))) - (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'configure) ; No configure script - ;; There is a Makefile, but it does not install everything - ;; (leaves out psycion) and says - ;; "# Just to give you a rough idea". XXX: Fix it upstream. - (replace 'build - (lambda _ - (zero? (system* "make" "manuals")))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/doc/perl-net-psyc")) - (man1 (string-append out "/share/man/man1")) - (man3 (string-append out "/share/man/man3")) - (bin (string-append out "/bin")) - (libpsyc (string-append out "/lib/psyc/ion")) - (libperl (string-append out "/lib/perl5/site_perl/" - ,(package-version perl)))) + (let ((commit "5a24e0e643885a16e7c3b7b6ac50e4db31e476d0") + (revision "1")) + (package + (name "perl-net-psyc") + (version (string-append "1.2-" revision "." (string-take commit 7))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "git://git.psyced.org/git/perlpsyc") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "16kwxzkrfzl1hq02ablmflbaciijlyd4d7ggqhpabb8m7xn5vx7w")))) + (build-system perl-build-system) + (inputs + `(("perl-curses" ,perl-curses) + ("perl-io-socket-ssl" ,perl-io-socket-ssl))) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) ; No configure script + ;; There is a Makefile, but it does not install everything + ;; (leaves out psycion) and says + ;; "# Just to give you a rough idea". XXX: Fix it upstream. + (replace 'build + (lambda _ + (zero? (system* "make" "manuals")))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/perl-net-psyc")) + (man1 (string-append out "/share/man/man1")) + (man3 (string-append out "/share/man/man3")) + (bin (string-append out "/bin")) + (libpsyc (string-append out "/lib/psyc/ion")) + (libperl (string-append out "/lib/perl5/site_perl/" + ,(package-version perl)))) =20 - (copy-recursively "lib/perl5" libperl) - (copy-recursively "lib/psycion" libpsyc) - (copy-recursively "bin" bin) - (install-file "cgi/psycpager" (string-append doc "/cgi")) - (copy-recursively "contrib" (string-append doc "/contrib")) - (copy-recursively "hooks" (string-append doc "/hooks")) - (copy-recursively "sdj" (string-append doc "/sdj")) - (install-file "README.txt" doc) - (install-file "TODO.txt" doc) - (copy-recursively "share/man/man1" man1) - (copy-recursively "share/man/man3" man3) - #t))) - (add-after 'install 'wrap-programs - (lambda* (#:key outputs #:allow-other-keys) - ;; Make sure all executables in "bin" find the Perl modules - ;; provided by this package at runtime. - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin/")) - (path (getenv "PERL5LIB"))) - (for-each (lambda (file) - (wrap-program file - `("PERL5LIB" ":" prefix (,path)))) - (find-files bin "\\.*$")) - #t)))))) - (description - "@code{Net::PSYC} with support for TCP, UDP, Event.pm, @code{IO::Sele= ct} and + (copy-recursively "lib/perl5" libperl) + (copy-recursively "lib/psycion" libpsyc) + (copy-recursively "bin" bin) + (install-file "cgi/psycpager" (string-append doc "/cgi")) + (copy-recursively "contrib" (string-append doc "/contrib"= )) + (copy-recursively "hooks" (string-append doc "/hooks")) + (copy-recursively "sdj" (string-append doc "/sdj")) + (install-file "README.txt" doc) + (install-file "TODO.txt" doc) + (copy-recursively "share/man/man1" man1) + (copy-recursively "share/man/man3" man3) + #t))) + (add-after 'install 'wrap-programs + (lambda* (#:key outputs #:allow-other-keys) + ;; Make sure all executables in "bin" find the Perl modules + ;; provided by this package at runtime. + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin/")) + (path (getenv "PERL5LIB"))) + (for-each (lambda (file) + (wrap-program file + `("PERL5LIB" ":" prefix (,path)))) + (find-files bin "\\.*$")) + #t)))))) + (description + "@code{Net::PSYC} with support for TCP, UDP, Event.pm, @code{IO::Se= lect} and Gtk2 event loops. This package includes 12 applications and additional sc= ripts: psycion (a @uref{http://about.psyc.eu,PSYC} chat client), remotor (a contr= ol console for @uref{https://torproject.org,tor} router) and many more.") - (synopsis "Perl implementation of PSYC protocol") - (home-page "http://perlpsyc.psyc.eu/") - (license (list license:gpl2 - license:perl-license - ;; contrib/irssi-psyc.pl: - license:public-domain - ;; bin/psycplay states AGPL with no version: - license:agpl3+)))) + (synopsis "Perl implementation of PSYC protocol") + (home-page "http://perlpsyc.psyc.eu/") + (license (list license:gpl2 + license:perl-license + ;; contrib/irssi-psyc.pl: + license:public-domain + ;; bin/psycplay states AGPL with no version: + license:agpl3+))))) =20 (define-public libpsyc (package --=20 2.13.4 --vmwi3a2emau2ncfn-- --lqkx5sjreemrezui Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEqIyK3RKYKNfqwC5S4i+bv+40hYgFAlmENtgACgkQ4i+bv+40 hYj/Tg/+Iqh2QL/TljjoObpCqbwZM9UsxhzR3VVh7doXSBhRAaqnjQvOT51NJuFV Jwiaehdhhv1/Wb0r4ym1qI9dqzqzESMvHWWi0dvBokvUSDoFig0QwO2PFtJcysuV Zx7PF08M5xo5luPDEJlw403/lLuOuTsMja5Ks297fQnxoNj0gdfrPWSsx+P4HX+0 yYtVNS47od1P7Riebmyi0nuuwLu/m+28VALUmybgmSnPmnAV+8Dxd1Z4P9xwLUQ+ x1+lh7DGVFbeebJKcvRwVOqG9aleaVncx2ML5vKKjAy53rFqWUd+Y0do1xYcBHDI Fx1Szg6NW7tGJwbsnBHlX41Da4pNaSJ0FSx8eEuw4LsT2VU1IWRlY3Oo3Xd0MXWz +0NKlIWR33tTKfu8NlLUkVKqw9U3klnMkQUot60NXKfc1kRfck5F050jFNGTi2QD ikK+7H/DSWXyimEVhG4l6rGhno6SqbZ64z0dN1FsVANERv469A1CmTPN2/Um8aD2 M3G5mZ85CRmk9/DUycunjjJOXGVlyZkXJ7aHMmTGK6JLjHBu3ULdm6T5ltM3OVTl FWk4fWfTLesZ6oRMPI40IUU6VIRKHiTDCV5cGIrWAwyL5o/xm3HkAXXwBmJuvgoV qWe1CK1oN2Y4qcURLjY0cIXq1rqnQgk7szoAnzu33bsdBAG4gJ4= =Vzke -----END PGP SIGNATURE----- --lqkx5sjreemrezui--