From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 18 12:53:54 2017 Received: (at submit) by debbugs.gnu.org; 18 Feb 2017 17:53:54 +0000 Received: from localhost ([127.0.0.1]:45288 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cf9Ck-0002Ti-25 for submit@debbugs.gnu.org; Sat, 18 Feb 2017 12:53:54 -0500 Received: from eggs.gnu.org ([208.118.235.92]:39683) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cf5Dq-00038z-RM for submit@debbugs.gnu.org; Sat, 18 Feb 2017 08:38:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cf5Dk-0001gF-HN for submit@debbugs.gnu.org; Sat, 18 Feb 2017 08:38:41 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: * X-Spam-Status: No, score=1.3 required=5.0 tests=BAYES_50,FREEMAIL_FROM, RCVD_IN_SORBS_SPAM autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:40862) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cf5Dk-0001g7-EF for submit@debbugs.gnu.org; Sat, 18 Feb 2017 08:38:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58887) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cf5Dj-0004bV-6h for guix-patches@gnu.org; Sat, 18 Feb 2017 08:38:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cf5Dg-0001ff-4Q for guix-patches@gnu.org; Sat, 18 Feb 2017 08:38:39 -0500 Received: from mout.gmx.net ([212.227.17.21]:51194) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cf5Df-0001fE-Pr for guix-patches@gnu.org; Sat, 18 Feb 2017 08:38:36 -0500 Received: from labiere.lan ([80.229.147.137]) by mail.gmx.com (mrgmx103 [212.227.17.174]) with ESMTPA (Nemesis) id 0M7ojs-1cRyD947qy-00vNp2; Sat, 18 Feb 2017 14:38:32 +0100 From: Pierre Langlois To: guix-patches@gnu.org Subject: [PATCH 0/6] Add Clementine music player. Date: Sat, 18 Feb 2017 13:38:30 +0000 Message-Id: <20170218133830.24091-1-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.11.1 X-Provags-ID: V03:K0:0TJ63lWED3n32RW3hgsslCYWBX5O21N8Poggl/w/f5lANTkP41b i14FpCQa7AkNyZvrP/xohvRF7wf9nZNlChiCSIkTEylkZ7cRdtNAR2rT62F2pnoVgbaB62u 58UnZ63/bgonZswJC6eJT1f9hnfm6mtqz8Ih7nlLdM5jGoFsJzf8NJiqoMajyUsM7sotWfe DEvU/2Eq6TEjlP54hjzCw== X-UI-Out-Filterresults: notjunk:1;V01:K0:oc6cIOGs6Po=:tYJZipHXMVc+gBNpcBsiTs sxxTSAPHpRroVc0uEaBQDMbWis9mnkpQxUb+RaXq+KoPUTAKsub8dzWcU+uR333Re4jXizDK0 UFyrdzEzqz9Dh5GSoM7G9tfHHrXT6nhvBcN5kBVnlhrUCFgwYsM7XxjgPOU67I2gGf5ocxK3H gU9KUGR1+5pS3zpvEZDXiwwF+Nm7VItrROpmlVQag9bGVE9bDWST+Evv5JAczpKzNUkwHvtMF RokyvT/atoeMDuoNRiyDFO7wW0facrjSJIBYbgtV3qXStohCDCE8Iya8zGiP72YcFrq4ldvlA Vp4e+lQZtfIPnogkRxg+KXz05uzUSFlBFbUiK0d1Lb1OjEivIPazJfioWu/2y208SyIPVaQhq kEhlKswLpIJs7z07r3tBQ/BYWIY6Z+XJT60eiBPv7OSNFD1Rx9opYxcXpW+KSr+O4mNoCIuO/ 6Nk0vSLdbjC+hqxN1aP2IWAULHeaKjB+4Sp8V/MZZrM2ctUEfBfS2NfPSUXcDfodUrSzIV59L 6vAaYTU+lR/R2LK1qOWB7C+/TPSlAWSZQ3ehlTgI/hnTtOQbnSuD9yArZFz1Vz3zWuuqjoKo/ vj/RF7ws8797fvk3MFA9cbc8hbwjwNr6fqCGcfXWBvj+LRE38j15alaLuhDwG2yQDUPzyidHP SBIsDw+Gkyy6GSsJtwHk7oXm7s072n515fgiFnoIxPvLo/8uUSJQLZJkz8xspCQDa6onqWAzO tTU8HvlGloC2RTQDimnutK+u/B0zWU802qw1b2FjKPP2k/V1dkBTxatPoWE= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -3.6 (---) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Sat, 18 Feb 2017 12:53:52 -0500 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.6 (---) Hello guix! Here are patches to add the Clementine music player [1] and its dependencies. First of all, thanks all of you for Guix{,SD}! It's a lot of fun to play with. I have a couple of questions about this series: * cryptopp I believe this *should* be an optional dependency but I wasn't able to disable it. It seems to be used for spotify support: ~~~(CMakeLists.txt) if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND) message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify " "code must be compiled in") elseif(CRYPTOPP_FOUND) set(HAVE_CRYPTOPP ON) set(HAVE_SPOTIFY_DOWNLOADER ON) endif() ~~~ What do you think? Should we patch the above file to disable spotify support or should we package cryptopp? I've done the latter in this series. * sqlite/nss I ran into complications with this package when I realized Clementine needed the FTS3 extension enabled in sqlite [2]. I've been able to test this but it took an entire day to rebuild all packages depending on sqlite in my profile :-P. By the way, the fact I can do this is great! As a result, the nss package was rebuilt and I consistently got 6 failures, all due to a PayPal certificate. I had no idea how to fix this so I updated the nss package to the latest release and the tests passed. So I suppose this series should probably go in a branch as it will require a lot of rebuilding. Thanks! Pierre 1: http://clementine-player.org 2: https://sqlite.org/fts3.html Pierre Langlois (6): gnu: Add qjson. gnu: Add libechonest. gnu: Add cryptopp. gnu: nss: Update to 3.28.1. gnu: sqlite: Enable FTS3. gnu: Add Clementine. gnu/packages/crypto.scm | 44 +++++++++++++++++ gnu/packages/databases.scm | 7 ++- gnu/packages/gnuzilla.scm | 5 +- gnu/packages/music.scm | 82 ++++++++++++++++++++++++++++++++ gnu/packages/patches/nss-pkgconfig.patch | 4 +- gnu/packages/qt.scm | 28 +++++++++++ 6 files changed, 165 insertions(+), 5 deletions(-) -- 2.11.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 18 13:00:33 2017 Received: (at 25787) by debbugs.gnu.org; 18 Feb 2017 18:00:33 +0000 Received: from localhost ([127.0.0.1]:45333 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cf9J7-00037w-JK for submit@debbugs.gnu.org; Sat, 18 Feb 2017 13:00:33 -0500 Received: from mout.gmx.net ([212.227.17.20]:55178) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cf9J2-0002xi-N0 for 25787@debbugs.gnu.org; Sat, 18 Feb 2017 13:00:28 -0500 Received: from labiere.lan ([80.229.147.137]) by mail.gmx.com (mrgmx103 [212.227.17.174]) with ESMTPA (Nemesis) id 0MexlN-1czIcN23tB-00OVtr; Sat, 18 Feb 2017 19:00:18 +0100 From: Pierre Langlois To: 25787@debbugs.gnu.org Subject: [PATCH 1/6] gnu: Add qjson. Date: Sat, 18 Feb 2017 18:00:16 +0000 Message-Id: <20170218180016.1050-1-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.11.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:K3VTgoFfps3BSWBKAbrB4+bf3XB/krNTIgfqIyVLphGy4W4Pkxf mr5xZH+aZ6qI0A38X6XGr0aB9y8Fb7Bw3Ljujd/YP6Y0t02a6sSu0o/Ff8fS+sqIHeA+kma Stt/4sYhcWJy8LYpK1arOOWONoTeLiezMh4jeHPFG7vEFtZ57RVaWRhyHG/QYcxvFewNK8h jUxtocQFE6mzBAM+zR5zQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:27BshneNxSc=:FC2eBJvg1CaWTQaRXjGwdw wX1SeGB5sncyBMAygLnTvz1z7ohA7yXpPiQmttCO9Vl7m0G0jygRaTIDz1ibUpD1rUzSrp1DI tK0Q84VHDqNdI5dk/GtQgnlgWYVj5uSn0hXKRStIviOi8nAXi5plGUVaArMhhvKqqbeqQpGvn miF6pBj82BuakOQoWcB7p9tSJv8ytrN3McOgf1oepTlVVogfdj9VPPxUlhKkVhrjN9L3vAS8v X4u96kZsPUPGYs3MHq86Eu9g1U7WQ2THlKpU2Z4wpTMwoRQtQhphq4jrTbTey0PcxL6EVa9Qi v/Qj3kTzJJYXcTbqt41bzj3xBwXVeU2fWKsHkkgccL4b8sfnled+euMoCP0MifrYfTcNUNiHY JGy+0KB1Zvan5fprVv5p3SrAX/5/CKP/LcvWjRuMgMI2aTY4qpwPoUrUml102rYXNhuKT5bkt 01nD6aBf/cVkya3BaiJuXOaUIm8xZIVwo/T3E3EJd+zh5TJI+ErqEZVVIyTX7uYdXGZ384RKA auiKj74FQQNzysfrf+qGKIxhh3iUIKg+3lH7W6QEQ+NawocwzaJJXreQ0XlOt5fwM8zFfZata jvqRfMb/usjIQL4qxqs4NgAdtpHXQzwQrPirvp1ISBVXcEZj3GxZv18DEDfPNHznpI2Qr8XdS uOTqHQnlOCXz4fahhD7OKI4XGa/Cmvs10vcnpVS4/8UupOuYZ9nMicDNQnK9iLGv/G6nDd13x mIA+ejGqAaHEaZ/Krunn5p25OJ49Jx4ufVntLw4jBltZE8TiYP/Fm/Hjgyl1Egjp6Her7ll5j GW2Zg5o X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 25787 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.2 (/) * gnu/packages/qt.scm (qjson): New variable. --- gnu/packages/qt.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 47a7caae4..0895e034c 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2015, 2016, 2017 Efraim Flashner ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 Thomas Danckaert +;;; Copyright © 2017 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -1135,6 +1136,33 @@ developers using C++ or QML, a CSS & JavaScript like language.") `(("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative))))) +(define-public qjson + (package + (name "qjson") + (version "0.9.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/flavio/qjson/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1m0h4rajj99hv9w4i381a8x81lxiv167lxk10ncvphpkfxs624p8")))) + (build-system cmake-build-system) + (arguments + ;; The tests require a X server + ;; #:configure-flags '("-DQJSON_BUILD_TESTS=ON") + `(#:tests? #f)) + (inputs + `(("qt" ,qt-4))) + (home-page "http://qjson.sourceforge.net") + (synopsis "Library that maps JSON data to QVariant objects") + (description "QJson is a qt-based library that maps JSON data to QVariant +objects. JSON arrays will be mapped to QVariantList instances, while JSON's +objects will be mapped to QVariantMap.") + (license license:lgpl2.1))) + (define-public python-sip (package (name "python-sip") -- 2.11.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 18 13:01:05 2017 Received: (at 25787) by debbugs.gnu.org; 18 Feb 2017 18:01:06 +0000 Received: from localhost ([127.0.0.1]:45336 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cf9Je-0003a7-7G for submit@debbugs.gnu.org; Sat, 18 Feb 2017 13:01:05 -0500 Received: from mout.gmx.net ([212.227.17.21]:56805) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cf9Jc-0003Tp-Bz for 25787@debbugs.gnu.org; Sat, 18 Feb 2017 13:01:00 -0500 Received: from labiere.lan ([80.229.147.137]) by mail.gmx.com (mrgmx102 [212.227.17.174]) with ESMTPA (Nemesis) id 0McPvw-1cwogo1V3I-00Hc0h; Sat, 18 Feb 2017 19:00:54 +0100 From: Pierre Langlois To: 25787@debbugs.gnu.org Subject: [PATCH 2/6] gnu: Add libechonest. Date: Sat, 18 Feb 2017 18:00:52 +0000 Message-Id: <20170218180052.1267-1-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.11.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:4kPiRnkPB+lUZ3HiwZzaev08jE0AwXswdv6dRM4TLY4VUu07PFa wzriLTqnOA55H0cv8p3UH3FoRH/NQZ5rKfoGoKNLfg81/PCXd0KzgJiRDk9axvz82ae5MPz bhb5GWfggetZgOLWyeI1XLJ6Lo0eQF9zj5ehtTdAddsXvWKsQ2qATTiXWX0CLCp4rINNAQB DMxRYeu8UXseJ6SgSsmTw== X-UI-Out-Filterresults: notjunk:1;V01:K0:WAq02UO5UfY=:DW5sKRouRBdsH0XSIbnmlj 9hh7mYWtZ1AqrhKour4nrmWRDjbxWi2s9NEQgI0GkBywGi3mzeQkwdCjpew5JnG2+X69SUSnG W2g4RzoSxyMedRkzK1tWBEZbMKHBzaRMoi5XOvq4yl0uEYECV3YVNpaz4U33pSKeXkoHkTs2y M6MdXtfmhdu+5NnalJPj4RSwPQwIV6PApDRdQsw7SJRfIr6SX+jPuavbav+ZY/mSqDrd3fzXU NcO99M2mpk7g3WFb6k9wccBZm7PUSmcAfCky9qcT0XzozAb1pmKqzSI/d0fEFQAg8XDvOwI+q ktsANWPn5B1zkYwXDtf3ynzjNed8U2OjhfwrDS9RMRlrrEAlkmbrhI2g/P/Np5Vecnj7iylCT ZNPoWBAQ0F421DS3FIcB7GUjXd0Ng16jYeJokrnv8sKzImC9H0sLl03uIOiHSmln9O+9yhVoz 7cKOleSoLPA6jb00tjz5hpO804CA5ABIO8EPyqAMhu+sjadxvRty+qkH3mNxsVoEB61i1mjh1 vyW1nkEte5VlDT/ywHOFaGZPsN4ppuuBWsM/Lu2sdGx0I7KDghAwNzKOBqrZ/lHDWrWU8cBEf +kX5kiI6yxhnswzmh0zWfjqOI/1Oy/run8VHxnAQhytE19BbkEzoVO0cTHl/gkpvX2flK3vox a6g6koD0za/r5Qw6V8ojnG+LkQlDPEhi5bQqOtjIidciPzsV82CAKzzAlyE/ZdELo43MmPiEk xnECUYKSxvvrtkUKDjHp5iBjIqfnl3Y7JF1RpcEHCBOPu7z+UCaKqmeC+ljLc+u0kUfX8u3p7 s2nuQcf X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 25787 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.2 (/) * gnu/packages/music.scm (libechonest): New variable. --- gnu/packages/music.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index ce874ac43..84c537d86 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2016 John J. Foerch ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017 ng0 +;;; Copyright © 2017 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -2050,6 +2051,32 @@ detailed track info including timbre, pitch, rhythm and loudness information. @end enumerate\n") (license license:bsd-3))) +(define-public libechonest + (package + (name "libechonest") + (version "2.3.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "git://anongit.kde.org/libechonest.git") + (commit "6895a77a46c9bd4e009ae08515bd91dc3cfbf548"))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0xbavf9f355dl1d3qv59x4ryypqrdanh9xdvw2d0q66l008crdkq")))) + (build-system cmake-build-system) + (arguments + '(#:tests? #f)) ; Tests require Internet access + (inputs + `(("qt" ,qt-4) + ("qjson" ,qjson))) + (home-page "https://projects.kde.org/projects/playground/libs/libechonest") + (synopsis "C++/Qt classes to interface with The Echo Nest API") + (description "libechonest is a collection of C++/Qt classes designed to make + a developer's life easy when trying to use the APIs provided by The Echo +Nest.") + (license license:gpl2))) + (define-public python-pylast (package (name "python-pylast") -- 2.11.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 18 13:01:31 2017 Received: (at 25787) by debbugs.gnu.org; 18 Feb 2017 18:01:31 +0000 Received: from localhost ([127.0.0.1]:45340 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cf9K2-0003uI-VC for submit@debbugs.gnu.org; Sat, 18 Feb 2017 13:01:31 -0500 Received: from mout.gmx.net ([212.227.17.22]:54394) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cf9K1-0003nz-17 for 25787@debbugs.gnu.org; Sat, 18 Feb 2017 13:01:25 -0500 Received: from labiere.lan ([80.229.147.137]) by mail.gmx.com (mrgmx102 [212.227.17.174]) with ESMTPA (Nemesis) id 0M4kfR-1cR4FS1QlR-00yvcb; Sat, 18 Feb 2017 19:01:15 +0100 From: Pierre Langlois To: 25787@debbugs.gnu.org Subject: [PATCH 3/6] gnu: Add cryptopp. Date: Sat, 18 Feb 2017 18:01:13 +0000 Message-Id: <20170218180113.1331-1-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.11.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:qE8KiOPQA6GInAzLwTj30r1EaT199ocE/QACXUyofs3HhbtEHm0 s0019bW0aEQUqFLrrLcl9WSPZ+J6jPvQctGXT+3buYkRRk65YiE9tGpCyH3SUL0tFrSX+Jo cqbQAL25xTL/CpafnPnpq5Eky8k9LTbTYtpARk+rr3qGx4dJQQvP4WRxYkdZtVmH7rGieXS RfW/r8ohOPHNJq8FTw6dQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:vu4abrca6Rw=:j/YlNcdkzvQtyz8w+8WBUw VKm51PMbnduU3N/VrbTHDJDqem21W1LOCp5qI9Ln1eIPssDuyFxp+K/LTd5dpmz8zC4nsyAN7 1jTG37c3X+B9RIPN9k1jPDp5zFSYcgIZuQCojfBDNtDwNHixZVc9Xd9sXpESxZgs79I7B4Irg b3ulhWJ7GhtErdK3VXw75PCdRotdm8MoGEJd8jW93iO961XNPH5XyEplkBXILJ+47vAHHD+wW KqJFZYUdk1Xjs5nbnE0afsvTzbCn9Z9+RzXYK9cCX3r3Po7AxUEGxCqYUI++Z4e5ZkiqRtM24 hiYwaV33TvojpRzfUnFxz9UMJyukvn4Z0y8SLQBKNM8ecSwQEUuRmznT6DGu6deIH7qZtIqkV Ni4bf/eVMy/CvoJBcEHzWuJP7U3tgLc9nTWhEbyofivtJxd7hNApFAFU3GqvbzGHIUmM/ampm zShynoo1JsxSPd9UYfSGpIuhe14z+3Y9Mow0erD0HXRGAviDFiSP5S9uq7z1P5FcraN9pmUIQ RRETTF6DqRvrkA59PbxMgkdN1Opm6Hd2HeAD/7tHFhRLIYlfAhpvozvSEMba1Oc+ChgEYbBbs 1/RDl1VxZqrGeeKFVqDIERdHrl/hEaoXbR1UL8NzLTlF4egmsX0VhM6/NfbFKJpw9irAw0hDe 5asc5MqrvZbxKYlxcoWBKImteh1AEeF22ohDHDS2cTDObhweiXONfKUXMcaQPovUa3CviDicy DlcWOvoZ80CLNQF2thGFXwjR80dvbnbc6W2HaZlskkDSw0AIdyWjcoYgmvNswNRusWxjrT+1L awLfHuoyphns2oKonIM+ArFG5IOOnNbRQ2k3e7O9CW9C+YLqQxPDJx4NSSBxFQH878NLB6SIy 16+12NCZba6kTNQhUTWJO7Vrmfwsl52MKH+5ep5ZrpNxVkFcU7X3BzrHzEUTojzqFikig25rG R21SoPfVBTt9puhxoGQxqshlTXasuCeDhUvyo7EHruBrz9UOr7gtl12Z2glKrxg4rFV8mWwhq lvuW7w43YvBHsfFmhL0ah7g3SyuU0zabBSOt5RdF9H8HjLNOS7EtfTtIQp62E8R9Hg== X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 25787 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) * gnu/packages/crypto.scm (cryptopp): New variable. --- gnu/packages/crypto.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index fd2b5a36b..a8756e2ab 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2016 Tobias Geerinckx-Rice ;;; Copyright © 2016 ng0 ;;; Copyright © 2016 Eric Bavier +;;; Copyright © 2017 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -414,3 +415,46 @@ utility as a demonstration of the @code{scrypt} key derivation function. @code{Scrypt} is designed to be far more resistant against hardware brute-force attacks than alternative functions such as @code{PBKDF2} or @code{bcrypt}.") (license license:bsd-2))) + +(define-public cryptopp + (let ((version "5.6.5")) + (package + (name "cryptopp") + (version version) + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/weidai11/cryptopp/archive/CRYPTOPP_" + (string-join (string-split version #\.) "_") ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "11p6mak784mx8hjasg9alwk4g3q5bsfrik9lv73a34dinca5bzbr")))) + (build-system cmake-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + ;; A libcrypto++.pc file is not included, create it. + (add-after 'install 'install-pkg-config + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (pkgconfig-path (string-append out "/lib/pkgconfig"))) + (mkdir-p pkgconfig-path) + (with-output-to-file + (string-append pkgconfig-path "/libcrypto++.pc") + (lambda _ + (format #t + "prefix=~@*~a~@ + libdir=${prefix}/lib~@ + includedir=${prefix}/include~@ + Name: libcrypto++-~1@*~a~@ + Description: Class library of cryptographic schemes~@ + Version: ~1@*~a~@ + Libs: -L${libdir} -lcryptopp~@ + Cflags: -I${includedir}~%" + out version))))))))) + (home-page "https://cryptopp.com/") + (synopsis "C++ class library of cryptographic schemes") + (description "Crypto++ is a free C++ class library of cryptographic +schemes.") + (license (list license:boost1.0 license:public-domain))))) -- 2.11.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 18 13:02:05 2017 Received: (at 25787) by debbugs.gnu.org; 18 Feb 2017 18:02:06 +0000 Received: from localhost ([127.0.0.1]:45345 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cf9Kf-0004Nj-H4 for submit@debbugs.gnu.org; Sat, 18 Feb 2017 13:02:05 -0500 Received: from mout.gmx.net ([212.227.17.20]:60020) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cf9Kd-0004HL-NB for 25787@debbugs.gnu.org; Sat, 18 Feb 2017 13:02:04 -0500 Received: from labiere.lan ([80.229.147.137]) by mail.gmx.com (mrgmx103 [212.227.17.174]) with ESMTPA (Nemesis) id 0MC3zg-1cWNu92bVQ-008tnd; Sat, 18 Feb 2017 19:01:57 +0100 From: Pierre Langlois To: 25787@debbugs.gnu.org Subject: [PATCH 4/6] gnu: nss: Update to 3.28.1. Date: Sat, 18 Feb 2017 18:01:55 +0000 Message-Id: <20170218180155.1395-1-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.11.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:hpC8k4/qRRj0DYrmPlpiCP8alQnu0N3OVJjF7mMVL9js78RLEgO hTJkj3pAnEahWNcYAWQVhwDMM6UkcQqcF8K3Wk+roch8fwHrkJcS9sH66ej1OR2TXS4F+l2 3+/S/XLLAKNk12TjINSTFUL/lCpWBJ5997Gn2HcRgYGW0ty++8KciVWvKzx+xvkP7x3oNOq awZKTHJmZSNkKB+dj8o5A== X-UI-Out-Filterresults: notjunk:1;V01:K0:oguCJj4wNNA=:O4lNdMDzB38ojpC5L6qONn nJNX9P7dqZxZ0hfUxu0rEY9EdGcYA7JArBMrA/+ZNMZ3FLDlhqrR6DR+FhZbIVfsn8Th8NR5o TNnQei05n8H7xDIlNgheovCwr+2nq7oDQL9NtaTGHyJbV7NMhbJfF4slQmdHia9p7fU1n3R5R uAQzx0WxFu+FuzyAh3660l4xEnpW1L37ESanPC2B2HuGB7v8tVIKU7IRL4ZeOmEnAvXl27i32 UhfpmWzDC8lecSAcV7uMh+pZH/YaeXD+RVYpk6zKa/Bku/SEVlh1a66Ijf2mzBg0wVwvj/kZ+ nSUWEeoqB7KjT20eLMyIFJChPSsdhzJqknTaL6dPdnierZ6ZDfAvGu890Hga5xrlJy3A1S8An 2M/LvsqfgrgQvVf3Wa6FTWkDvMIVvVDiPHne7pxdhhgjnz2kb/XI9TkzE57RWq3UkjQqBWaDf BpbBqV/6TT22N1241MfR+eWWXuODOJ2UrXLGQ7/vacRllRUWvl9xj5lp4rfTy6VgGXcg30ivf LqOvASKx/rbO28PsUu6gIyZXEkk4qu4VqW6CHGiq/K9FFUxKyE9FPRAnEdNggMtfAboM4u6/7 hui0U7ZAfSRVRUfGn9aIMH8EkrzOMyc9jBXzEkucBX+mZZYxsEvvNi8sLxW9oWU+I2YH97xIW 47lEQ4Vzl9RxAYmTIG3+j8lv8v8G74L51kS8MQQeM0xDofo2RfnO171cYtcti5sty5WumCEgq m9Zd8dZ4/iE0L8W5hg/NNeARurSL08yfNV5JqRDYh3FzCHAaenQnD4e4H11kvfhkE8nprtAJ9 fCYCvw6 X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 25787 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.2 (/) * gnu/packages/gnuzilla.scm (nss): Update to 3.28.1. * gnu/packages/patches/nss-pkgconfig.patch: Adjust DIRS. --- gnu/packages/gnuzilla.scm | 5 +++-- gnu/packages/patches/nss-pkgconfig.patch | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 9279c46b5..c6c5ff28a 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Alex Griffin +;;; Copyright © 2017 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -186,7 +187,7 @@ in the Mozilla clients.") (define-public nss (package (name "nss") - (version "3.27.1") + (version "3.28.1") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -197,7 +198,7 @@ in the Mozilla clients.") "nss-" version ".tar.gz"))) (sha256 (base32 - "0sraxk26swlgl7rl742rkfp5k251v5z3lqw9k8ikin0cjfhkfdpx")) + "1bc23bg7adrxds3k3jdahy6g8f1ma57sggi0v3k275gdq02hrk2q")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch")))) (build-system gnu-build-system) diff --git a/gnu/packages/patches/nss-pkgconfig.patch b/gnu/packages/patches/nss-pkgconfig.patch index e611f69be..a33e05fcf 100644 --- a/gnu/packages/patches/nss-pkgconfig.patch +++ b/gnu/packages/patches/nss-pkgconfig.patch @@ -221,5 +221,5 @@ Later adapted to apply cleanly to nss-3.21. RELEASE = nss --DIRS = coreconf lib cmd external_tests -+DIRS = coreconf lib cmd external_tests config +-DIRS = coreconf lib cmd gtests ++DIRS = coreconf lib cmd gtests config -- 2.11.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 18 13:02:50 2017 Received: (at 25787) by debbugs.gnu.org; 18 Feb 2017 18:02:50 +0000 Received: from localhost ([127.0.0.1]:45348 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cf9LK-0004WA-Vu for submit@debbugs.gnu.org; Sat, 18 Feb 2017 13:02:50 -0500 Received: from mout.gmx.net ([212.227.17.22]:63833) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cf9LI-0004Vw-Pc for 25787@debbugs.gnu.org; Sat, 18 Feb 2017 13:02:45 -0500 Received: from labiere.lan ([80.229.147.137]) by mail.gmx.com (mrgmx101 [212.227.17.174]) with ESMTPA (Nemesis) id 0MUUWN-1coseW0G4h-00RIqX; Sat, 18 Feb 2017 19:02:35 +0100 From: Pierre Langlois To: 25787@debbugs.gnu.org Subject: [PATCH 5/6] gnu: sqlite: Enable FTS3. Date: Sat, 18 Feb 2017 18:02:33 +0000 Message-Id: <20170218180233.1470-1-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.11.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:bZ9nKCbnQd/gHH6tvyKpbJ1pvuw3YSURkgwe6EsbDTRd3IXJ/cf u6ad1/JJAYwDOI5uaJppovZ0gVk9JUYysIYa4DQBVO5N6JidCmRzYUtNHQpFRtjLvibgxTX PTc6o5hTIWAtVWtGC0jacynjcUVZyXLJy1Fjo2s+CJ3TCyK9P/97nvT8DAmQR4MFWbSjOE9 suvCzP4DvOg4He0Jral3g== X-UI-Out-Filterresults: notjunk:1;V01:K0:z3K8Hk6Qy0Q=:15FW3wQbAigzsRIr+Gs6iY lOE7P9ZllK9dpVxeu0Sam5Y5XbG4Pi4GxZQIUWWwEw/7V081HJxRSd0U96demzvNKxE5Z4slX eV9Tx6rTlC6bpGMsvIAlTR8X48sZCqXrXqhaapAwPRBOgJK5O8rJzcifZOLjk0z0/aAwvV2t/ juFQj5BdF2g3kaSYxP5VVDggHCZfz/uMNotCPJ/EUp7HOQfkJ3b4RltCh+2qQdAypwq5WZUWK n5eLZ0ILlBEezdXWCclsuH75uzfim06Fia8O0LPIcWjg1Mdx1+OC7lsF8GFdI1c07IYIeHDjx +jIuRAl/6EmidCYrSxYCa0wfEtst1Zcd/YFwxyP19MCqNJJUvIPs0NKIwc+ICYuKNPTQdQQdK a9verWT8mvHrec2Dkaau9LhuR5HIHmt7WMMqsLVjwiAxJpD1/n3cFCA1lSU+VDppbrFpa8/fC fZZZc9Z3Qmc7STWI3CtRfh81DAO634yYGFdZ+yxGLQD+SOIJewxi0NCN30JL1HPvxRluMBASN nomxZUiM3eeONjWnNTpihjyJQId9Sb4hx6ETookBvrtlMWs8h09WjFzAfEWtFBNKK1ZLaC2A3 1rkkzueid5en0IOWIEejkFHV5jQdW6CtCLjPLs/8o32KZq6wirlxMOIQQlO+X7RhCQ8xZmfT3 3ST96mKJioMCsSOzDQI7Xzc7PS9ab+FUQJF51KjV2PyJ2t0FL9PU0iotDTGq4c63LLby2M1cY 2ajxRlV+fK4J1MYlLmn94I2tx1wayD9yFNX7kQZTezhCBuBxRQnT+NErUZcbD/uFy1QQAQgop H+e/dbvbNpGyzEhEQdkV2eifdN8oGo7dr08ba98dCMVBjrdYh/jbJsqEF6vPjf35zEI7oavS8 6fphUHqGjO8M76328ikuQ7zvlkw5jdgrhvn7VuifSyMlnrRy+mmfNpm0+uUY0v1U4T3+WJHUF VZoG7m53+cABQMW9UQI2xSwqMbqxm815/KYz4Y6E0XBKaHJK/LWVJOb+70mAtCp+xkRiuNFoi lvN+Ndgmmme40Eb7qz4/LCs= X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 25787 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.2 (/) * gnu/packages/databases.scm (sqlite)[arguments]: Enable configure-flags -DSQLITE_ENABLE_FST3 -DSQLITE_ENABLE_FTS2_PARENTHESIS -DSQLITE_ENABLE_FTS3_TOKENIZER --- gnu/packages/databases.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index fd8baa153..171c85eef 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2016 Andy Patterson ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017 Thomas Danckaert +;;; Copyright © 2017 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -704,9 +705,13 @@ for example from a shell script.") ;; Add -DSQLITE_SECURE_DELETE, -DSQLITE_ENABLE_UNLOCK_NOTIFY and ;; -DSQLITE_ENABLE_DBSTAT_VTAB to CFLAGS. GNU Icecat will refuse ;; to use the system SQLite unless these options are enabled. + ;; Additionaly, Clementine needs support for the FTS3 extension. (list (string-append "CFLAGS=-O2 -DSQLITE_SECURE_DELETE " "-DSQLITE_ENABLE_UNLOCK_NOTIFY " - "-DSQLITE_ENABLE_DBSTAT_VTAB")))) + "-DSQLITE_ENABLE_DBSTAT_VTAB " + "-DSQLITE_ENABLE_FTS3 " + "-DSQLITE_ENABLE_FTS3_PARENTHESIS " + "-DSQLITE_ENABLE_FTS3_TOKENIZER")))) (home-page "http://www.sqlite.org/") (synopsis "The SQLite database management system") (description -- 2.11.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 18 13:03:00 2017 Received: (at 25787) by debbugs.gnu.org; 18 Feb 2017 18:03:00 +0000 Received: from localhost ([127.0.0.1]:45351 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cf9LY-0004Wc-CA for submit@debbugs.gnu.org; Sat, 18 Feb 2017 13:03:00 -0500 Received: from mout.gmx.net ([212.227.15.18]:57079) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cf9LW-0004WM-BH for 25787@debbugs.gnu.org; Sat, 18 Feb 2017 13:02:59 -0500 Received: from labiere.lan ([80.229.147.137]) by mail.gmx.com (mrgmx001 [212.227.17.184]) with ESMTPA (Nemesis) id 0Likl3-1c4yiF3DYr-00czyX; Sat, 18 Feb 2017 19:02:50 +0100 From: Pierre Langlois To: 25787@debbugs.gnu.org Subject: [PATCH 6/6] gnu: Add Clementine. Date: Sat, 18 Feb 2017 18:02:49 +0000 Message-Id: <20170218180249.1522-1-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.11.1 X-Provags-ID: V03:K0:3EdOvBR7thGtf7CcJCV4UOdTX3/wI5Wpj+lQqB+e9RXQzGq8zOJ uIyvqz9CdWJv6MtO4iLyrCNPXzz+DpdRQQeDNRfnhtv4AKEEmjZdWlUWA4st1s2dtImfTWR RMCslLYGQPQM2Wx18ldm12KQvdfma/vcM46rjDXQ9aFH4lyVFbXqlkX8SqKic+DQHVIrKbO A0Zx8RDT6aJT2MED+RMZg== X-UI-Out-Filterresults: notjunk:1;V01:K0:mLHaiO+GIZM=:s0jQcun/2MhMlnk7x1Y3u9 04ulB60zrlAkTfLKeIL265zOGGB21TF0J7MJ+q992/YU8kFFGcKyu4KQvO/ipxDe4+R8N5OOS DBxJrl8B9I2tj+DN094/FVKE0FI/4awZ3c4xmYaBefBBzIMCsyYxLwFpEiEwpjgGN9n7a2ogE Qf02MogTXoUAVjtsQvCtpr4ltDR/+NDdWPb7kN+NoianEuIgM+wllI2brO5m9suxmVp8Mcy9C VzAKVcpX0O3RvT7v8pLcWYnq44AGvBk2/zHHEAsGOgfN2vas63OqzJZeWCWvsURiLoch2jZnk if9bsBo6gFVPJIM+3nxKNpmmmsGtfqkfXk9YORfNKO/nFCu4l1Qoppd+wdV2yDOKbYZwixg06 U5GasFFd0IFGktw1x5ouNjEBsG1APW7y9Yg3S0DjqMRPAhX1ZGq3XGAT9xfLUhSX9p/bEVZkB 555OnGnTg0f08B7A8PaEEqB6NoIneVeZHE+4/fsz+3em9ivtK2AKzsiiJ67EWyuq55KKewsZC hbkl23SFVDXXZi4jbp3NgqLYZc44KIvC+tgHkalaCooLIuB7yfzFhvJZnou+U/FGTwP1+bR1n Fc2Dr5MPjPDnTJrI8W4I3vlLK1sc9DdgZ+4815HA1ENpEHTmEu5J/FrOrppKoD97YLtBCKtE9 l8K8J8EdooK/wFFx+BnjgAaIqNeEW0xjZYJPCKHRoEp4zJMfbaRDkYGJ29k8S44GoXTiyH06a BR7oeH6f4ZHhZt5FJHO21epwedNTpy+u0x/ef1NqpxHZyzPNY8Zo1wRb66A= X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 25787 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.2 (/) * gnu/packages/music.scm (clementine): New variable. --- gnu/packages/music.scm | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 84c537d86..fe8cad325 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -51,7 +51,10 @@ #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages curl) + #:use-module (gnu packages crypto) #:use-module (gnu packages cyrus-sasl) + #:use-module (gnu packages databases) + #:use-module (gnu packages datastructures) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages emacs) @@ -69,6 +72,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages graphics) + #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages image) @@ -76,6 +80,7 @@ #:use-module (gnu packages java) #:use-module (gnu packages linux) ; for alsa-utils #:use-module (gnu packages libffi) + #:use-module (gnu packages libusb) #:use-module (gnu packages llvm) #:use-module (gnu packages man) #:use-module (gnu packages mp3) @@ -87,6 +92,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) ;libsndfile + #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages qt) #:use-module (gnu packages rdf) @@ -172,6 +178,55 @@ and play MIDI files with a few clicks in a user-friendly interface offering score, keyboard, guitar, drum and controller views.") (license license:gpl3+))) +(define-public clementine + (package + (name "clementine") + (version "1.3.1") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/clementine-player/Clementine/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0z7k73wyz54c3020lb6x2dgw0vz4ri7wcl3vs03qdj5pk8d971gq")))) + (build-system cmake-build-system) + (arguments + '(#:tests? #f + ;; TODO: Package projectm to enable visualisations. + #:configure-flags '("-DENABLE_VISUALISATIONS=OFF"))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config))) + (inputs + `(("boost" ,boost) + ("chromaprint" ,chromaprint) + ("cryptopp" ,cryptopp) + ("fftw" ,fftw) + ("glib" ,glib) + ("glu" ,glu) + ("gstreamer" ,gstreamer) + ("gst-plugins-base" ,gst-plugins-base) + ("libcdio" ,libcdio) + ("libechonest" ,libechonest) + ;; TODO: Package libgpod. + ("libmtp" ,libmtp) + ("libxml2" ,libxml2) + ("protobuf" ,protobuf) + ("pulseaudio" ,pulseaudio) + ("qjson" ,qjson) + ("qt" ,qt-4) + ("sqlite" ,sqlite) + ("sparsehash" ,sparsehash) + ("taglib" ,taglib))) + (home-page "http://clementine-player.org") + (synopsis "Music player and library organizer") + (description "Clementine is a multiplatform music player. It is inspired +by Amarok 1.4, focusing on a fast and easy-to-use interface for searching and +playing your music.") + (license license:gpl3))) + (define-public cmus (package (name "cmus") -- 2.11.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 20 09:23:04 2017 Received: (at 25787) by debbugs.gnu.org; 20 Feb 2017 14:23:04 +0000 Received: from localhost ([127.0.0.1]:46955 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cforn-0002gn-JE for submit@debbugs.gnu.org; Mon, 20 Feb 2017 09:23:04 -0500 Received: from s01-out.spamexperts.axc.nl ([185.175.203.25]:40829) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cfork-0002g1-MN for 25787@debbugs.gnu.org; Mon, 20 Feb 2017 09:23:01 -0500 Received: from vserver42.axc.nl ([159.253.0.80]) by s01.spamexperts.axc.nl with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86) (envelope-from ) id 1cfore-0002d4-DG; Mon, 20 Feb 2017 15:22:54 +0100 Received: from mail.axc.nl ([159.253.0.157]:37680) by vserver42.axc.nl with esmtp (Exim 4.87) (envelope-from ) id 1cforb-0007yU-8A; Mon, 20 Feb 2017 15:22:51 +0100 Date: Mon, 20 Feb 2017 15:22:44 +0100 (CET) Message-Id: <20170220.152244.881122869261660698.post@thomasdanckaert.be> To: Pierre Langlois , 25787@debbugs.gnu.org Subject: Re: bug#25787: [PATCH 6/6] From: Thomas Danckaert X-Mailer: Mew version 6.7 on Emacs 25.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit PrimaryMX: Accepted email from trusted host. Hint: This skips spam scanning so make sure other host is not vulnerable X-Relay-Host: 159.253.0.157 X-Spam-Score: 0.0 (/) X-Spam-Report: Spam detection software, running on the system "vserver42.axc.nl", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi, thanks for the patch, I'd like to use clementine on Guix! I managed to build and run the program, but experienced some stability issues. Importing music into the library seemed to work fine, but I couldn't really play back files: [...] Content analysis details: (0.0 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- SpamTally: Final spam score: 0 X-Originating-IP: 159.253.0.80 X-SpamExperts-Domain: vserver42.axc.nl X-SpamExperts-Username: 159.253.0.80 Authentication-Results: spamexperts.axc.nl; auth=pass smtp.auth=159.253.0.80@vserver42.axc.nl X-SpamExperts-Outgoing-Class: ham X-SpamExperts-Outgoing-Evidence: Combined (0.05) X-Recommended-Action: accept X-Filter-ID: s0sct1PQhAABKnZB5plbIaExX4b9HB97Y0LqBeziPXa8B5kabb+8+DRlCqSxA333/bPom7IVowNb jNmNSGjlJADpxEq2QWue0NVTi1XPmXej1KRrf1Y8eevl1lZRQAkHO76XSTAwtV4mg4i2ouCDa4AU hvIWAV5xUW/+gAh4vXq3Bb+ZmrYvRFMMrncX61pQRcOb18WfxGyg6Om6u4YYm30ENGS07y4VJEAx 2DzoEMfEJmXb7Ar/H99E7t+JzjZEexI6JliONwAnIAZqFP/xQOWBOXp8nHKe0R+FkIqN7hkbx4Px vydb/x32mhLBChw5NNMPtXItjLG4t9x0O63zbyLpQCk9LN96ieg5guM8uFge9Gory97ytKcl8m2v CNJ8q16AUQgygDMMJTOfrbMny5ng/mkk3DMPbl3g5zFC4FfJ+LDk+6c65WNHYJFrd5FIBZ6++Dfk TVlBWsR5QGkluYsktHOcNcA7Yit+vIPIFAQmEqN5fXoI0ArDZbumk3L6kihXO2fRb8rpv65HbpOd qmjDv/9lZWhS1i8CvLmhSHJulq+YCc1Jf9I1b2AZYErcjxqVInDtyLKdhpFYlh+5i0pJkzvQFD0n 4ZCeWWj00iQamUdylUIKhf3z2GAHxH7IDucbqyPscDcg4YAFlcEg0Tzlt0qfM+8esN3hLUMHrXGv tIwVwtG3DC5ZfBJgPeIovZ1lzptptgCaKD2vAjUZLPpf6gRpr0cy1Rs9Y+3TGPm4JB1ks2EvBGu0 XnP7uzX+39Uh4ttSsZc8acEN4bpATlENVoJ7y9+G5+4XqiQ6ETamLQZxMhK2cg2102x6FacTl/p1 35YnYBday6MobZugOrNZxe01GfYTRQ24ZSOg6qs= X-Report-Abuse-To: spam@s01.spamexperts.axc.nl X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 25787 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Hi, thanks for the patch, I'd like to use clementine on Guix! I managed to build and run the program, but experienced some stability issues. Importing music into the library seemed to work fine, but I couldn't really play back files: - The first few times, the program segfaulted when I tried to play files (I tried mp3 and ogg). - Then I ran it in the debugger and it didn't segfault anymore. - Then I tried it again without the debugger, and it didn't segfault, but now my desktop (Gnome on GuixSD) froze (while the music kept playing). I had switch to a tty and restart xorg-server. Are you not experiencing stability issues? > gnu: Add qjson. > > * gnu/packages/qt.scm (qjson): New variable. > [...] > + ;; The tests require a X server > + ;; #:configure-flags '("-DQJSON_BUILD_TESTS=ON") > + `(#:tests? #f)) Have you tried (setenv "QT_QPA_PLATFORM" "offscreen") to try running the tests anyway? Another approach that is sometimes used is starting an X server with (system (format #f "~a/bin/Xvfb :1 &" xorg-server)) (setenv "DISPLAY" ":1") The rest of the patches look good to me. Hopefully someone else can comment on the cryptopp issue (I don't necessarily see why it is necessary to exclude it). cheers, Thomas From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 22 10:28:27 2017 Received: (at 25787) by debbugs.gnu.org; 22 Feb 2017 15:28:27 +0000 Received: from localhost ([127.0.0.1]:51318 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgYqB-0001Pe-70 for submit@debbugs.gnu.org; Wed, 22 Feb 2017 10:28:27 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:56506) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgYq9-0001PV-QO for 25787@debbugs.gnu.org; Wed, 22 Feb 2017 10:28:26 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id B533C22636; Wed, 22 Feb 2017 10:28:25 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Wed, 22 Feb 2017 10:28:25 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=fastmail.com; h= content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=LY8hd6XTjt2WjaHx0xYGb9S3XpE=; b=vMo5e7 h0/6B2g6Y8PQEjsXbWH3JXYv7IuWTltakOPxFD0if8WrSJvpztzvQZXDfX4GMoG9 vUdkbYLfLtDUrXWbkigPWhksqb2KLHYPp4AEi4Gq9yzsYczo5oonwH2W22f9fm0b MxO+0l4WaVasL+kXLJ/JrIgEEGKQdsjCylCBs= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=smtpout; bh=LY8hd6XTjt2Wja Hx0xYGb9S3XpE=; b=kosZAUyWDOgtj3vK3BYyWRQ9dSqtxaSYdfaU/OyFM3IsVw WkG9ODgv4BvRRydBwxg8HQxBD1X1yp8IudkAqCQ6UJtWZwSaAFhbtJBHF7eY6SSm 13lDA5OApOXhzjVy9rLCZN/2dPq4+YDp2jZwtVatV59+VLuoi2ejZR+y6tSNQ= X-ME-Sender: X-Sasl-enc: K1KXTQLBZaWu93uR5fTeBtD77R6N+ena5CZgtpEj/288 1487777305 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 534897E2B2; Wed, 22 Feb 2017 10:28:25 -0500 (EST) From: Marius Bakke To: Pierre Langlois , 25787@debbugs.gnu.org Subject: Re: bug#25787: [PATCH 0/6] Add Clementine music player. In-Reply-To: <20170218133830.24091-1-pierre.langlois@gmx.com> References: <20170218133830.24091-1-pierre.langlois@gmx.com> User-Agent: Notmuch/0.23.5 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Wed, 22 Feb 2017 16:28:23 +0100 Message-ID: <87tw7mfdns.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" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 25787 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Pierre Langlois writes: > Hello guix! > > Here are patches to add the Clementine music player [1] and its dependencies. > First of all, thanks all of you for Guix{,SD}! It's a lot of fun to play > with. Hi Pierre! Thanks a lot for packaging this! > I have a couple of questions about this series: > > * cryptopp > > I believe this *should* be an optional dependency but I wasn't able to disable > it. It seems to be used for spotify support: > > ~~~(CMakeLists.txt) > if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND) > message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify " > "code must be compiled in") > elseif(CRYPTOPP_FOUND) > set(HAVE_CRYPTOPP ON) > set(HAVE_SPOTIFY_DOWNLOADER ON) > endif() > ~~~ > > What do you think? Should we patch the above file to disable spotify support > or should we package cryptopp? I've done the latter in this series. I don't see any reason not to use crypto++ here. > * sqlite/nss > > I ran into complications with this package when I realized Clementine needed > the FTS3 extension enabled in sqlite [2]. I've been able to test this but it > took an entire day to rebuild all packages depending on sqlite in my profile > :-P. By the way, the fact I can do this is great! I wonder why FTS3 is not enabled by default in sqlite, as it seems useful. Any idea? If there are performance or compatibility problems, we could probably ship it as a separate package. > As a result, the nss package was rebuilt and I consistently got 6 failures, > all due to a PayPal certificate. I had no idea how to fix this so I updated > the nss package to the latest release and the tests passed. Yes, this is a known problem. https://lists.gnu.org/archive/html/guix-devel/2016-12/msg00828.html We also tried updating to 3.28 recently, but it also fails to build on ARM platforms, so we're currently "stuck" on 3.27.1. https://lists.gnu.org/archive/html/guix-devel/2017-01/msg01982.html > So I suppose this series should probably go in a branch as it will require a > lot of rebuilding. For now, you can define a separate sqlite package with FTS enabled. See e.g. "gd-for-php" in php.scm for an example of inheriting a package, and grep around for 'substitute-keyword-arguments' to see how to override inherited configure flags. I will comment on the other patches individually. Thank you! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlitrhcACgkQoqBt8qM6 VPpB5wgAg3jgW8p1k3BTEk2F6QAr0S+3oggEEWScMmQFlloG14vFwX5Sk/y5MTws v+NVuMHZa80npb6VRj1U1XGN862eWGs0BoxFfr6ox70fssUXyWDIbmCsVwyJooYb 7tfWEUUQu2IOxUHjmXSPeqQueoTO3ExNzsfalfsb0MPPOTuXZbSZAmw2E3QtkNCs Ii+sDBuzHXBKOGvGBSCv2Al2Us6Yn6jngeYoNLhC1BZlgs2YzJHCAypRk9jNVqxX 3RFsVp1PZfDX5R/tXfgVNHWR/aKTJdcfGsaBIQXhxHLe9M6JsDk9DECy7PHrwm1p lYDpXtHkcCFOXuKGo6MitXSR/Mnw+Q== =7ql+ -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 22 10:53:30 2017 Received: (at 25787) by debbugs.gnu.org; 22 Feb 2017 15:53:30 +0000 Received: from localhost ([127.0.0.1]:51330 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgZEK-0001z9-RU for submit@debbugs.gnu.org; Wed, 22 Feb 2017 10:53:30 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:60085) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgZEI-0001z0-0c for 25787@debbugs.gnu.org; Wed, 22 Feb 2017 10:53:22 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id BFAB020F1D; Wed, 22 Feb 2017 10:53:21 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Wed, 22 Feb 2017 10:53:21 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=fastmail.com; h= content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=fETiOJ0dLuW0CIOBRQhizzEINF0=; b=JKaHUs TPKSP3ZPF3tBRwJvCBOM+uCszk2AX71jQGgMIKvXDgAKUhUPMtTUPhsX4wjH2v9C vOfIj5yXQOHA8yKFdj+BOuedDcItOa1ZC2HSODmQAaBrRvnghS984yTlPzRvtn2i rImoxMKaiojEIG1FXtm2HmWO2F1WDP+XSCC+s= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=smtpout; bh=fETiOJ0dLuW0CI OBRQhizzEINF0=; b=LkjqlFmSxl4bbQOqS9c+cFapNZxxouq7OW0YV1i4GCKlup FMsGxycI1U2dhPs72/Mk69qE1JpL+9fmgaAy14gDQ0hqMnHm3fgDeqvkR2PPKhMU u+7X5+UMfF2iFWwGXww3y2/PydZnlIXBtfF8plDsDO1VjQMo3blpECxb/4FXw= X-ME-Sender: X-Sasl-enc: Hn9F4G2jto7e9iXNNekw5zAcbFEEgaw7R2Sxg6NoFf4h 1487778801 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 649AB7E2B2; Wed, 22 Feb 2017 10:53:21 -0500 (EST) From: Marius Bakke To: Pierre Langlois , 25787@debbugs.gnu.org Subject: Re: bug#25787: [PATCH 3/6] gnu: Add cryptopp. In-Reply-To: <20170218180113.1331-1-pierre.langlois@gmx.com> References: <20170218133830.24091-1-pierre.langlois@gmx.com> <20170218180113.1331-1-pierre.langlois@gmx.com> User-Agent: Notmuch/0.23.5 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Wed, 22 Feb 2017 16:53:19 +0100 Message-ID: <87poiafci8.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" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 25787 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Pierre Langlois writes: > * gnu/packages/crypto.scm (cryptopp): New variable. I've actually been sitting on this package for a while, hoping they would release a version with this fix: https://github.com/weidai11/cryptopp/pull/347 Can you try to extract out the commit and add it as a patch? > diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm > index fd2b5a36b..a8756e2ab 100644 > --- a/gnu/packages/crypto.scm > +++ b/gnu/packages/crypto.scm > @@ -6,6 +6,7 @@ > ;;; Copyright =C2=A9 2016 Tobias Geerinckx-Rice > ;;; Copyright =C2=A9 2016 ng0 > ;;; Copyright =C2=A9 2016 Eric Bavier > +;;; Copyright =C2=A9 2017 Pierre Langlois > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -414,3 +415,46 @@ utility as a demonstration of the @code{scrypt} key = derivation function. > @code{Scrypt} is designed to be far more resistant against hardware brut= e-force > attacks than alternative functions such as @code{PBKDF2} or @code{bcrypt= }.") > (license license:bsd-2))) > + > +(define-public cryptopp > + (let ((version "5.6.5")) I don't think it's necessary to bind the "version" variable outside the package scope. > + (package > + (name "cryptopp") I would call this "crypto++" both here and in the variable name. It matches the upstream project name more closely, and is also how it is known in the Common Platform Enumerations (CPE) database.[0] https://lists.gnu.org/archive/html/guix-devel/2017-02/msg00587.html > + (version version) > + (source (origin > + (method url-fetch) > + (uri (string-append > + "https://github.com/weidai11/cryptopp/archive/CRY= PTOPP_" > + (string-join (string-split version #\.) "_") ".ta= r.gz")) Please download from the home page when possible: https://cryptopp.com/cryptopp565.zip > + (file-name (string-append name "-" version ".tar.gz")) > + (sha256 > + (base32 > + "11p6mak784mx8hjasg9alwk4g3q5bsfrik9lv73a34dinca5bzbr= ")))) > + (build-system cmake-build-system) > + (arguments > + '(#:phases > + (modify-phases %standard-phases > + ;; A libcrypto++.pc file is not included, create it. Nice! > + (add-after 'install 'install-pkg-config > + (lambda* (#:key outputs #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out")) > + (pkgconfig-path (string-append out "/lib/pkgconf= ig"))) > + (mkdir-p pkgconfig-path) > + (with-output-to-file > + (string-append pkgconfig-path "/libcrypto++.pc") > + (lambda _ > + (format #t > + "prefix=3D~@*~a~@ > + libdir=3D${prefix}/lib~@ > + includedir=3D${prefix}/include~@ > + Name: libcrypto++-~1@*~a~@ > + Description: Class library of cryptographic sc= hemes~@ > + Version: ~1@*~a~@ > + Libs: -L${libdir} -lcryptopp~@ > + Cflags: -I${includedir}~%" > + out version))))))))) Ahh.. This is why it was let-bound. You can "unquote" version here to make it be evaluated without binding it at the top level. Note: You probably also have to "quasiquote" the arguments with ` instead of ' (on the line that contains #:phases). > + (home-page "https://cryptopp.com/") > + (synopsis "C++ class library of cryptographic schemes") > + (description "Crypto++ is a free C++ class library of cryptographic > +schemes.") > + (license (list license:boost1.0 license:public-domain))))) This needs a comment explaining what is covered by which license. Can you send an updated patch? :) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlits/AACgkQoqBt8qM6 VPo9Xgf/Vn4CCtP74OjtSaqLk8d70wPzcVMZrbXII/t0TFiiS21yAXf9TBzHtrej WIn9mQRipEa3OE6OoXK0Bi1HrGP39UnnU2OzsUfo85P/UQ+MmQE9vNfF74u/8lHb 76+p3HRnVQQMXlGxDNgovW3Zwd7OOrnlW6R4i8ihXMu3AXwqkDNhom9XwKc/oaGC Npw/vD8M7jvohMPARVLJCK6VOuuEWPq51B+MQO882BP4NPNNeGxDqyQRxLU6FI6Y 74Q84sTBxMSoJSo6/Tru1fAXj98DR/50bXPlSFxNtCL9yfuIl8cCZrGgEZlTAddQ HugxC7JciPEIBVcK2W6sgv9zRWj4iw== =mZRU -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 22 10:59:24 2017 Received: (at 25787) by debbugs.gnu.org; 22 Feb 2017 15:59:24 +0000 Received: from localhost ([127.0.0.1]:51335 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgZK5-00027H-2z for submit@debbugs.gnu.org; Wed, 22 Feb 2017 10:59:24 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:50846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgZK3-000279-It for 25787@debbugs.gnu.org; Wed, 22 Feb 2017 10:59:20 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id E441A22648; Wed, 22 Feb 2017 10:59:17 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Wed, 22 Feb 2017 10:59:17 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=fastmail.com; h= content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=LMIbqDk4AmEJsw/w+NFFTKZaJr4=; b=DrRcXe XZu9bmsg8Wg7OtHtUAM9cH1F2hfcooidbZNecAg9g5MY5Q/axxYYCAoMyTeyH1cK 6T4qXWjUAnQLCTvvFu1M7P6UJiFpoSDhvSmyXckQJ5J9p8Oezx8Zawp4H8OhYBiO bMUr4T/sz8AyGuJahvNyuyeU71x09q05gLAOI= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=smtpout; bh=LMIbqDk4AmEJsw /w+NFFTKZaJr4=; b=e7A/V97aOKHJ+A3+ctD37ge0B6slHr2TwujxEgEFJ4AxG5 c5KPeIp0cnxbVPuLuD34Zay0jjNZJ5H9hrnkmNju28YrCsiIfAoKdg6k9bGQRJgb eLHfe+4/0yucwZI3uD6wZdbs/7UsqS3RNnIkBtdN7fY9y/gLNr5TF49Xr1QBU= X-ME-Sender: X-Sasl-enc: I7IIe3fv2oNUHizoym2dW2wYH8HV0cZn9r4v7+sbDfyF 1487779157 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 638207E3B7; Wed, 22 Feb 2017 10:59:17 -0500 (EST) From: Marius Bakke To: Pierre Langlois , 25787@debbugs.gnu.org Subject: Re: bug#25787: [PATCH 1/6] gnu: Add qjson. In-Reply-To: <20170218180016.1050-1-pierre.langlois@gmx.com> References: <20170218133830.24091-1-pierre.langlois@gmx.com> <20170218180016.1050-1-pierre.langlois@gmx.com> User-Agent: Notmuch/0.23.5 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Wed, 22 Feb 2017 16:59:15 +0100 Message-ID: <87mvdefc8c.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" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 25787 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Pierre Langlois writes: > * gnu/packages/qt.scm (qjson): New variable. > --- > gnu/packages/qt.scm | 28 ++++++++++++++++++++++++++++ > 1 file changed, 28 insertions(+) > > diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm > index 47a7caae4..0895e034c 100644 > --- a/gnu/packages/qt.scm > +++ b/gnu/packages/qt.scm > @@ -5,6 +5,7 @@ > ;;; Copyright =C2=A9 2015, 2016, 2017 Efraim Flashner > ;;; Copyright =C2=A9 2016, 2017 ng0 > ;;; Copyright =C2=A9 2016 Thomas Danckaert > +;;; Copyright =C2=A9 2017 Pierre Langlois > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -1135,6 +1136,33 @@ developers using C++ or QML, a CSS & JavaScript li= ke language.") > `(("qtbase" ,qtbase) > ("qtdeclarative" ,qtdeclarative))))) >=20=20 > +(define-public qjson > + (package > + (name "qjson") > + (version "0.9.0") > + (source (origin > + (method url-fetch) > + (uri (string-append > + "https://github.com/flavio/qjson/archive/" > + version ".tar.gz")) > + (file-name (string-append name "-" version ".tar.gz")) > + (sha256 > + (base32 > + "1m0h4rajj99hv9w4i381a8x81lxiv167lxk10ncvphpkfxs624p8")= ))) > + (build-system cmake-build-system) > + (arguments > + ;; The tests require a X server > + ;; #:configure-flags '("-DQJSON_BUILD_TESTS=3DON") This line is not necessary. > + `(#:tests? #f)) > + (inputs > + `(("qt" ,qt-4))) Will this work with qt5 as well? If so, please build against "qtbase" here. Then you can add a qt4 variant by adding something like this at the end: (define-public qjson-qt4 (package (inherit qjson) (name "qjson-qt4") (inputs `(("qt" ,qt-4))))) Otherwise LGTM! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlittVQACgkQoqBt8qM6 VPqxrQf/ZHb/XF6fTKxYENlQHU/sNMxkaGWLRnJZnqF3FWjaVIBFUktJsTpXKFcC KBYHb6XQgV9g5IiPyLLw7U9C4se8riqjEIkeD4rK/WySO4KmNFZU2FXKsyDiyDq8 7XPhTYJSqKun8rBkAL7tftoKxKQf5ELRo+OQggF6alVB9GbhRYp+B/V+8zqqE/// eWYIstm9NBUInnTYv79qut7x/qDa9bzI3IstwDwgIvCkJyUcyaKup92agXx23hUX waUvtiWzRwM8BunxTDYoCcqYvA+1n2x9z909OvKUgkEwTFYRpaji4qPS5VZWQNQ0 li5qeyH4f+oX3OZQ9HSHaK3zXkuRHw== =xYjE -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 22 11:04:02 2017 Received: (at 25787) by debbugs.gnu.org; 22 Feb 2017 16:04:02 +0000 Received: from localhost ([127.0.0.1]:51339 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgZOb-0002FO-QW for submit@debbugs.gnu.org; Wed, 22 Feb 2017 11:04:02 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:34268) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgZOZ-0002FE-Mj for 25787@debbugs.gnu.org; Wed, 22 Feb 2017 11:04:00 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id A533C2271B; Wed, 22 Feb 2017 11:03:59 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Wed, 22 Feb 2017 11:03:59 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=fastmail.com; h= content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=eKyJCs07qqS9wLxRCHg3GGuYx7Q=; b=aYKuvi gMjlSXyytv19QzVOwEPlmfCTXru5JCMBVBsLg6lumRUCxe3/elY5xI1n5XOFHALu FowkFdT1esJDru/w7FO7Udjc6PuXL7lJMB+8iksNwLYvx3UaZQlRa9fe2G9VqoXv gwznQCI1aPm12apY+Yr/Dm8P2yQu1MpOMSNnQ= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=smtpout; bh=eKyJCs07qqS9wL xRCHg3GGuYx7Q=; b=fDmKw02p3VXO5CxOKHEJcWLrd9RXgY+NL3z4HzoSgD+rxr xJXhxw0iPuYdiPoMikEa6puiBz8drjC4owHgvMWhu5LBOlFq1eUaARugq0mJ22RB qRiuFBtf607TF+Fcy3mnqd6SIBcc5/wktFEukIJomlvjI7OZvwvupRuwoMdGo= X-ME-Sender: X-Sasl-enc: hin2ov4UiY2bdgM49/EHQpJP+elE4MNoySqdahOw5WND 1487779439 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 49C947E16E; Wed, 22 Feb 2017 11:03:59 -0500 (EST) From: Marius Bakke To: Pierre Langlois , 25787@debbugs.gnu.org Subject: Re: bug#25787: [PATCH 2/6] gnu: Add libechonest. In-Reply-To: <20170218180052.1267-1-pierre.langlois@gmx.com> References: <20170218133830.24091-1-pierre.langlois@gmx.com> <20170218180052.1267-1-pierre.langlois@gmx.com> User-Agent: Notmuch/0.23.5 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Wed, 22 Feb 2017 17:03:57 +0100 Message-ID: <87k28ifc0i.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" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 25787 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Pierre Langlois writes: > * gnu/packages/music.scm (libechonest): New variable. > --- > gnu/packages/music.scm | 27 +++++++++++++++++++++++++++ > 1 file changed, 27 insertions(+) > > diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm > index ce874ac43..84c537d86 100644 > --- a/gnu/packages/music.scm > +++ b/gnu/packages/music.scm > @@ -9,6 +9,7 @@ > ;;; Copyright =C2=A9 2016 John J. Foerch > ;;; Copyright =C2=A9 2016 Alex Griffin > ;;; Copyright =C2=A9 2017 ng0 > +;;; Copyright =C2=A9 2017 Pierre Langlois > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -2050,6 +2051,32 @@ detailed track info including timbre, pitch, rhyth= m and loudness information. > @end enumerate\n") > (license license:bsd-3))) >=20=20 > +(define-public libechonest > + (package > + (name "libechonest") > + (version "2.3.1") > + (source (origin > + (method git-fetch) > + (uri (git-reference > + (url "git://anongit.kde.org/libechonest.git") > + (commit "6895a77a46c9bd4e009ae08515bd91dc3cfbf548")= )) > + (file-name (string-append name "-" version "-checkout")) Could you add a comment explaining why we can't use a normal release tarball here? > + (sha256 > + (base32 > + "0xbavf9f355dl1d3qv59x4ryypqrdanh9xdvw2d0q66l008crdkq")= ))) > + (build-system cmake-build-system) > + (arguments > + '(#:tests? #f)) ; Tests require Internet access > + (inputs > + `(("qt" ,qt-4) > + ("qjson" ,qjson))) Same comment here about using Qt5 by default (if possible), and adding qt4 variants where necessary. > + (home-page "https://projects.kde.org/projects/playground/libs/libech= onest") > + (synopsis "C++/Qt classes to interface with The Echo Nest API") > + (description "libechonest is a collection of C++/Qt classes designed= to make @code{libechonest} ... > + a developer's life easy when trying to use the APIs provided by The Echo > +Nest.") Could you explain briefly what "The Echo Nest" is here? > + (license license:gpl2))) Do the sources explicitly specify "version 2 only"? Otherwise it should probably be gpl2+. Otherwise this package LGTM. > + > (define-public python-pylast > (package > (name "python-pylast") > --=20 > 2.11.1 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlittm0ACgkQoqBt8qM6 VPpsWgf/Zl9v4dK/arN41Kmaz1AyIzX9Km7P9Za6L1Sg4qzoJ936sNaNiSHG77G2 /A/VFUtEyp/e6jtAWlYgEC2aelEDiJ1178mHVta+CIHlC0khSiErbY4WoMoWrfEI GKoytvUpsWf4wRrOpf3XFQseQS7qlgxo0Qr99NvMed3mlQXWUibXmMybSgcP0Ynj exbgZBsuKOXBevB95OI4r9R9y71sXN9phjBJ2BfPLOaVmQUBZZO9GO1NmKFgFcfM cS8xR25geddaxU4QzGE0JX042ywGhBQY7WFvrkviSAWZdCjBzwaeefXBg1ym0Jec TgWXzcG8j9tWBstNSQF2VQeLR1VmRA== =t9TR -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 22 11:13:34 2017 Received: (at 25787) by debbugs.gnu.org; 22 Feb 2017 16:13:34 +0000 Received: from localhost ([127.0.0.1]:51354 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgZXp-0002UG-UC for submit@debbugs.gnu.org; Wed, 22 Feb 2017 11:13:34 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:53058) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgZXn-0002U8-D2 for 25787@debbugs.gnu.org; Wed, 22 Feb 2017 11:13:31 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 21D21226D4; Wed, 22 Feb 2017 11:13:31 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Wed, 22 Feb 2017 11:13:31 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=fastmail.com; h= content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=r+CjhlDBrMdg+sHHI3qauvlt3iI=; b=eGdkoL MiOInQLEoDjvXiz4QbZ8IYMO1rXrFkg0hB0i+beOakgPlIXIlwR7wlwJnQyWqZvM vnASUmmMWN4LY+mLXlhC3H86DVpxn+Uaib8scQmrmqH7IozyIElQGwgsuOXhKcMT eMmQ1vUO/r3eR2A6iz7ExKOMG4j95sCTBRDPA= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=smtpout; bh=r+CjhlDBrMdg+s HHI3qauvlt3iI=; b=IlH00zGA4K/zwGKO07u6PC2mJ/m/W9CTOG5ldgqhTakCUP y0IluP92JdYO3WrX1GO2iBS8xDM1TfoDvercS1psuDFk+Bta1HRdGcITcyWWYYZf 6je9zrX6KT60jJz8A2MQ6xcxJ7cZZknsrNE/gCF6IXnMOTeGOp2TPTpYMyAxE= X-ME-Sender: X-Sasl-enc: Is/5pllyyb3NKUHI58GzdfGWwx2giLSrsZpby99avzVL 1487780010 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id B02407E325; Wed, 22 Feb 2017 11:13:30 -0500 (EST) From: Marius Bakke To: Pierre Langlois , 25787@debbugs.gnu.org Subject: Re: bug#25787: [PATCH 6/6] gnu: Add Clementine. In-Reply-To: <20170218180249.1522-1-pierre.langlois@gmx.com> References: <20170218133830.24091-1-pierre.langlois@gmx.com> <20170218180249.1522-1-pierre.langlois@gmx.com> User-Agent: Notmuch/0.23.5 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Wed, 22 Feb 2017 17:13:29 +0100 Message-ID: <87h93mfbkm.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" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 25787 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Pierre Langlois writes: > * gnu/packages/music.scm (clementine): New variable. > --- > gnu/packages/music.scm | 55 ++++++++++++++++++++++++++++++++++++++++++++= ++++++ > 1 file changed, 55 insertions(+) > > diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm > index 84c537d86..fe8cad325 100644 > --- a/gnu/packages/music.scm > +++ b/gnu/packages/music.scm > @@ -51,7 +51,10 @@ > #:use-module (gnu packages check) > #:use-module (gnu packages compression) > #:use-module (gnu packages curl) > + #:use-module (gnu packages crypto) > #:use-module (gnu packages cyrus-sasl) > + #:use-module (gnu packages databases) > + #:use-module (gnu packages datastructures) > #:use-module (gnu packages docbook) > #:use-module (gnu packages documentation) > #:use-module (gnu packages emacs) > @@ -69,6 +72,7 @@ > #:use-module (gnu packages glib) > #:use-module (gnu packages gnome) > #:use-module (gnu packages graphics) > + #:use-module (gnu packages gstreamer) > #:use-module (gnu packages gtk) > #:use-module (gnu packages guile) > #:use-module (gnu packages image) > @@ -76,6 +80,7 @@ > #:use-module (gnu packages java) > #:use-module (gnu packages linux) ; for alsa-utils > #:use-module (gnu packages libffi) > + #:use-module (gnu packages libusb) > #:use-module (gnu packages llvm) > #:use-module (gnu packages man) > #:use-module (gnu packages mp3) > @@ -87,6 +92,7 @@ > #:use-module (gnu packages perl) > #:use-module (gnu packages pkg-config) > #:use-module (gnu packages pulseaudio) ;libsndfile > + #:use-module (gnu packages protobuf) > #:use-module (gnu packages python) > #:use-module (gnu packages qt) > #:use-module (gnu packages rdf) > @@ -172,6 +178,55 @@ and play MIDI files with a few clicks in a user-frie= ndly interface offering > score, keyboard, guitar, drum and controller views.") > (license license:gpl3+))) >=20=20 > +(define-public clementine > + (package > + (name "clementine") > + (version "1.3.1") > + (source (origin > + (method url-fetch) > + (uri (string-append > + "https://github.com/clementine-player/Clementine/ar= chive/" > + version ".tar.gz")) > + (file-name (string-append name "-" version ".tar.gz")) I noticed they have a qt5 branch: https://github.com/clementine-player/Clementine/tree/qt5 Would you be willing to see if it is in a usable condition? QT4 is no longer supported upstream, so I'm hesitant to add packages that depend on it. > + (sha256 > + (base32 > + "0z7k73wyz54c3020lb6x2dgw0vz4ri7wcl3vs03qdj5pk8d971gq"= )))) > + (build-system cmake-build-system) > + (arguments > + '(#:tests? #f Please add a comment mentioning why tests are disabled. > + ;; TODO: Package projectm to enable visualisations. > + #:configure-flags '("-DENABLE_VISUALISATIONS=3DOFF"))) > + (native-inputs > + `(("gettext" ,gettext-minimal) > + ("pkg-config" ,pkg-config))) > + (inputs > + `(("boost" ,boost) > + ("chromaprint" ,chromaprint) > + ("cryptopp" ,cryptopp) > + ("fftw" ,fftw) > + ("glib" ,glib) > + ("glu" ,glu) > + ("gstreamer" ,gstreamer) > + ("gst-plugins-base" ,gst-plugins-base) > + ("libcdio" ,libcdio) > + ("libechonest" ,libechonest) > + ;; TODO: Package libgpod. > + ("libmtp" ,libmtp) > + ("libxml2" ,libxml2) > + ("protobuf" ,protobuf) > + ("pulseaudio" ,pulseaudio) > + ("qjson" ,qjson) > + ("qt" ,qt-4) > + ("sqlite" ,sqlite) > + ("sparsehash" ,sparsehash) > + ("taglib" ,taglib))) > + (home-page "http://clementine-player.org") > + (synopsis "Music player and library organizer") > + (description "Clementine is a multiplatform music player. It is ins= pired > +by Amarok 1.4, focusing on a fast and easy-to-use interface for searchin= g and > +playing your music.") > + (license license:gpl3))) Same comment here about the license, it's most likely gpl3+. Otherwise LGTM, thanks a lot for packaging this! I skipped commenting on the nss and sqlite patches. For now, I would be happy to just use a "sqlite-for-clementine" package here, since it's the only package that requires the FTS3 extension. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlituKkACgkQoqBt8qM6 VPqXwwf+PP/4x5ncsgyHZtbJq3+iFDoGgJzxj7IUr4gPTNXMuPNcA0ryDO/tIgCH G2JziM4eTKHgxBjo1afHLTwc/KgiwEX2kcUgindiOPWbZ1WwU5Uw1ekrKtr2Fj1R quN0psqnY+E3HOqSH8DcimKEIM2TStTBO35ENLVYfF1iDvbib2Al+vNiJpiCAGHm KFq1Vd4flrxmIyKV0/Ea2fsRTDTcoP5iRZjHr5spUbE+Qtkn2huv5fBRp9tQ3Jfl 7YRX/+5Lp9ZGuw5FLNyM7ynlqEPMS4UI2UBUIfBUNOzTHi/vdPpPaXWOjXNKRzWb vRofmZ+O8Z8QYIuxEt9AAmd/g+saJA== =yyog -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 22 11:28:12 2017 Received: (at 25787) by debbugs.gnu.org; 22 Feb 2017 16:28:12 +0000 Received: from localhost ([127.0.0.1]:51373 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgZm0-0002qC-ET for submit@debbugs.gnu.org; Wed, 22 Feb 2017 11:28:12 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:55806) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgZlz-0002q5-4Y for 25787@debbugs.gnu.org; Wed, 22 Feb 2017 11:28:11 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 6EBDE20312; Wed, 22 Feb 2017 11:28:09 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Wed, 22 Feb 2017 11:28:09 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=fastmail.com; h= content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=l/eW4e1ZEPRZhT6P7ZE5lb2Job4=; b=Hvld7Q B0MUycWk6JAEBrn+duyJc7GevJP+tNWIf205STk07UHT/nH07NEevauK16aRlRl0 yWcCOtSUwIyYeGFXB+YxCLu8zDzhkU21ePLCKv95MuKK+yIZjz/we9TUoH9tVHZX gPcqclQx9gf7irw2ZMDo6syF0LFa6f5LV9d9Y= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=smtpout; bh=l/eW4e1ZEPRZhT 6P7ZE5lb2Job4=; b=Ui8BBpho/PzAFfdk0POSeR+mPql2y1LuFbh7DgT7LA8v+a xwmlXgaFGCHZQltZ5nr4e7KWUhSRnBmp/smYqslGn0pX95QioGOyE5psyoJ51l2h Fd6M1lxJxBNSij8rxnPwkhzC41/+C7DA4y0ioLshf8qjzPEAWaVLdH/ju5cQ4= X-ME-Sender: X-Sasl-enc: E83vAOedvWgorpUY0Q8eMZz3K5h5isUlvZrkSH7v+4o4 1487780889 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 095F77E325; Wed, 22 Feb 2017 11:28:08 -0500 (EST) From: Marius Bakke To: Pierre Langlois , 25787@debbugs.gnu.org Subject: Re: bug#25787: [PATCH 3/6] gnu: Add cryptopp. In-Reply-To: <87poiafci8.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> References: <20170218133830.24091-1-pierre.langlois@gmx.com> <20170218180113.1331-1-pierre.langlois@gmx.com> <87poiafci8.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> User-Agent: Notmuch/0.23.5 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Wed, 22 Feb 2017 17:28:07 +0100 Message-ID: <87efyqfaw8.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" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 25787 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Marius Bakke writes: >> + (add-after 'install 'install-pkg-config >> + (lambda* (#:key outputs #:allow-other-keys) >> + (let* ((out (assoc-ref outputs "out")) >> + (pkgconfig-path (string-append out "/lib/pkgconfig"))) >> + (mkdir-p pkgconfig-path) >> + (with-output-to-file >> + (string-append pkgconfig-path "/libcrypto++.pc") >> + (lambda _ >> + (format #t >> + "prefix=~@*~a~@ >> + libdir=${prefix}/lib~@ >> + includedir=${prefix}/include~@ >> + Name: libcrypto++-~1@*~a~@ >> + Description: Class library of cryptographic schemes~@ >> + Version: ~1@*~a~@ >> + Libs: -L${libdir} -lcryptopp~@ >> + Cflags: -I${includedir}~%" >> + out version))))))))) > > Ahh.. This is why it was let-bound. You can "unquote" version here to > make it be evaluated without binding it at the top level. Note: You > probably also have to "quasiquote" the arguments with ` instead of ' (on > the line that contains #:phases). I forgot to explain what "unquote" means. It's the ',' symbol, meaning "insert the result of this expression". Read more about unquote and quasiquote here: https://www.gnu.org/software/guile/manual/guile.html#Expression-Syntax --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlitvBcACgkQoqBt8qM6 VPopDAf+JwHEiCNcnL0wuA51AcTQLGMWTh9J44n9eFrXQz7byQBeCEO3YtTgpgKw ICQ98TMwheTzR2bfBh9/LuFsFaYhXb/OtlOwEsnMnjy6NBnaFh4Zma6yJyDUw3tq fkG/Ipr2hRZ+3SqxTzPJlLLBp+usQNMJmtgGpirqGKSUAmxNueOX5BWJmx89GzcB nKbFzMi8lIhZaKTofjbNACejzKVqK+V0y3L1tMnKWARhtvZTxXpmYyRvWL9/hZS1 nXK7jUfhlptljcF96QTEVr/V0oOGo7QPsZkmhzqTYS+SAcx+wVScBle6ZnL0nrWj fOO8J7cefvLBcZZDNYdx1pklnnO4WQ== =1OoM -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 22 17:24:14 2017 Received: (at 25787) by debbugs.gnu.org; 22 Feb 2017 22:24:15 +0000 Received: from localhost ([127.0.0.1]:51672 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgfKY-00051L-Mm for submit@debbugs.gnu.org; Wed, 22 Feb 2017 17:24:14 -0500 Received: from mout.gmx.net ([212.227.17.22]:60111) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgfKX-000519-M3 for 25787@debbugs.gnu.org; Wed, 22 Feb 2017 17:24:14 -0500 Received: from labiere ([80.229.147.137]) by mail.gmx.com (mrgmx103 [212.227.17.174]) with ESMTPSA (Nemesis) id 0LrNoG-1cDC9o2Iyi-0133N8; Wed, 22 Feb 2017 23:24:04 +0100 References: <20170220.152244.881122869261660698.post@thomasdanckaert.be> User-agent: mu4e 0.9.18; emacs 25.1.1 From: Pierre Langlois To: Thomas Danckaert Subject: Re: bug#25787: [PATCH 6/6] In-reply-to: <20170220.152244.881122869261660698.post@thomasdanckaert.be> Date: Wed, 22 Feb 2017 22:23:52 +0000 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-Provags-ID: V03:K0:d9G5mqXJtimWNmZCpiCeRUlCuDHZ6nQLx45tq1TcvROgUxc/NZC aLjk6rJ4u/gqPnu5mScw5XlpK01fKfwod3RrxbKjQj2tUPxGlhK7z3R66cVdH/cPWXmoEkZ dQapQ69kR/5lnJPYQgsI6THkkq8DuKakuI07jdKB1ayVZatTP7jzwUzIZIxLTuWAhRSaGZS C036ighpZ6FDpNjsQG8WA== X-UI-Out-Filterresults: notjunk:1;V01:K0:xDAaWzWHX9k=:oMc1VZzL4aWb4aNqo2P9ye gfAZPYUio8aJe7YlriypnktNMgaqwco8Z3kyxRxURKKoC5Ou1bcSp+o+hSUCIWerL6N1+XXYK PrRF9piNA+70UihwzYPRpQkJTEbdrFzz0WxvY2Kv9bPUijbMfVUAQaHOd7uc/vz/yEUupjScR yPFAFBMyDGTow/uZl7mSSf6Hrn5yfpWqwjx9UAUVq8+Tq3KlmrFkou954lpqiKrGSOHL4t421 d9+6unrTSjBRVDA6YO9unUpSwtwl5dyc7DEYXzfZ42ftPgeE3rPA85CSN3Z7X2VZywqJFj0gA zzkIAFOzq1fdkRX73REVLg/YpaOj40ZguvU4RbzK1SWjD3SNd892tGxTLrRxjwuAMpipeUoQR +2DnTxcXrjVtOJBkRrlZqdMC5TuEhFUE5e7r3fw1wU9Jj4f6WBiEPtJeb37hBsIZVJ9/2VpQM 9Nofbf3GQ+pWfRIM68MvvcksTO3gBxnqB6KGdVrq+snS44JL6t1Bi+YwF0xBrG+QJ4l66epQr c8K6G32Uoa/TIvHRIApsMlRbW2ehEfAzzFhotrD4IYKWR06WccO5Z0gMRD8VRPckWfSs9YHQg mO0upYkrCK5h+b2nGkF8CK3H6Jl19fOciVbN5ALBT3hxSdGvHRRzkldssLq8sNwgruAuw93Cj o7BZgye7fS/1hZ/lHk0V/l2bLczRWXykL/N4ykOpsh8o0mq6GasVbVA4H4PCAZg1XX0mFHSVW uLHu/X5q/mTBuBhXOidy2ZisQE0xfXImq8lHt+iuZIIuYNCJ0AQz2qZsLWtcn5J5oc3JQEnTQ o9ONN1He/PtnyXKfrhvtwf72ojszEPtTX0Yvhh9mswqdGBweLVLaVIMCBgJ11OD/B1yugBkHc ttHGKbFJBFga169cMmUrb1cDbEMvE6WLDJku9v40ILHK6IozrhApJjsEmCjFeAp55bVRqeIvY 6bDgILQTx2K44hlOWPkR+qCgfHky85HmOLL3yex5BGwU9OePeAtv8ac+F9axGI6fad0ctOALR QdogVBGz8REG0IUIBneBD838N9kygfU3QWm2Il7O3TNnatH+d/xkKrDu6DMrGOfPlw== X-Spam-Score: -1.1 (-) X-Debbugs-Envelope-To: 25787 Cc: Pierre Langlois , 25787@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.1 (-) Hi Thomas, Thanks for taking a look and testing! I'll send a v2 of the series addressing your comments and Marius'. Thomas Danckaert writes: > Hi, > > thanks for the patch, I'd like to use clementine on Guix! > > I managed to build and run the program, but experienced some > stability issues. Importing music into the library seemed to work > fine, but I couldn't really play back files: > > - The first few times, the program segfaulted when I tried to play > files (I tried mp3 and ogg). Ah I see what's happening! I had gst-plugin-{good,bad,ugly} installed in my profile, it crashes for me too if I remove them. However, we should have gotten a pop-up complaining about missing plugins not a crash! It turns out wrapping the clementine binary setting GST_PLUGIN_SYSTEM_PATH fixes the issue, as done an a few other packages. We could also add the plugins as propagated inputs, but I'd say it's better to let people install only the plugins they need. What do you think? > > - Then I ran it in the debugger and it didn't segfault anymore. > > - Then I tried it again without the debugger, and it didn't > segfault, > but now my desktop (Gnome on GuixSD) froze (while the music kept > playing). I had switch to a tty and restart xorg-server. Ouch, sorry! I've just tested it in Gnome with the changes I mention above and it seems to work. > > Are you not experiencing stability issues? > >> gnu: Add qjson. >> >> * gnu/packages/qt.scm (qjson): New variable. >> [...] >> + ;; The tests require a X server >> + ;; #:configure-flags '("-DQJSON_BUILD_TESTS=ON") >> + `(#:tests? #f)) > > Have you tried (setenv "QT_QPA_PLATFORM" "offscreen") to try running > the tests anyway? Another approach that is sometimes used is > starting an X server with > > (system (format #f "~a/bin/Xvfb :1 &" xorg-server)) > (setenv "DISPLAY" ":1") Oh nice, I didn't realize you could do this. The X server approach works but not the QPA one. I'm guessing this is because QPA_PLATFORM is a QT5 only feature (?). I'll follow Marius' suggestion and see if we can have both QT5 and QT4 versions of qjson. Or maybe we can have the QT5 version of clementine, I haven't tried to build it yet. Thanks! Pierre From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 23 12:08:46 2017 Received: (at 25787) by debbugs.gnu.org; 23 Feb 2017 17:08:46 +0000 Received: from localhost ([127.0.0.1]:53227 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgwso-0004cw-4X for submit@debbugs.gnu.org; Thu, 23 Feb 2017 12:08:46 -0500 Received: from s01-out.spamexperts.axc.nl ([185.175.203.25]:52987) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgwsl-0004ci-Nv for 25787@debbugs.gnu.org; Thu, 23 Feb 2017 12:08:44 -0500 Received: from vserver42.axc.nl ([159.253.0.80]) by s01.spamexperts.axc.nl with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86) (envelope-from ) id 1cgwsc-00011e-60; Thu, 23 Feb 2017 18:08:34 +0100 Received: from mail.axc.nl ([159.253.0.157]:32982) by vserver42.axc.nl with esmtp (Exim 4.87) (envelope-from ) id 1cgwsa-0005Yu-Mp; Thu, 23 Feb 2017 18:08:33 +0100 Date: Thu, 23 Feb 2017 18:07:40 +0100 (CET) Message-Id: <20170223.180740.2161811808479916248.post@thomasdanckaert.be> To: pierre.langlois@gmx.com Subject: Re: bug#25787: [PATCH 6/6] From: Thomas Danckaert In-Reply-To: References: <20170220.152244.881122869261660698.post@thomasdanckaert.be> X-Mailer: Mew version 6.7 on Emacs 25.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=utf-8; format=flowed Content-Transfer-Encoding: base64 PrimaryMX: Accepted email from trusted host. Hint: This skips spam scanning so make sure other host is not vulnerable X-Relay-Host: 159.253.0.157 X-Spam-Score: 0.0 (/) X-Spam-Report: Spam detection software, running on the system "vserver42.axc.nl", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Pierre Langlois Subject: Re: bug#25787: [PATCH 6/6] Date: Wed, 22 Feb 2017 22:23:52 +0000 > Ah I see what's happening! I had gst-plugin-{good,bad,ugly} > installed in > my profile, it crashes for me too if I remove them. However, we > should > have gotten a pop-up complaining about missing plugins not a crash! > It > turns out wrapping the clementine binary setting > GST_PLUGIN_SYSTEM_PATH > fixes the issue, as done an a few other packages. [...] Content analysis details: (0.0 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- SpamTally: Final spam score: 0 X-Originating-IP: 159.253.0.80 X-SpamExperts-Domain: vserver42.axc.nl X-SpamExperts-Username: 159.253.0.80 Authentication-Results: spamexperts.axc.nl; auth=pass smtp.auth=159.253.0.80@vserver42.axc.nl X-SpamExperts-Outgoing-Class: ham X-SpamExperts-Outgoing-Evidence: Combined (0.09) X-Recommended-Action: accept X-Filter-ID: s0sct1PQhAABKnZB5plbIaExX4b9HB97Y0LqBeziPXa8B5kabb+8+DRlCqSxA333/bPom7IVowNb jNmNSGjlJADpxEq2QWue0NVTi1XPmXej1KRrf1Y8eevl1lZRQAkHO76XSTAwtV4mg4i2ouCDa4AU hvIWAV5xUW/+gAh4vXrO6R2eSJVlexzPOAI9X+b7RcOb18WfxGyg6Om6u4YYm8ez7ta9XaADisaN 9QIyYbDEJmXb7Ar/H99E7t+JzjZEexI6JliONwAnIAZqFP/xQOWBOXp8nHKe0R+FkIqN7hkbx4Px vydb/x32mhLBChw5NNMPtXItjLG4t9x0O63zbyLpQCk9LN96ieg5guM8uFge9Gory97ytKcl8m2v CNJ8q16AUQgygDMMJTOfrbMny5qGVosu/jGVHDvtHodYBJTJ+LDk+6c65WNHYJFrd5FIBZ6++Dfk TVlBWsR5QGkluYsktHOcNcA7Yit+vIPIFAQmEqN5fXoI0ArDZbumk3L6kihXO2fRb8rpv65HbpOd qmjDv/9lZWhS1i8CvLmhSHJulq+YCc1Jf9I1b2AZYErcjxqVInDtyLKdhpFYlh+5i0pJkzvQFD0n 4ZCeWWj00iQamUdylUIKhf3z2GAHxH7IDucbqyPscDcg4YAFlcEg0Tzlt0qfM+8esN3hLUMHrXEG Sl1gMp7G4pp3baknPc2jvZ1lzptptgCaKD2vAjUZLPpf6gRpr0cy1Rs9Y+3TGPm4JB1ks2EvBGu0 XnP7uzX+39Uh4ttSsZc8acEN4bpATlENVoJ7y9+G5+4XqiQ6ETamLQZxMhK2cg2102x6FacTl/p1 35YnYBday6MobZugOrNZxe01GfYTRQ24ZSOg6qs= X-Report-Abuse-To: spam@s01.spamexperts.axc.nl X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 25787 Cc: 25787@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) RnJvbTogUGllcnJlIExhbmdsb2lzIDxwaWVycmUubGFuZ2xvaXNAZ214LmNvbT4NClN1YmplY3Q6 IFJlOiBidWcjMjU3ODc6IFtQQVRDSCA2LzZdDQpEYXRlOiBXZWQsIDIyIEZlYiAyMDE3IDIyOjIz OjUyICswMDAwDQoNCj4gQWggSSBzZWUgd2hhdCdzIGhhcHBlbmluZyEgSSBoYWQgZ3N0LXBsdWdp bi17Z29vZCxiYWQsdWdseX0gDQo+IGluc3RhbGxlZCBpbg0KPiBteSBwcm9maWxlLCBpdCBjcmFz aGVzIGZvciBtZSB0b28gaWYgSSByZW1vdmUgdGhlbS4gSG93ZXZlciwgd2UgDQo+IHNob3VsZA0K PiBoYXZlIGdvdHRlbiBhIHBvcC11cCBjb21wbGFpbmluZyBhYm91dCBtaXNzaW5nIHBsdWdpbnMg bm90IGEgY3Jhc2ghIA0KPiBJdA0KPiB0dXJucyBvdXQgd3JhcHBpbmcgdGhlIGNsZW1lbnRpbmUg YmluYXJ5IHNldHRpbmcgDQo+IEdTVF9QTFVHSU5fU1lTVEVNX1BBVEgNCj4gZml4ZXMgdGhlIGlz c3VlLCBhcyBkb25lIGFuIGEgZmV3IG90aGVyIHBhY2thZ2VzLg0KDQpJbmRlZWQsIGZvciB0aGUg Zmlyc3QgdGVzdCwgSSB0aGluayBJIG9ubHkgaGFkIGluc3RhbGxlZCDigJx1Z2x54oCdIGFuZCAN CuKAnGdvb2TigJ0sIGJ1dCBub3Qg4oCcYmFzZeKAnS4gIEkgdGhlbiBpbnN0YWxsZWQg4oCcYmFz ZeKAnSBwbHVnaW5zLCB0b28sIGFuZCBpdCANCndvcmtlZC4gIEkgbm93IHNlZSB0aGF0IG91ciDi gJxnc3QtcGx1Z2lucy1iYXNl4oCdIHBhY2thZ2UgcHJvcGFnYXRlcyB0aGUgDQrigJxnc3RyZWFt ZXLigJ0gcGFja2FnZSwgd2hpY2ggaW4gdHVybiBzZXRzIEdTVF9QTFVHSU5fU1lTVEVNX1BBVEgu ICBBbmQgDQppbmRlZWQsIHRoZSByaHl0aG1ib3ggZXhlY3V0YWJsZSBpcyB3cmFwcGVkLCB3aGlj aCBleHBsYWlucyB3aHkgdGhhdCANCndvcmtzLg0KDQpJIHdvbmRlciBpZiBnc3QtcGx1Z2lucy1n b29kIGFuZCBnc3QtcGx1Z2lucy11Z2x5IHNob3VsZCBwcm9wYWdhdGUgDQpnc3QtcGx1Z2lucy1i YXNlIChsaWtlIGdzdC1wbHVnaW5zLWJhZCBhbHJlYWR5IGRvZXMpPyBPciBtYXliZSANCmdzdC1w bHVnaW5zLWJhZCBzaG91bGQgbm90IHByb3BhZ2F0ZSBnc3QtcGx1Z2lucy1iYXNlPw0KDQpPZiBj b3Vyc2UgdGhlIGZhY3QgdGhhdCBDbGVtZW50aW5lIGNyYXNoZXMgd2hlbiANCkdTVF9QTFVHSU5f U1lTVEVNX1BBVEggaXNuJ3Qgc2V0IGNvcnJlY3RseSBpcyBhIGJ1ZywgSU1PLg0KDQo+IFdlIGNv dWxkIGFsc28gYWRkIHRoZSBwbHVnaW5zIGFzIHByb3BhZ2F0ZWQgaW5wdXRzLCBidXQgSSdkIHNh eSBpdCdzDQo+IGJldHRlciB0byBsZXQgcGVvcGxlIGluc3RhbGwgb25seSB0aGUgcGx1Z2lucyB0 aGV5IG5lZWQuIFdoYXQgZG8geW91DQo+IHRoaW5rPw0KDQpZZXMsIEkgdGhpbmsgaXQncyBiZXR0 ZXIgdG8gbGV0IHVzZXJzIGNob29zZS4gRXNwZWNpYWxseSB3aXRoIHRoZSANCnBhdGVudCBpc3N1 ZXMgdGhhdCBtYXkgb3IgbWF5IG5vdCBhZmZlY3QgdGhlIOKAnHVnbHnigJ0gcGx1Z2lucy4NCg0K PiBPciBtYXliZSB3ZSBjYW4gaGF2ZSB0aGUgUVQ1IHZlcnNpb24gb2YgY2xlbWVudGluZSwgSSBo YXZlbid0IHRyaWVkDQo+IHRvIGJ1aWxkIGl0IHlldC4NCg0KVGhhdCB3b3VsZCBiZSBpZGVhbCwg SSBoYWQgYSBsb29rIGF0IHRoZSBjb21tZW50cyBhdCB0aGVpciANCnJlcG9zaXRvcnksIGFuZCBp dCBzZWVtZWQgbGlrZSB0aGUgUXQ1IHBvcnQgd2FzIHN0aWxsIGV4cGVyaW1lbnRhbCwgDQpidXQg SSBoYXZlbid0IGFjdHVhbGx5IHRyaWVkIGl0Lg0KDQpJJ2xsIHRlc3QgeW91ciBuZXh0IHBhdGNo ZXMuDQoNClRob21hcw0K From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 10 02:58:42 2017 Received: (at 25787) by debbugs.gnu.org; 10 Mar 2017 07:58:42 +0000 Received: from localhost ([127.0.0.1]:48382 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cmFRi-0003dy-1s for submit@debbugs.gnu.org; Fri, 10 Mar 2017 02:58:42 -0500 Received: from eggs.gnu.org ([208.118.235.92]:52469) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cmFRg-0003dl-5o for 25787@debbugs.gnu.org; Fri, 10 Mar 2017 02:58:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cmFRa-0003Ta-40 for 25787@debbugs.gnu.org; Fri, 10 Mar 2017 02:58:35 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:60285) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cmFRR-0003SV-NW; Fri, 10 Mar 2017 02:58:25 -0500 Received: from [193.50.110.248] (port=57288 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1cmFRQ-00063q-Lz; Fri, 10 Mar 2017 02:58:25 -0500 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Pierre Langlois Subject: Re: bug#25787: [PATCH 5/6] gnu: sqlite: Enable FTS3. References: <20170218133830.24091-1-pierre.langlois@gmx.com> <20170218180233.1470-1-pierre.langlois@gmx.com> Date: Fri, 10 Mar 2017 08:58:22 +0100 In-Reply-To: <20170218180233.1470-1-pierre.langlois@gmx.com> (Pierre Langlois's message of "Sat, 18 Feb 2017 18:02:33 +0000") Message-ID: <8760jhd0m9.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 25787 Cc: Marius Bakke , 25787@debbugs.gnu.org, Leo Famulari X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Hello Pierre, Pierre Langlois skribis: > * gnu/packages/databases.scm (sqlite)[arguments]: Enable configure-flags > -DSQLITE_ENABLE_FST3 -DSQLITE_ENABLE_FTS2_PARENTHESIS > -DSQLITE_ENABLE_FTS3_TOKENIZER LGTM! Since this requires a rebuild of 2912 packages (per =E2=80=9Cguix re= fresh -l sqlite@3.14=E2=80=9D), this should go to the =E2=80=98core-updates=E2=80= =99 branch=C2=B9. Leo, Marius: is it still time to apply there? Thanks! Ludo=E2=80=99. =C2=B9 https://lists.gnu.org/archive/html/guix-devel/2016-10/msg00933.html From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 10 03:00:43 2017 Received: (at 25787) by debbugs.gnu.org; 10 Mar 2017 08:00:43 +0000 Received: from localhost ([127.0.0.1]:48386 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cmFTf-0003iD-FU for submit@debbugs.gnu.org; Fri, 10 Mar 2017 03:00:43 -0500 Received: from eggs.gnu.org ([208.118.235.92]:53306) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cmFTd-0003i0-PQ for 25787@debbugs.gnu.org; Fri, 10 Mar 2017 03:00:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cmFTT-00049W-Re for 25787@debbugs.gnu.org; Fri, 10 Mar 2017 03:00:36 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:60322) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cmFTT-00049S-OU; Fri, 10 Mar 2017 03:00:31 -0500 Received: from [193.50.110.248] (port=57340 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1cmFTS-0008AN-3L; Fri, 10 Mar 2017 03:00:30 -0500 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Marius Bakke Subject: Re: bug#25787: [PATCH 6/6] gnu: Add Clementine. References: <20170218133830.24091-1-pierre.langlois@gmx.com> <20170218180249.1522-1-pierre.langlois@gmx.com> <87h93mfbkm.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> Date: Fri, 10 Mar 2017 09:00:27 +0100 In-Reply-To: <87h93mfbkm.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> (Marius Bakke's message of "Wed, 22 Feb 2017 17:13:29 +0100") Message-ID: <871su5d0is.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 25787 Cc: Pierre Langlois , 25787@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Marius Bakke skribis: > I skipped commenting on the nss and sqlite patches. For now, I would be > happy to just use a "sqlite-for-clementine" package here, since it's the > only package that requires the FTS3 extension. Oh right, we can do that in =E2=80=98master=E2=80=99. Pierre: now that you have overwhelming feedback ;-), could you send updated patches? Please let us know what you think. Thanks for all the work! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 10 03:30:50 2017 Received: (at control) by debbugs.gnu.org; 10 Mar 2017 08:30:50 +0000 Received: from localhost ([127.0.0.1]:48432 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cmFwo-0004Ur-2U for submit@debbugs.gnu.org; Fri, 10 Mar 2017 03:30:50 -0500 Received: from eggs.gnu.org ([208.118.235.92]:32882) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cmFwm-0004UQ-EO for control@debbugs.gnu.org; Fri, 10 Mar 2017 03:30:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cmFwg-0004QG-Gs for control@debbugs.gnu.org; Fri, 10 Mar 2017 03:30:43 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:60689) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cmFwg-0004QC-DY for control@debbugs.gnu.org; Fri, 10 Mar 2017 03:30:42 -0500 Received: from [193.50.110.248] (port=58070 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1cmFwf-0006YB-Hi for control@debbugs.gnu.org; Fri, 10 Mar 2017 03:30:41 -0500 Date: Fri, 10 Mar 2017 09:30:39 +0100 Message-Id: <87pohpbkk0.fsf@gnu.org> To: control@debbugs.gnu.org From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: control message for bug #25787 MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) tags 25787 moreinfo From debbugs-submit-bounces@debbugs.gnu.org Wed May 03 17:58:05 2017 Received: (at 25787) by debbugs.gnu.org; 3 May 2017 21:58:05 +0000 Received: from localhost ([127.0.0.1]:53296 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d62Hd-0006SC-BD for submit@debbugs.gnu.org; Wed, 03 May 2017 17:58:05 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54060) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d62Hc-0006Rj-CS for 25787@debbugs.gnu.org; Wed, 03 May 2017 17:58:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d62HW-0002Eh-3L for 25787@debbugs.gnu.org; Wed, 03 May 2017 17:57:59 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:52137) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d62HP-00029G-Ho; Wed, 03 May 2017 17:57:51 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:40376 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d62HO-0001JX-R6; Wed, 03 May 2017 17:57:51 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Pierre Langlois Subject: Re: bug#25787: [PATCH 6/6] gnu: Add Clementine. References: <20170218133830.24091-1-pierre.langlois@gmx.com> <20170218180249.1522-1-pierre.langlois@gmx.com> <87h93mfbkm.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <871su5d0is.fsf@gnu.org> Date: Wed, 03 May 2017 23:57:48 +0200 In-Reply-To: <871su5d0is.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Fri, 10 Mar 2017 09:00:27 +0100") Message-ID: <87vaphppr7.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 25787 Cc: Marius Bakke , 25787@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Pierre, did you have any chance to look at this? https://bugs.gnu.org/25787 TIA! Ludo=E2=80=99. ludo@gnu.org (Ludovic Court=C3=A8s) skribis: > Marius Bakke skribis: > >> I skipped commenting on the nss and sqlite patches. For now, I would be >> happy to just use a "sqlite-for-clementine" package here, since it's the >> only package that requires the FTS3 extension. > > Oh right, we can do that in =E2=80=98master=E2=80=99. > > Pierre: now that you have overwhelming feedback ;-), could you send > updated patches? Please let us know what you think. > > Thanks for all the work! > > Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 10 18:11:10 2017 Received: (at control) by debbugs.gnu.org; 10 Oct 2017 22:11:10 +0000 Received: from localhost ([127.0.0.1]:32799 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e22jz-0001px-My for submit@debbugs.gnu.org; Tue, 10 Oct 2017 18:11:09 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21111) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e22jy-0001pn-EH for control@debbugs.gnu.org; Tue, 10 Oct 2017 18:11:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1507673437; s=zoho; d=elephly.net; i=rekado@elephly.net; h=Date:To:From:Subject; l=15; bh=gNT5kQxwCYa9UjycTMpOAgrcPpPd49bqBZWTHFghzpc=; b=hVdSRUkNwgI1QajeYo77yXG+HJaVn3vPL4Dz1ab4vbeIq1HW+UrQ/YYTkOHFE/wD MXuK0jIpNWUKiPVgHMh0gz02le9ipRNRGDQdpYPxh3L3Cs6siNWoai+vJzECg2M4w/y qu5YyGmKHX9kydHcymvvpWk4LkEGr6DPkThBqQ/w= Received: from localhost (port-92-200-153-247.dynamic.qsc.de [92.200.153.247]) by mx.zohomail.com with SMTPS id 1507673437091553.9806369040639; Tue, 10 Oct 2017 15:10:37 -0700 (PDT) Date: Wed, 11 Oct 2017 00:10:34 +0200 To: control@debbugs.gnu.org From: Ricardo Wurmus Subject: control message for bug #25787 X-ZohoMailClient: External X-Spam-Score: 0.1 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" Message-Id: X-Spam-Score: -0.0 (/) owner 25787 ! From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 25 11:55:51 2017 Received: (at 25787) by debbugs.gnu.org; 25 Oct 2017 15:55:51 +0000 Received: from localhost ([127.0.0.1]:33529 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e7O1y-0003ph-Fa for submit@debbugs.gnu.org; Wed, 25 Oct 2017 11:55:50 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21086) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e7O1v-0003pT-KO for 25787@debbugs.gnu.org; Wed, 25 Oct 2017 11:55:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1508940550; s=zoho; d=elephly.net; i=rekado@elephly.net; h=References:From:To:Cc:Subject:In-reply-to:Date:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding; l=5029; bh=DnnWLNgTYucDxIImZ9SHkrdKTITNdHcpRSFo4rBAbDA=; b=YyKc5eSVWf6qSlSSKTxGcrDSEE5KqNGG7/BxiMP/D74zcQiCFp1MzeDGS4ZN1tS9 vVrEy666gvkte2Y1VUSWAmIg5YIlr/9F6FshhCgaceGco1dkqHgAGKH0kVwU9wFpSEQ fizVmlDwh0GmcMVcnZZZ6uWC2mnHjMJwfAdQdzgY= Received: from localhost (141.80.247.119 [141.80.247.119]) by mx.zohomail.com with SMTPS id 150894055071353.08865319779352; Wed, 25 Oct 2017 07:09:10 -0700 (PDT) References: <20170218133830.24091-1-pierre.langlois@gmx.com> <20170218180249.1522-1-pierre.langlois@gmx.com> <87h93mfbkm.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <871su5d0is.fsf@gnu.org> <87vaphppr7.fsf@gnu.org> User-agent: mu4e 0.9.18; emacs 25.3.1 From: Ricardo Wurmus To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#25787: [PATCH 6/6] gnu: Add Clementine. In-reply-to: <87vaphppr7.fsf@gnu.org> X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Wed, 25 Oct 2017 16:09:07 +0200 Message-ID: <8760b3coak.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-Spam-Score: -2.8 (--) X-Debbugs-Envelope-To: 25787 Cc: Pierre Langlois , Marius Bakke , 25787@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.8 (--) Hi Pierre, I have taken your patches and implemented the suggested changes. The only remaining problem is that Clementine seems to bundle a lot of libraries, which is why I’m not comfortable with pushing the updated version as is. QJson is not found, but it is used by a bundled library anyway, so I think the bundling should be fixed first. Attached is the updated version of the Clementine patch. -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net commit b8b691c88bd80aef6674ff97d1d924aa37193042 (clementine) Author: Pierre Langlois Date: Wed Oct 25 15:14:05 2017 +0200 gnu: Add clementine. * gnu/packages/music.scm (clementine): New variable. Co-authored-by: Ricardo Wurmus diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 2fd38362c..6f659fe83 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -54,8 +54,11 @@ #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) + #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) + #:use-module (gnu packages databases) + #:use-module (gnu packages datastructures) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages emacs) @@ -73,12 +76,14 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages graphics) + #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages java) #:use-module (gnu packages libffi) + #:use-module (gnu packages libusb) #:use-module (gnu packages linux) ; for alsa-utils #:use-module (gnu packages lirc) #:use-module (gnu packages llvm) @@ -91,6 +96,7 @@ #:use-module (gnu packages pdf) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) ;libsndfile #:use-module (gnu packages python) #:use-module (gnu packages qt) @@ -176,6 +182,77 @@ and play MIDI files with a few clicks in a user-friendly interface offering score, keyboard, guitar, drum and controller views.") (license license:gpl3+))) +;; We don't use the latest release because it depends on Qt4. Instead we +;; download the sources from the tip of the "qt5" branch. +(define-public clementine + (let ((commit "0a59257dc334b8df60a4d7d90b04f1766747efcf") + (revision "1")) + (package + (name "clementine") + (version (string-append "1.3.1-" revision "." (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/clementine-player/Clementine.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0cdcj7di7j9jgzc1ihjna1a5df64f9hnmx7b9kh8rlg76hc0l0hi")))) + (build-system cmake-build-system) + (arguments + '(;#:tests? #f + #:configure-flags + (let ((crypto (assoc-ref %build-inputs "crypto++"))) + (list "-DENABLE_VISUALISATIONS=OFF" ; requires unpackaged "projectm" + "-DCRYPTOPP_FOUND=TRUE" + (string-append "-DCRYPTOPP_INCLUDE_DIRS=" crypto "/include") + (string-append "-DCRYPTOPP_LIBRARY_DIRS=" crypto "/lib") + (string-append "-DCRYPTOPP_LIBRARIES=" crypto "/lib/libcryptopp.a"))) + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")) + (grl-plugin-path (getenv "GRL_PLUGIN_PATH"))) + (wrap-program (string-append out "/bin/clementine") + `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)) + `("GRL_PLUGIN_PATH" ":" prefix (,grl-plugin-path)))) + #t))))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config))) + (inputs + `(("boost" ,boost) + ("chromaprint" ,chromaprint) + ("crypto++" ,crypto++) + ("fftw" ,fftw) + ("glib" ,glib) + ("glu" ,glu) + ("gstreamer" ,gstreamer) + ("gst-plugins-base" ,gst-plugins-base) + ("libcdio" ,libcdio) + ("libechonest" ,libechonest) + ;; TODO: Package libgpod. + ("libmtp" ,libmtp) + ("libxml2" ,libxml2) + ("protobuf" ,protobuf) + ("pulseaudio" ,pulseaudio) + ;; TODO: this is not found! + ("qjson" ,qjson) + ("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras) + ("sqlite" ,sqlite-with-fts3) + ("sparsehash" ,sparsehash) + ("taglib" ,taglib))) + (home-page "http://clementine-player.org") + (synopsis "Music player and library organizer") + (description "Clementine is a multiplatform music player. It is inspired +by Amarok 1.4, focusing on a fast and easy-to-use interface for searching and +playing your music.") + (license license:gpl3+)))) + (define-public cmus (package (name "cmus") From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 29 16:12:16 2017 Received: (at 25787) by debbugs.gnu.org; 29 Oct 2017 20:12:16 +0000 Received: from localhost ([127.0.0.1]:40939 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e8twO-0005Ly-93 for submit@debbugs.gnu.org; Sun, 29 Oct 2017 16:12:16 -0400 Received: from mout.gmx.net ([212.227.15.15]:49375) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e8twL-0005Ll-Vc for 25787@debbugs.gnu.org; Sun, 29 Oct 2017 16:12:14 -0400 Received: from labiere ([80.229.147.137]) by mail.gmx.com (mrgmx002 [212.227.17.184]) with ESMTPSA (Nemesis) id 0MYwyp-1ddqQk24d1-00VizW; Sun, 29 Oct 2017 21:12:01 +0100 References: <20170218133830.24091-1-pierre.langlois@gmx.com> <20170218180249.1522-1-pierre.langlois@gmx.com> <87h93mfbkm.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <871su5d0is.fsf@gnu.org> <87vaphppr7.fsf@gnu.org> <8760b3coak.fsf@elephly.net> User-agent: mu4e 0.9.19; emacs 25.3.1 From: Pierre Langlois To: Ricardo Wurmus Subject: Re: bug#25787: [PATCH 6/6] gnu: Add Clementine. In-reply-to: <8760b3coak.fsf@elephly.net> Date: Sun, 29 Oct 2017 20:11:59 +0000 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:Jwt3Jx0t54JKd05RyYd/51aQZBcZk49sGkGz40ZsygVORMVMvz9 MUzH2iE2/QGsstV0TSK3rBqnYbZJfFZgknh0koYeBKUR3xGrWFCovklBK73tAcJiQMum7yU XmRWc81uotsUIbZybTjMSmwcUzMwYKzJlQ+n3/pscr25GTfgmudDGnoByX324EeoJRnTMcD On52Nu9spAejAxxXBmqKQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:2dfdZW/HCUk=:GY59iIOEpyogkE46UI6Kjq FeO41iFw1NjR3eFZq0/YKhQC03hDv0ky1Zstd+evYBuONYMXptCqr6wLMld/HrqIsa99vdmVB E3Zyftt6uRUEOx8vQrx7Fso7vzIv1sSc5dlAi+vdZSuvxwesIi7gPg2hXsVU2Q4wVUSgh0Mrj 0NLQyRW0otvU/tWIEP5T6IMljwoMiHB42oa/RpbGImOZpO/Po/84KLY32ffyuu9/u+rhSrgZk fb1CesEPlv36t7ksMsP5OCby0gb76Y3MF8dfwLk+Aqts4Jn4+V/ATHCOTEtd6TdR4D1vlrDPB 1lY8L2OJGNzP9kQOMAcaj9jNelMmOW7nimeRdP50gJoQyuWC703+3dh6drwLYdif43rTO4N9k 6loFqt+1hxFDDYRP7jc1EBJ+nrBm19b6MHdpS3I+CHlHsO2b213VpJPiCBrqbIUkCkbZtmxeD tuYAtpYGTLmxslEkmo+rdjhHLCoXzhLW92BIR4wPDJP7Slgj05rdA2UjGIhC+UP/hDUJ+9N9R gqH/OypsJai9N4aQ1JkqAxUIjWwFHupBRcoUGH5BeQyKNEhntH9mtXttY8x1RKj8x2LgHye/Q /IdC3EeiHqj0HiiHJiMG0B+DlRvkpML8CL2/S0q0PaaqorDSI2AxhlqqsN8zhF6WaGp1avyf+ q8MDxzyhjJVpQXRUSx0+daaGKbTryVh121rYqFpSA7NfUUz/gr7fIVELFgybSjeso0M2SgqCF xws9NA1ny0KagBYDo5MgkDRIac8jyhEWVKOxvRfrRsRmvZMMOjUYeRSk6OIxw7ipybVi4l9Bc HhjfeJJTL+NJ7lPN9o7wreeTVTzX2rnuQTC5mjP+0su2LPgZDk= X-Spam-Score: -3.0 (---) X-Debbugs-Envelope-To: 25787 Cc: Marius Bakke , Ludovic =?utf-8?Q?Court=C3=A8s?= , Pierre Langlois , 25787@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.0 (---) Hi Ricardo Ricardo Wurmus writes: > Hi Pierre, > > I have taken your patches and implemented the suggested changes. > The > only remaining problem is that Clementine seems to bundle a lot > of > libraries, which is why I’m not comfortable with pushing the > updated > version as is. Thanks a lot for looking at this! I'm sorry I've left this dragging for so long, let me get my act together and complete this :-). About the bundling, I agree this is problematic and I'm afraid I haven't been able to get rid of all of them. The remaining libs still bundled are: - qxt: It appears to have gone unmaintained and Clementine devs have updated it for it to work with qt5. - qtsingleapplication: Needs packaging. I might take a stab at it but I'm not sure I'll have the time. But, the CMakeLists.txt file says the bundled version is patched so I'm unsure just packaging it will be enough. - gmock: We have gmock in our googletest package but the tests segfault with it. The bundled version might be too old. - qsqlite: They have bundled the QT sqlite driver: ~~~(CMakeList.txt) # Build our copy of QSqlLiteDriver. # We do this because we can't guarantee that the driver shipped with Qt exposes the # raw sqlite3_ functions required for FTS support. This way we know that those symbols # exist at compile-time and that our code links to the same sqlite library as the # Qt driver. ~~~ I tried to build a version a qtbase with sqlite-with-fts3 as input instead of sqlite, to see if that could be a replacement. But the symbols where still not found so I'm unsure what to do here. Finally, I haven't had the time to look at those last two: - qocoa - qtiocompressor I was able to unbundle "libmygpo-qt" (new package) and "sha2" (replaced by openssl). > > QJson is not found, but it is used by a bundled library anyway, > so I > think the bundling should be fixed first. So, as it turns out only libmygpo-qt's QT4 version was depending on qjson, so this is no longer necessary for clementine! > > Attached is the updated version of the Clementine patch. Thanks again! I have update the patch to remove the unbundled libs and enabled testing. Pierre From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 29 16:13:20 2017 Received: (at 25787) by debbugs.gnu.org; 29 Oct 2017 20:13:21 +0000 Received: from localhost ([127.0.0.1]:40949 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e8txL-0005O0-TB for submit@debbugs.gnu.org; Sun, 29 Oct 2017 16:13:20 -0400 Received: from mout.gmx.net ([212.227.15.15]:55328) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e8txH-0005Nk-2F for 25787@debbugs.gnu.org; Sun, 29 Oct 2017 16:13:14 -0400 Received: from labiere ([80.229.147.137]) by mail.gmx.com (mrgmx002 [212.227.17.184]) with ESMTPSA (Nemesis) id 0MI5JG-1e9SBG2JWI-003tCi; Sun, 29 Oct 2017 21:13:00 +0100 References: <20170218133830.24091-1-pierre.langlois@gmx.com> <20170218180249.1522-1-pierre.langlois@gmx.com> <87h93mfbkm.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <871su5d0is.fsf@gnu.org> <87vaphppr7.fsf@gnu.org> <8760b3coak.fsf@elephly.net> User-agent: mu4e 0.9.19; emacs 25.3.1 From: Pierre Langlois To: Ricardo Wurmus Subject: [PATCH 01/26] gnu: Add libmygpo-qt. In-reply-to: Date: Sun, 29 Oct 2017 20:12:59 +0000 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Provags-ID: V03:K0:+fwZiDPZqayB0sZ+SnooEusVcUfSoL/cBVP8S7P2v9bsqgaIh4/ i+eNp1NJr9siUahIV/221VIKqHpblWgIRUAZ7UNshs7joHfhBChYGaw0vJY0bWly/E4bLBE 34KCJsfnCljO0wI37b2D9Km00VCTOmbM8qU827GlP0qo10+vwgSBHc7qlbizw/Z775KcPm/ 61UsvzLZozEdio8Hc51wQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:JoKWJuyIhWE=:CztGW9GbW0Pudtbvrmc1sH yfhq2PMdKqCro6B2l5FTNLnYv5xHxx2qmix7CpiFc+PTJuZ3FkbiKinQ8H0c8Ye75AcAxDoFH brtLb7U82NAM3JYv1FUCymD9s3flEpjkWv2L0rlkDIRvnWgcX/gak1qkxxuIPxHSQZTzL9Mm7 JLPWvbCR4MUPDrJTosradFJhoA2S/d6IdIcJ5aB16/oAWX/NuHe87jRp2jHDbJYyTMvMOdgp+ WQdINsltBCPsX9mdiP1YuOGolREryV6ndtZGw9ovqnnwzRpucwhHT7CC8fVlGids1hOAr+4bh pXgJt1BJ3qQ1xZhzssY1lgS3qFfJO+pTxM27MaASjk3aGQBuiy3GgPOvy2N6PwqFKhE02Nozo wNrVO40v4CsgHLbrp3oegIURnJJxkQVe7OwjSPbed/Oi5DkT8/THbzJs2sLSvQ9e14msWi8Ay MH8k46aqqLip6Iq7mnyH1n/S0jbqJd6HJMhIgQdgps9sFKBILWrJq1dG2l6u9SihleM/y8xg0 fpP/DKdhb+TD5n7bA1BE2ZtcOQJxlN1myNotyeqV5Q5680k4lcWBTKXV4J+8dFI52w1jO7YrX gb+D5GgR2umdc91sYJqOZ/fwkeO0XvlrNZ9sz4ZAkQPdrLjkGnFBcyEZ3N9nENuwpkt+Td0za k1G3QRCgCmYZzMnxPXHSKxOf2xp8I2nmJnTU2w2aRB9ZHnrThb5nKoWy/tA1P1I3mCgR4SeGI H4ZD0gzh9qvr0K/uyYxANlXKCOwSMybb8DYO1JJr/pe42sGp6hp/b9xnwupXN1I7fBMQZ7Gfw j300IjZr1vTyRF0K5klRDzhG8By7BaZEBQ2mF84pAzsSKeQlWk= X-Spam-Score: -3.0 (---) X-Debbugs-Envelope-To: 25787 Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= , Marius Bakke , 25787@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/packages/music.scm (libmygpo-qt): New variable. * gnu/packages/patches/libmygpo-qt-fix-jsoncreatortest.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/music.scm | 27 ++++++++++++++ .../patches/libmygpo-qt-fix-jsoncreatortest.patch | 41 ++++++++++++++++++++++ 3 files changed, 69 insertions(+) create mode 100644 gnu/packages/patches/libmygpo-qt-fix-jsoncreatortest.patch diff --git a/gnu/local.mk b/gnu/local.mk index 90dc7aec1..3012976a8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -801,6 +801,7 @@ dist_patch_DATA = \ %D%/packages/patches/libmad-armv7-thumb-pt2.patch \ %D%/packages/patches/libmad-frame-length.patch \ %D%/packages/patches/libmad-mips-newgcc.patch \ + %D%/packages/patches/libmygpo-qt-fix-jsoncreatortest.patch \ %D%/packages/patches/libsndfile-armhf-type-checks.patch \ %D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch \ %D%/packages/patches/libsndfile-CVE-2017-8362.patch \ diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index f5df44070..55ae15f1a 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3367,3 +3367,30 @@ the electronic or dubstep genre.") designed to make a developer's life easy when trying to use the APIs provided by The Echo Nest.") (license license:gpl2+))) + +(define-public libmygpo-qt + (package + (name "libmygpo-qt") + (version "1.0.9") + (source + (origin + (method url-fetch) + (uri (string-append "http://stefan.derkits.at/files/libmygpo-qt/libmygpo-qt." + version ".tar.gz")) + (sha256 + (base32 "1wsgh2vjnd52rkvpncj1ycpbp84sj9hh12ija46b42z9mmqf2jm4")) + (patches (search-patches "libmygpo-qt-fix-jsoncreatortest.patch")))) + (build-system cmake-build-system) + (arguments + '(#:configure-flags '("-DBUILD_WITH_QT4=OFF"))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("qt" ,qtbase))) + (home-page "http://wiki.gpodder.org/wiki/Libmygpo-qt") + (synopsis "Qt/C++ library wrapping the @url{https://gpodder.net} +Webservice") + (description "@code{libmygpo-qt} is a Qt/C++ library wrapping the +@url{https://gpodder.net} APIs. It allows applications to discover, manage +and track podcasts.") + (license license:lgpl2.1+))) diff --git a/gnu/packages/patches/libmygpo-qt-fix-jsoncreatortest.patch b/gnu/packages/patches/libmygpo-qt-fix-jsoncreatortest.patch new file mode 100644 index 000000000..c457d592c --- /dev/null +++ b/gnu/packages/patches/libmygpo-qt-fix-jsoncreatortest.patch @@ -0,0 +1,41 @@ +From ebe2323727f8d646590245b0bf06dbc92b5808d6 Mon Sep 17 00:00:00 2001 +From: Golubev Alexander +Date: Tue, 20 Sep 2016 15:33:30 +0400 +Subject: [PATCH] JsonCreatorTest failed due to extra space + +JsonCreatorTest failed with next message: +``` +********* Start testing of mygpo::JsonCreatorTest ********* +Config: Using QTest library 4.8.6, Qt 4.8.6 +PASS : mygpo::JsonCreatorTest::initTestCase() +PASS : mygpo::JsonCreatorTest::testAddRemoveSubsToJSON() +PASS : mygpo::JsonCreatorTest::testSaveSettingsToJSON() +FAIL! : mygpo::JsonCreatorTest::testEpisodeActionListToJSON() Compared values are not the same + Actual (outString2): [{"action":"download","device":"device1","episode":"http://episode.url","podcast":"http://podcast.url","timestamp":"1998-01-01T00:01:02"},{"action":"delete","device":"device3","episode":"http://episode2.url","podcast":"http://podcast2.url","timestamp":"1920-01-01T12:01:02"},{"action":"new","device":"foodev","episode":"http://www.podtrac.com","podcast":"http://leo.am","timestamp":"1998-01-01T00:01:02"},{"action":"play","device":"foodev","episode":"http://www.podtrac.com","podcast":"http://leo.am","timestamp":"1920-01-01T12:01:02"},{"action":"play","device":"foodev","episode":"http://www.podtrac.com","podcast":"http://leo.am","position":123,"started":10,"timestamp":"1998-01-01T00:01:02","total":321},{"action":"play","device":"foodev","episode":"http://www.podtrac.com","podcast":"http://leo.am","position":10,"timestamp":"1998-01-01T00:01:02"}] + Expected (expected2): [{"action":"download","device":"device1","episode":"http://episode.url","podcast":"http: + Loc: [/var/tmp/portage/media-libs/libmygpo-qt-1.0.9-r1/work/libmygpo-qt-1.0.9/tests/JsonCreatorTest.cpp(138)] +PASS : mygpo::JsonCreatorTest::testRenameDeviceStringToJSON() +PASS : mygpo::JsonCreatorTest::testDeviceSynchronizationListsToJSON() +PASS : mygpo::JsonCreatorTest::cleanupTestCase() +Totals: 6 passed, 1 failed, 0 skipped +********* Finished testing of mygpo::JsonCreatorTest ********* +``` + +This was caused by extra space in the expected string. +--- + tests/JsonCreatorTest.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/JsonCreatorTest.cpp b/tests/JsonCreatorTest.cpp +index b15b006..feb03d5 100644 +--- a/tests/JsonCreatorTest.cpp ++++ b/tests/JsonCreatorTest.cpp +@@ -133,7 +133,7 @@ void JsonCreatorTest::testEpisodeActionListToJSON() + + output = JsonCreator::episodeActionListToJSON(episodeActions); + QString outString2 = QString::fromLatin1( output ).replace( QLatin1String(" "), QLatin1String("") ); +- QString expected2( QLatin1String( "[{\"action\":\"download\",\"device\":\"device1\",\"episode\":\"http://episode.url\",\"podcast\":\"http://podcast.url\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"delete\",\"device\":\"device3\",\"episode\":\"http://episode2.url\",\"podcast\":\"http://podcast2.url\",\"timestamp\":\"1920-01-01T12:01:02\"},{\"action\":\"new\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1920-01-01T12:01:02\" },{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":123,\"started\":10,\"timestamp\":\"1998-01-01T00:01:02\",\"total\":321},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":10,\"timestamp\":\"1998-01-01T00:01:02\"}]" ) ); ++ QString expected2( QLatin1String( "[{\"action\":\"download\",\"device\":\"device1\",\"episode\":\"http://episode.url\",\"podcast\":\"http://podcast.url\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"delete\",\"device\":\"device3\",\"episode\":\"http://episode2.url\",\"podcast\":\"http://podcast2.url\",\"timestamp\":\"1920-01-01T12:01:02\"},{\"action\":\"new\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1920-01-01T12:01:02\"},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":123,\"started\":10,\"timestamp\":\"1998-01-01T00:01:02\",\"total\":321},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":10,\"timestamp\":\"1998-01-01T00:01:02\"}]" ) ); + + QCOMPARE(outString2, expected2 ); + } -- 2.14.3 From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 29 16:14:13 2017 Received: (at 25787) by debbugs.gnu.org; 29 Oct 2017 20:14:13 +0000 Received: from localhost ([127.0.0.1]:40954 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e8tyD-0005Pg-WB for submit@debbugs.gnu.org; Sun, 29 Oct 2017 16:14:13 -0400 Received: from mout.gmx.net ([212.227.15.15]:49381) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e8ty6-0005Oq-Hq for 25787@debbugs.gnu.org; Sun, 29 Oct 2017 16:14:08 -0400 Received: from labiere ([80.229.147.137]) by mail.gmx.com (mrgmx003 [212.227.17.184]) with ESMTPSA (Nemesis) id 0LzcIM-1d4VaE0ex8-014lFa; Sun, 29 Oct 2017 21:13:52 +0100 References: <20170218133830.24091-1-pierre.langlois@gmx.com> <20170218180249.1522-1-pierre.langlois@gmx.com> <87h93mfbkm.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <871su5d0is.fsf@gnu.org> <87vaphppr7.fsf@gnu.org> <8760b3coak.fsf@elephly.net> User-agent: mu4e 0.9.19; emacs 25.3.1 From: Pierre Langlois To: Ricardo Wurmus Subject: [PATCH 02/02] gnu: Add clementine. In-reply-to: Date: Sun, 29 Oct 2017 20:13:51 +0000 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Provags-ID: V03:K0:cVzJBn9+/zPerSkIs7EV68YAu7s8qpcj8tUt8TZNJoMU5S7vKix l0h4VWBjJTHtfT5bBH/X6Xtx3ektbWQiqjpdxzbTxY9arNwCCDxNxzmVzi96PP3M3JLKSut NRbTiSGGT4PV0/aanVkIo/ZuX+Umd5ltjqe5NpmGHRU5j+JY238NlPXYrVackvbBPF29cf7 lEXTH7Y6eDTM8unYEcJDg== X-UI-Out-Filterresults: notjunk:1;V01:K0:PkkD5YQyp8A=:UWaw5PGEat88MjPZ4z8t2S UC+9Oq8qzRVTzxsgM83aEZmH/pUYKf1LqCftuBe0T1TbEqZDUmh6H7we4f6ch0y74RU3ygWLc 3gZqmye+we1Gv11OsJr18T4aVn9bReSXUIkjyyb26jNYENLCYT8T6YOPRmjsl21xHMlKjD3oF riEhFi7ergC4vAEqcQr+SC34typO7pl1BUOTIoCuTKj1nm56HKdwcZ4yhLp/7o/3WU+AfF95u oLX7d3snqiL0fM/7jkHOyYxKdDvGrpWfFRh4KJNJY8EwQfjPczOoTmDmzOwcwIWI8umGwD/PB M3hr3iQH1KmQtTl4GsT8dHQzhZL+9Q7oSeV1Qh+Gdbiyd686dIi+XYMb7r89MvytLrcv1o5vP RnP9tyaFhyn6ZYUZ1GMHzb0AsyDkJuSoh/lexAYNIIKwnNK/IWdO/spJ6tuk6iAHw7PKxy0fe W1W+aiG5d7vCLbGB0KHiVGJDp82AJDlLpc4Ww5KVyauwJCXBzqGZcIJz3SJQc7BA+yw6viG1F FGhFMwmHu9djmt9lQRMDtzVXB6jSZWtfPPA/LFGcQ9mEMjq0AOgxEpiwIOQXW+FgxOP8LAk5E HuTaWkGEILV6o3IOoSNfrSQ8Lq4qs9UaMNTDg3SdxI1GEhlV1KuYADGENvfBAhfDSbl0+3n3v OAnLn9s0wLnl/mRkSPJPcVVsOViEtMk4O/6ZfqD1611fu7nBeK+H/X7TdvAX+gObWOEeE3HIn TDAzHFXZ6+lNkGXNcUFtJD1KycxsFWZnxsnBInx+ygZzLL+GaisLSbRp66Tu625aTzUHfg+yZ ZkWky++WqY3qJhrUjn6nxuYURj8MCRrCaC4QZWnLa7p/xS/u0U= X-Spam-Score: -3.0 (---) X-Debbugs-Envelope-To: 25787 Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= , Marius Bakke , 25787@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.0 (---) * gnu/packages/music.scm (clementine): New variable. * gnu/packages/patches/clementine-use-openssl.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Co-authored-by: Ricardo Wurmus --- gnu/local.mk | 1 + gnu/packages/music.scm | 114 ++++++++++++++++++++++ gnu/packages/patches/clementine-use-openssl.patch | 67 +++++++++++++ 3 files changed, 182 insertions(+) create mode 100644 gnu/packages/patches/clementine-use-openssl.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3012976a8..5530e3342 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -562,6 +562,7 @@ dist_patch_DATA = \ %D%/packages/patches/chmlib-inttypes.patch \ %D%/packages/patches/clang-libc-search-path.patch \ %D%/packages/patches/clang-3.8-libc-search-path.patch \ + %D%/packages/patches/clementine-use-openssl.patch \ %D%/packages/patches/clisp-remove-failing-test.patch \ %D%/packages/patches/clucene-pkgconfig.patch \ %D%/packages/patches/clx-remove-demo.patch \ diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 55ae15f1a..453125a8b 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -54,8 +54,11 @@ #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) + #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) + #:use-module (gnu packages databases) + #:use-module (gnu packages datastructures) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages emacs) @@ -73,12 +76,14 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages graphics) + #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages java) #:use-module (gnu packages libffi) + #:use-module (gnu packages libusb) #:use-module (gnu packages linux) ; for alsa-utils #:use-module (gnu packages lirc) #:use-module (gnu packages llvm) @@ -91,6 +96,7 @@ #:use-module (gnu packages pdf) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) ;libsndfile #:use-module (gnu packages python) #:use-module (gnu packages qt) @@ -176,6 +182,114 @@ and play MIDI files with a few clicks in a user-friendly interface offering score, keyboard, guitar, drum and controller views.") (license license:gpl3+))) +;; We don't use the latest release because it depends on Qt4. Instead we +;; download the sources from the tip of the "qt5" branch. +(define-public clementine + (let ((commit "0a59257dc334b8df60a4d7d90b04f1766747efcf") + (revision "1")) + (package + (name "clementine") + (version (string-append "1.3.1-" revision "." (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/clementine-player/Clementine.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0cdcj7di7j9jgzc1ihjna1a5df64f9hnmx7b9kh8rlg76hc0l0hi")) + (modules '((guix build utils))) + (snippet + '(for-each + (lambda (dir) + (delete-file-recursively + (string-append "3rdparty/" dir))) + (list + ;; TODO: The following dependencies are still bundled: + ;; - "qxt": Appears to be unmaintained upstream. + ;; - "qsqlite" + ;; - "qtsingleapplication" + ;; - "qocoa" + ;; - "qtiocompressor" + ;; - "gmock": The tests crash when using our googletest + ;; package instead of the bunbled gmock. + "SPMediaKeyTap" + "fancytabwidget" + "google-breakpad" + "libmygpo-qt" + "libmygpo-qt5" + "libprojectm" + "qtwin" + "sha2" ;; Replaced by openssl. + "taglib" + "tinysvcmdns"))) + (patches (search-patches "clementine-use-openssl.patch")))) + (build-system cmake-build-system) + (arguments + '(#:test-target "clementine_test" + #:configure-flags + (let ((crypto (assoc-ref %build-inputs "crypto++"))) + (list "-DENABLE_VISUALISATIONS=OFF" ; requires unpackaged "projectm" + "-DCRYPTOPP_FOUND=TRUE" + (string-append "-DCRYPTOPP_INCLUDE_DIRS=" crypto "/include") + (string-append "-DCRYPTOPP_LIBRARY_DIRS=" crypto "/lib") + (string-append "-DCRYPTOPP_LIBRARIES=" crypto "/lib/libcryptopp.a") + "-DUSE_SYSTEM_SHA2=TRUE")) + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))) + (wrap-program (string-append out "/bin/clementine") + `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))) + #t)))))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config) + ("qtlinguist" ,qttools))) + (inputs + `(("boost" ,boost) + ("chromaprint" ,chromaprint) + ("crypto++" ,crypto++) + ("fftw" ,fftw) + ("glib" ,glib) + ("glu" ,glu) + ("gstreamer" ,gstreamer) + ("gst-plugins-base" ,gst-plugins-base) + ("libcdio" ,libcdio) + ("libmygpo-qt" ,libmygpo-qt) + ("libechonest" ,libechonest) + ;; TODO: Package libgpod. + ("libmtp" ,libmtp) + ("libxml2" ,libxml2) + ("openssl" ,openssl) + ("protobuf" ,protobuf) + ("pulseaudio" ,pulseaudio) + ("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras) + ("qtwebkit" ,qtwebkit) + ("sqlite" ,sqlite-with-fts3) + ("sparsehash" ,sparsehash) + ("taglib" ,taglib))) + (home-page "http://clementine-player.org") + (synopsis "Music player and library organizer") + (description "Clementine is a multiplatform music player. It is inspired +by Amarok 1.4, focusing on a fast and easy-to-use interface for searching and +playing your music.") + (license (list + ;; clementine and qtiocompressor are under GPLv3. + license:gpl3+ + ;; gmock is under BSD-3. + license:bsd-3 + ;; qxt is under CPL1.0. + license:cpl1.0 + ;; qsqlite and qtsingleapplication are under LGPL2.1+. + license:lgpl2.1+ + ;; qocoa is under MIT and CC by-sa for the icons. + license:cc-by-sa3.0))))) + (define-public cmus (package (name "cmus") diff --git a/gnu/packages/patches/clementine-use-openssl.patch b/gnu/packages/patches/clementine-use-openssl.patch new file mode 100644 index 000000000..1fbf3d2b8 --- /dev/null +++ b/gnu/packages/patches/clementine-use-openssl.patch @@ -0,0 +1,67 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4022c383b..3202b8b69 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -83,6 +83,7 @@ pkg_check_modules(LIBPULSE libpulse) + pkg_check_modules(LIBXML libxml-2.0) + pkg_check_modules(SPOTIFY libspotify>=12.1.45) + pkg_check_modules(TAGLIB REQUIRED taglib>=1.6) ++pkg_check_modules(OPENSSL REQUIRED openssl) + + if (WIN32) + find_package(ZLIB REQUIRED) +@@ -381,20 +382,6 @@ if(GMOCK_INCLUDE_DIRS) + endif(GTEST_INCLUDE_DIRS) + endif(GMOCK_INCLUDE_DIRS) + +-# Use the system's sha2 if it's available. +-find_path(SHA2_INCLUDE_DIRS sha2.h) +-find_library(SHA2_LIBRARIES sha2) +-if(SHA2_LIBRARIES AND SHA2_INCLUDE_DIRS) +- message(STATUS "Using system sha2 library") +- set(USE_SYSTEM_SHA2 ON) +-else() +- message(STATUS "Using builtin sha2 library") +- set(USE_SYSTEM_SHA2 OFF) +- add_subdirectory(3rdparty/sha2) +- set(SHA2_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/sha2) +- set(SHA2_LIBRARIES sha2) +-endif() +- + # Use the system libmygpo-qt5 if a recent enough version was found + if(LIBMYGPO_QT5_FOUND) + set(MYGPOQT5_LIBRARIES ${LIBMYGPO_QT5_LIBRARIES}) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 6e24c9726..104d044d9 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -29,7 +29,6 @@ include_directories(${LIBPROJECTM_INCLUDE_DIRS}) + include_directories(${QTSINGLEAPPLICATION_INCLUDE_DIRS}) + include_directories(${QTIOCOMPRESSOR_INCLUDE_DIRS}) + include_directories(${QXT_INCLUDE_DIRS}) +-include_directories(${SHA2_INCLUDE_DIRS}) + include_directories(${CHROMAPRINT_INCLUDE_DIRS}) + include_directories(${MYGPOQT5_INCLUDE_DIRS}) + +@@ -1223,7 +1222,7 @@ target_link_libraries(clementine_lib + libclementine-common + libclementine-tagreader + libclementine-remote +- ${SHA2_LIBRARIES} ++ ${OPENSSL_LIBRARIES} + ${TAGLIB_LIBRARIES} + ${MYGPOQT5_LIBRARIES} + ${CHROMAPRINT_LIBRARIES} +diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp +index ce76f22da..80bf623fb 100644 +--- a/src/core/utilities.cpp ++++ b/src/core/utilities.cpp +@@ -52,7 +52,7 @@ + #include "config.h" + #include "timeconstants.h" + +-#include "sha2.h" ++#include + + #if defined(Q_OS_UNIX) + #include -- 2.14.3 From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 29 16:20:53 2017 Received: (at 25787) by debbugs.gnu.org; 29 Oct 2017 20:20:53 +0000 Received: from localhost ([127.0.0.1]:40963 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e8u4b-0005ZF-Bu for submit@debbugs.gnu.org; Sun, 29 Oct 2017 16:20:53 -0400 Received: from mout.gmx.net ([212.227.17.20]:58557) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e8u4X-0005Yv-Pi for 25787@debbugs.gnu.org; Sun, 29 Oct 2017 16:20:44 -0400 Received: from labiere ([80.229.147.137]) by mail.gmx.com (mrgmx103 [212.227.17.174]) with ESMTPSA (Nemesis) id 0Mhhr5-1dmgWa3Jo3-00MqBR; Sun, 29 Oct 2017 21:20:31 +0100 References: <20170218133830.24091-1-pierre.langlois@gmx.com> <20170218180249.1522-1-pierre.langlois@gmx.com> <87h93mfbkm.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <871su5d0is.fsf@gnu.org> <87vaphppr7.fsf@gnu.org> <8760b3coak.fsf@elephly.net> User-agent: mu4e 0.9.19; emacs 25.3.1 From: Pierre Langlois To: Ricardo Wurmus Subject: Re: [bug#25787] [PATCH 02/02] gnu: Add clementine. In-reply-to: Date: Sun, 29 Oct 2017 20:20:30 +0000 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Provags-ID: V03:K0:aqb35FzFoVM2hk5G4lg18sMPZlFctJT/pk0zqevc0NR81sIxqwQ +wXPIxXzxjs5EbZIQXN6M266CB2GtTJV5czX9av8qm3/BB73Y1cUiRe8pXIvfKinF+L3Bos YWnQKlWKBfthjAy9mqWIXpLTrbt5y0toxnctvRQWucqkSFrgJrlqcqTzkOFcCvx0Ub0veHP NG0Syw7yr+M2z41TzMw9g== X-UI-Out-Filterresults: notjunk:1;V01:K0:0P5vweAfbJU=:wbcbRPWlIubYzpsnYUhubP 5ly9eTCOhWXIqZpbEnmHkEqxEo1+mWaSe/NVLZq2RHa4T8KP+n3SQLCWAKDAcmuRTNgzV5evn Og6K+kMicGhbY/PAhPz/0av/cmIND1LSRqq8oHTMi2gcd/fn3TLi+yV/tbEY8KUQ5WQ+/r9PX xqazDi8JYFrwXNbZjCJmi0wUi4wso9G5uTG+fh78DGhh7kScNX+0zsHnZJNPYumDtZWiQPiQu nGY2TlKcHrhESACOJKGh5XWy9MAHYoEnwopnOWqnGTv/gbknbZDPLcUPnG6rbjpVneOI49aw+ eevcFhNIA3HkcuTdVaPD0Q7PH6+i1lkalMO0niyJY7AN1NIOJmHp8W8dMClBtuDtYbJzxkp8Z gdATNNG5D9CIcBTAwCnNoJctprddK3KCgq1NehHYxE9FzMk0w8B/TzXKCjiAgwXkRQLN5oqjQ ke0VNI9xSceqrzA3CuY+mga+QkUT1lIAK36ZLu09X6cyh2C0ZlD/YceesqQSVZyPoDP/INirT eWxBxodZcJQW/jKwkBEDRcN7EWYvK8ET8DU07iOQva0YcgdlVfDLs9OF0IWk8yT8GVnEiTrd3 nUKXRydsl35+3XKj51iEPY65+yCmR7AIdei7Y01d7Bi+u1z4vcpFqro3FjAyqKaBVXa/DGfe9 0EPZrMH9D9diMJCuSlpkPLmwjT3l9XqfikyUZPJaT/N6I1nU+tll7m5MZTmfrSMETf1LLvQq9 iYJ/NRZc4WJJlCjKT6O/aT4LyUYmmt8uFNb/i5SPcaVtQ3NunWmy/xS6tuUcwBML86Va+LqHr JqrsC4549huIep/DV2Wy+rp6eeBCQ== X-Spam-Score: -3.0 (---) X-Debbugs-Envelope-To: 25787 Cc: 25787@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) --=-=-= Content-Type: text/plain; format=flowed OK, I messed those emails and the patches are completely mangled... oups! Here are the patches as attachments. I would normally use git send-email but it wasn't working for me today for some reason. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-Add-libmygpo-qt.patch Content-Transfer-Encoding: quoted-printable >From f8c1602f78cb570d013313cdb5fd100716bcf4bb Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 25 Feb 2017 12:20:34 +0000 Subject: [PATCH 01/02] gnu: Add libmygpo-qt. * gnu/packages/music.scm (libmygpo-qt): New variable. * gnu/packages/patches/libmygpo-qt-fix-jsoncreatortest.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/music.scm | 27 ++++++++++++++ .../patches/libmygpo-qt-fix-jsoncreatortest.patch | 41 ++++++++++++++++++= ++++ 3 files changed, 69 insertions(+) create mode 100644 gnu/packages/patches/libmygpo-qt-fix-jsoncreatortest.pa= tch diff --git a/gnu/local.mk b/gnu/local.mk index 90dc7aec1..3012976a8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -801,6 +801,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/libmad-armv7-thumb-pt2.patch \ %D%/packages/patches/libmad-frame-length.patch \ %D%/packages/patches/libmad-mips-newgcc.patch \ + %D%/packages/patches/libmygpo-qt-fix-jsoncreatortest.patch \ %D%/packages/patches/libsndfile-armhf-type-checks.patch \ %D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch \ %D%/packages/patches/libsndfile-CVE-2017-8362.patch \ diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index f5df44070..55ae15f1a 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3367,3 +3367,30 @@ the electronic or dubstep genre.") designed to make a developer's life easy when trying to use the APIs provi= ded by The Echo Nest.") (license license:gpl2+))) + +(define-public libmygpo-qt + (package + (name "libmygpo-qt") + (version "1.0.9") + (source + (origin + (method url-fetch) + (uri (string-append "http://stefan.derkits.at/files/libmygpo-qt/lib= mygpo-qt." + version ".tar.gz")) + (sha256 + (base32 "1wsgh2vjnd52rkvpncj1ycpbp84sj9hh12ija46b42z9mmqf2jm4")) + (patches (search-patches "libmygpo-qt-fix-jsoncreatortest.patch")))) + (build-system cmake-build-system) + (arguments + '(#:configure-flags '("-DBUILD_WITH_QT4=3DOFF"))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("qt" ,qtbase))) + (home-page "http://wiki.gpodder.org/wiki/Libmygpo-qt") + (synopsis "Qt/C++ library wrapping the @url{https://gpodder.net} +Webservice") + (description "@code{libmygpo-qt} is a Qt/C++ library wrapping the +@url{https://gpodder.net} APIs. It allows applications to discover, manage +and track podcasts.") + (license license:lgpl2.1+))) diff --git a/gnu/packages/patches/libmygpo-qt-fix-jsoncreatortest.patch b/g= nu/packages/patches/libmygpo-qt-fix-jsoncreatortest.patch new file mode 100644 index 000000000..c457d592c --- /dev/null +++ b/gnu/packages/patches/libmygpo-qt-fix-jsoncreatortest.patch @@ -0,0 +1,41 @@ +From ebe2323727f8d646590245b0bf06dbc92b5808d6 Mon Sep 17 00:00:00 2001 +From: Golubev Alexander +Date: Tue, 20 Sep 2016 15:33:30 +0400 +Subject: [PATCH] JsonCreatorTest failed due to extra space + +JsonCreatorTest failed with next message: +``` +********* Start testing of mygpo::JsonCreatorTest ********* +Config: Using QTest library 4.8.6, Qt 4.8.6 +PASS : mygpo::JsonCreatorTest::initTestCase() +PASS : mygpo::JsonCreatorTest::testAddRemoveSubsToJSON() +PASS : mygpo::JsonCreatorTest::testSaveSettingsToJSON() +FAIL! : mygpo::JsonCreatorTest::testEpisodeActionListToJSON() Compared va= lues are not the same + Actual (outString2): [{"action":"download","device":"device1","episode"= :"http://episode.url","podcast":"http://podcast.url","timestamp":"1998-01-0= 1T00:01:02"},{"action":"delete","device":"device3","episode":"http://episod= e2.url","podcast":"http://podcast2.url","timestamp":"1920-01-01T12:01:02"},= {"action":"new","device":"foodev","episode":"http://www.podtrac.com","podca= st":"http://leo.am","timestamp":"1998-01-01T00:01:02"},{"action":"play","de= vice":"foodev","episode":"http://www.podtrac.com","podcast":"http://leo.am"= ,"timestamp":"1920-01-01T12:01:02"},{"action":"play","device":"foodev","epi= sode":"http://www.podtrac.com","podcast":"http://leo.am","position":123,"st= arted":10,"timestamp":"1998-01-01T00:01:02","total":321},{"action":"play","= device":"foodev","episode":"http://www.podtrac.com","podcast":"http://leo.a= m","position":10,"timestamp":"1998-01-01T00:01:02"}] + Expected (expected2): [{"action":"download","device":"device1","episode= ":"http://episode.url","podcast":"http: + Loc: [/var/tmp/portage/media-libs/libmygpo-qt-1.0.9-r1/work/libmygpo-qt= -1.0.9/tests/JsonCreatorTest.cpp(138)] +PASS : mygpo::JsonCreatorTest::testRenameDeviceStringToJSON() +PASS : mygpo::JsonCreatorTest::testDeviceSynchronizationListsToJSON() +PASS : mygpo::JsonCreatorTest::cleanupTestCase() +Totals: 6 passed, 1 failed, 0 skipped +********* Finished testing of mygpo::JsonCreatorTest ********* +``` + +This was caused by extra space in the expected string. +--- + tests/JsonCreatorTest.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/JsonCreatorTest.cpp b/tests/JsonCreatorTest.cpp +index b15b006..feb03d5 100644 +--- a/tests/JsonCreatorTest.cpp ++++ b/tests/JsonCreatorTest.cpp +@@ -133,7 +133,7 @@ void JsonCreatorTest::testEpisodeActionListToJSON() +=20 + output =3D JsonCreator::episodeActionListToJSON(episodeActions); + QString outString2 =3D QString::fromLatin1( output ).replace( QLatin1St= ring(" "), QLatin1String("") ); +- QString expected2( QLatin1String( "[{\"action\":\"download\",\"device\"= :\"device1\",\"episode\":\"http://episode.url\",\"podcast\":\"http://podcas= t.url\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"delete\",\"dev= ice\":\"device3\",\"episode\":\"http://episode2.url\",\"podcast\":\"http://= podcast2.url\",\"timestamp\":\"1920-01-01T12:01:02\"},{\"action\":\"new\",\= "device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"h= ttp://leo.am\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"play\",= \"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"= http://leo.am\",\"timestamp\":\"1920-01-01T12:01:02\" },{\"action\":\"play\= ",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":= \"http://leo.am\",\"position\":123,\"started\":10,\"timestamp\":\"1998-01-0= 1T00:01:02\",\"total\":321},{\"action\":\"play\",\"device\":\"foodev\",\"ep= isode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position= \":10,\"timestamp\":\"1998-01-01T00:01:02\"}]" ) ); ++ QString expected2( QLatin1String( "[{\"action\":\"download\",\"device\"= :\"device1\",\"episode\":\"http://episode.url\",\"podcast\":\"http://podcas= t.url\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"delete\",\"dev= ice\":\"device3\",\"episode\":\"http://episode2.url\",\"podcast\":\"http://= podcast2.url\",\"timestamp\":\"1920-01-01T12:01:02\"},{\"action\":\"new\",\= "device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"h= ttp://leo.am\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"play\",= \"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"= http://leo.am\",\"timestamp\":\"1920-01-01T12:01:02\"},{\"action\":\"play\"= ,\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\= "http://leo.am\",\"position\":123,\"started\":10,\"timestamp\":\"1998-01-01= T00:01:02\",\"total\":321},{\"action\":\"play\",\"device\":\"foodev\",\"epi= sode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\= ":10,\"timestamp\":\"1998-01-01T00:01:02\"}]" ) ); +=20 + QCOMPARE(outString2, expected2 ); + } --=20 2.14.3 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-Add-clementine.patch >From ace833f94b278e445a8e91fd5b1c105de3f39896 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Wed, 25 Oct 2017 19:57:11 +0100 Subject: [PATCH 02/02] gnu: Add clementine. * gnu/packages/music.scm (clementine): New variable. * gnu/packages/patches/clementine-use-openssl.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Co-authored-by: Ricardo Wurmus --- gnu/local.mk | 1 + gnu/packages/music.scm | 114 ++++++++++++++++++++++ gnu/packages/patches/clementine-use-openssl.patch | 67 +++++++++++++ 3 files changed, 182 insertions(+) create mode 100644 gnu/packages/patches/clementine-use-openssl.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3012976a8..5530e3342 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -562,6 +562,7 @@ dist_patch_DATA = \ %D%/packages/patches/chmlib-inttypes.patch \ %D%/packages/patches/clang-libc-search-path.patch \ %D%/packages/patches/clang-3.8-libc-search-path.patch \ + %D%/packages/patches/clementine-use-openssl.patch \ %D%/packages/patches/clisp-remove-failing-test.patch \ %D%/packages/patches/clucene-pkgconfig.patch \ %D%/packages/patches/clx-remove-demo.patch \ diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 55ae15f1a..453125a8b 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -54,8 +54,11 @@ #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) + #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) + #:use-module (gnu packages databases) + #:use-module (gnu packages datastructures) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages emacs) @@ -73,12 +76,14 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages graphics) + #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages java) #:use-module (gnu packages libffi) + #:use-module (gnu packages libusb) #:use-module (gnu packages linux) ; for alsa-utils #:use-module (gnu packages lirc) #:use-module (gnu packages llvm) @@ -91,6 +96,7 @@ #:use-module (gnu packages pdf) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) ;libsndfile #:use-module (gnu packages python) #:use-module (gnu packages qt) @@ -176,6 +182,114 @@ and play MIDI files with a few clicks in a user-friendly interface offering score, keyboard, guitar, drum and controller views.") (license license:gpl3+))) +;; We don't use the latest release because it depends on Qt4. Instead we +;; download the sources from the tip of the "qt5" branch. +(define-public clementine + (let ((commit "0a59257dc334b8df60a4d7d90b04f1766747efcf") + (revision "1")) + (package + (name "clementine") + (version (string-append "1.3.1-" revision "." (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/clementine-player/Clementine.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0cdcj7di7j9jgzc1ihjna1a5df64f9hnmx7b9kh8rlg76hc0l0hi")) + (modules '((guix build utils))) + (snippet + '(for-each + (lambda (dir) + (delete-file-recursively + (string-append "3rdparty/" dir))) + (list + ;; TODO: The following dependencies are still bundled: + ;; - "qxt": Appears to be unmaintained upstream. + ;; - "qsqlite" + ;; - "qtsingleapplication" + ;; - "qocoa" + ;; - "qtiocompressor" + ;; - "gmock": The tests crash when using our googletest + ;; package instead of the bunbled gmock. + "SPMediaKeyTap" + "fancytabwidget" + "google-breakpad" + "libmygpo-qt" + "libmygpo-qt5" + "libprojectm" + "qtwin" + "sha2" ;; Replaced by openssl. + "taglib" + "tinysvcmdns"))) + (patches (search-patches "clementine-use-openssl.patch")))) + (build-system cmake-build-system) + (arguments + '(#:test-target "clementine_test" + #:configure-flags + (let ((crypto (assoc-ref %build-inputs "crypto++"))) + (list "-DENABLE_VISUALISATIONS=OFF" ; requires unpackaged "projectm" + "-DCRYPTOPP_FOUND=TRUE" + (string-append "-DCRYPTOPP_INCLUDE_DIRS=" crypto "/include") + (string-append "-DCRYPTOPP_LIBRARY_DIRS=" crypto "/lib") + (string-append "-DCRYPTOPP_LIBRARIES=" crypto "/lib/libcryptopp.a") + "-DUSE_SYSTEM_SHA2=TRUE")) + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))) + (wrap-program (string-append out "/bin/clementine") + `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))) + #t)))))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config) + ("qtlinguist" ,qttools))) + (inputs + `(("boost" ,boost) + ("chromaprint" ,chromaprint) + ("crypto++" ,crypto++) + ("fftw" ,fftw) + ("glib" ,glib) + ("glu" ,glu) + ("gstreamer" ,gstreamer) + ("gst-plugins-base" ,gst-plugins-base) + ("libcdio" ,libcdio) + ("libmygpo-qt" ,libmygpo-qt) + ("libechonest" ,libechonest) + ;; TODO: Package libgpod. + ("libmtp" ,libmtp) + ("libxml2" ,libxml2) + ("openssl" ,openssl) + ("protobuf" ,protobuf) + ("pulseaudio" ,pulseaudio) + ("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras) + ("qtwebkit" ,qtwebkit) + ("sqlite" ,sqlite-with-fts3) + ("sparsehash" ,sparsehash) + ("taglib" ,taglib))) + (home-page "http://clementine-player.org") + (synopsis "Music player and library organizer") + (description "Clementine is a multiplatform music player. It is inspired +by Amarok 1.4, focusing on a fast and easy-to-use interface for searching and +playing your music.") + (license (list + ;; clementine and qtiocompressor are under GPLv3. + license:gpl3+ + ;; gmock is under BSD-3. + license:bsd-3 + ;; qxt is under CPL1.0. + license:cpl1.0 + ;; qsqlite and qtsingleapplication are under LGPL2.1+. + license:lgpl2.1+ + ;; qocoa is under MIT and CC by-sa for the icons. + license:cc-by-sa3.0))))) + (define-public cmus (package (name "cmus") diff --git a/gnu/packages/patches/clementine-use-openssl.patch b/gnu/packages/patches/clementine-use-openssl.patch new file mode 100644 index 000000000..1fbf3d2b8 --- /dev/null +++ b/gnu/packages/patches/clementine-use-openssl.patch @@ -0,0 +1,67 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4022c383b..3202b8b69 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -83,6 +83,7 @@ pkg_check_modules(LIBPULSE libpulse) + pkg_check_modules(LIBXML libxml-2.0) + pkg_check_modules(SPOTIFY libspotify>=12.1.45) + pkg_check_modules(TAGLIB REQUIRED taglib>=1.6) ++pkg_check_modules(OPENSSL REQUIRED openssl) + + if (WIN32) + find_package(ZLIB REQUIRED) +@@ -381,20 +382,6 @@ if(GMOCK_INCLUDE_DIRS) + endif(GTEST_INCLUDE_DIRS) + endif(GMOCK_INCLUDE_DIRS) + +-# Use the system's sha2 if it's available. +-find_path(SHA2_INCLUDE_DIRS sha2.h) +-find_library(SHA2_LIBRARIES sha2) +-if(SHA2_LIBRARIES AND SHA2_INCLUDE_DIRS) +- message(STATUS "Using system sha2 library") +- set(USE_SYSTEM_SHA2 ON) +-else() +- message(STATUS "Using builtin sha2 library") +- set(USE_SYSTEM_SHA2 OFF) +- add_subdirectory(3rdparty/sha2) +- set(SHA2_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/sha2) +- set(SHA2_LIBRARIES sha2) +-endif() +- + # Use the system libmygpo-qt5 if a recent enough version was found + if(LIBMYGPO_QT5_FOUND) + set(MYGPOQT5_LIBRARIES ${LIBMYGPO_QT5_LIBRARIES}) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 6e24c9726..104d044d9 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -29,7 +29,6 @@ include_directories(${LIBPROJECTM_INCLUDE_DIRS}) + include_directories(${QTSINGLEAPPLICATION_INCLUDE_DIRS}) + include_directories(${QTIOCOMPRESSOR_INCLUDE_DIRS}) + include_directories(${QXT_INCLUDE_DIRS}) +-include_directories(${SHA2_INCLUDE_DIRS}) + include_directories(${CHROMAPRINT_INCLUDE_DIRS}) + include_directories(${MYGPOQT5_INCLUDE_DIRS}) + +@@ -1223,7 +1222,7 @@ target_link_libraries(clementine_lib + libclementine-common + libclementine-tagreader + libclementine-remote +- ${SHA2_LIBRARIES} ++ ${OPENSSL_LIBRARIES} + ${TAGLIB_LIBRARIES} + ${MYGPOQT5_LIBRARIES} + ${CHROMAPRINT_LIBRARIES} +diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp +index ce76f22da..80bf623fb 100644 +--- a/src/core/utilities.cpp ++++ b/src/core/utilities.cpp +@@ -52,7 +52,7 @@ + #include "config.h" + #include "timeconstants.h" + +-#include "sha2.h" ++#include + + #if defined(Q_OS_UNIX) + #include -- 2.14.3 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 05 02:08:09 2017 Received: (at 25787-done) by debbugs.gnu.org; 5 Dec 2017 07:08:09 +0000 Received: from localhost ([127.0.0.1]:46319 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eM7Kr-0001Vj-0n for submit@debbugs.gnu.org; Tue, 05 Dec 2017 02:08:09 -0500 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21037) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eM7Km-0001VY-VQ for 25787-done@debbugs.gnu.org; Tue, 05 Dec 2017 02:08:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1512457661; s=zoho; d=elephly.net; i=rekado@elephly.net; h=References:From:To:Cc:Subject:In-reply-to:Date:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-ID; l=682; bh=ZLfcqKFpRUUUzAwI/wjZ+B5La3m5PQdr6gOCVgu4YSQ=; b=NI1+M7XHcC86ehn/tt30eeYCa4QhjFOxKyei7G1chhGxGMOW3hkQLoejma3KhN7+ L4tLB07hWEiH1u7l1DSNq6Lqlsy530UqH657w+5wyhRQf9Fh0H0l7/b4/BFHAeNRh4u wgco+eEb5OZXF02pNZp9hMBAHd8epXa/RCr3PeAk= Received: from localhost (port-92-200-47-198.dynamic.qsc.de [92.200.47.198]) by mx.zohomail.com with SMTPS id 151245766163740.4255532124389; Mon, 4 Dec 2017 23:07:41 -0800 (PST) References: <20170218133830.24091-1-pierre.langlois@gmx.com> <20170218180249.1522-1-pierre.langlois@gmx.com> <87h93mfbkm.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <871su5d0is.fsf@gnu.org> <87vaphppr7.fsf@gnu.org> <8760b3coak.fsf@elephly.net> User-agent: mu4e 0.9.18; emacs 25.3.1 From: Ricardo Wurmus To: Pierre Langlois Subject: Re: [bug#25787] [PATCH 02/02] gnu: Add clementine. In-reply-to: X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Tue, 05 Dec 2017 08:07:38 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Message-ID: <87k1y13b5x.fsf@elephly.net> X-ZohoMailClient: External X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 25787-done Cc: 25787-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) Pierre Langlois writes: > OK, I messed those emails and the patches are completely=20 > mangled... oups! > > Here are the patches as attachments. I would normally use git=20 > send-email > but it wasn't working for me today for some reason. Thank you. I=E2=80=99ve applied them with minor stylistic changes, built clementine to confirm that it=E2=80=99s working and pushed it with commit d20b7384b to master. We will still need to unbundle this some more, but I think that this can be done later. Thanks for your work and patience so far! --=20 Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From unknown Fri Jun 20 07:22:39 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 02 Jan 2018 12:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator