From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 8AD9Ly4pAl/2PgAA0tVLHw (envelope-from ) for ; Sun, 05 Jul 2020 19:25:34 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id gOzVKy4pAl+vXQAAbx9fmQ (envelope-from ) for ; Sun, 05 Jul 2020 19:25:34 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 12E8C94062D for ; Sun, 5 Jul 2020 19:25:34 +0000 (UTC) Received: from localhost ([::1]:59910 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsAGb-0003do-0R for larch@yhetil.org; Sun, 05 Jul 2020 15:25:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37052) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsAGS-0003dY-7j for guix-devel@gnu.org; Sun, 05 Jul 2020 15:25:24 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:38300) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsAGP-0002BY-Lr for guix-devel@gnu.org; Sun, 05 Jul 2020 15:25:23 -0400 Received: from localhost (80-110-127-207.cgn.dynamic.surfer.at [80.110.127.207]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 04C993367AEE; Sun, 5 Jul 2020 21:25:16 +0200 (CEST) Date: Sun, 5 Jul 2020 21:25:15 +0200 From: Danny Milosavljevic To: Raghav Gururajan Subject: Re: [OUTREACHY]: Integration of desktop environments into GNU Guix Message-ID: <20200705212515.711f6327@scratchpost.org> In-Reply-To: <8c2fb558-249e-e96c-d2b2-ef53d3adfd00@disroot.org> References: <20200506051334.4558e7b3.raghavgururajan@disroot.org> <8c56bfdd-4080-9444-d3c2-7bd962c4c687@disroot.org> <49cc7f39-7bce-f5a1-55da-5f9bca203627@disroot.org> <7fc9e1ff-de86-56e0-386b-8e1eb9d54585@disroot.org> <1742d1f9-43ed-83a5-1354-bf1c94c2f679@disroot.org> <30888750-2c5b-d94f-6199-f8539b2d0de0@disroot.org> <73cb94f7-d7b4-ec0a-5942-e701a18bdf5c@disroot.org> <20200625004018.62dd2ac5@scratchpost.org> <8c2fb558-249e-e96c-d2b2-ef53d3adfd00@disroot.org> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/qh0/7XheoQzPXwnVvh1XUqn"; protocol="application/pgp-signature"; micalg=pgp-sha512 Received-SPF: none client-ip=85.13.145.193; envelope-from=dannym@scratchpost.org; helo=dd26836.kasserver.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/05 15:25:17 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_NONE=0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: guix-devel@gnu.org Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Spam-Score: -1.11 X-TUID: qeMIQSbfd+RD --Sig_/qh0/7XheoQzPXwnVvh1XUqn Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable I've applied most to wip-desktop, with the following changes/comments: nanomsg: not reproducible nng: not reproducible libmpeg3 lots of "undeclared" warnings libtimidity test failed "Could not initialise libTiMidity" in playmidi directfb not reproducible =E2=94=82 =E2=94=82 =E2=94=82 -DirectFB/Core: %s Application Core. (2020-07= -05 00:00) %s%s =E2=94=82 =E2=94=82 =E2=94=82 +DirectFB/Core: %s Application Core. (2020-07= -04 23:57) %s%s libde265 misses dependency to libvideogfx mjpegtools: >>From https://sourceforge.net/projects/mjpegtools/files/mjpegtools/2.1.0/mj= pegtools-2.1.0.tar.gz... >download failed "https://sourceforge.net/projects/mjpegtools/files/mjpegto= ols/2.1.0/mjpegtools-2.1.0.tar.gz" 404 "Not Found" Fallback works, though. libopenmpt: It is not required to propagate mpg123 or vorbis (see .pc file). srt: not reproducible; massive diff flite: Applied with the following changes diff --git a/gnu/packages/speech.scm b/gnu/packages/speech.scm index 0968b015be..c7fbb986ac 100644 --- a/gnu/packages/speech.scm +++ b/gnu/packages/speech.scm @@ -66,7 +66,7 @@ (arguments ;; XXX: ;; There numerous issues with the testsuite. - ;; Enable them once they are fixed in upstream. + ;; Enable all of them once they are fixed in upstream. `(#:tests? #f #:configure-flags (list @@ -76,25 +76,35 @@ "/lib")) #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-rpath + (lambda _ + (substitute* "main/Makefile" + (("flite_LIBS_flags \\+=3D -Wl,-rpath [^ ]*") + "flite_LIBS_flags +=3D")) + #t)) + (delete 'check) + ;; Modifying testsuite/Makefile is not done in favor of + ;; overriding 'check. + ;; The path not taken would be: + ;; test:\n\t$(foreach x,$(subst tris1,,$(subst dcoffset_wave,,$(s= ubst flite_test,,$(subst by_word,,$(subst bin2ascii,,$(subst lpc_resynth,,$= (subst rfc,,$(subst compare_wave,,$(subst record_in_noise,,$(subst combine_= waves,,$(patsubst play_%,,$(subst record_wave,,$(subst lex_lookup,,$(patsub= st lpc_test%,,$(patsubst asciiS2U%,,$(patsubst asciiU2S%,,$(ALL))))))))))))= ))))),echo TEST $x && ./$x data.one && ) true + (add-after 'install 'check + (lambda _ + (invoke "make" "-C" "testsuite") + (with-directory-excursion "testsuite" + (invoke "./token_test") + (invoke "./hrg_test") + (invoke "./regex_test") + (invoke "./nums_test") + (invoke "./lex_test") + (invoke "./utt_test") + (invoke "./multi_thread")) + #t)) (add-after 'install 'remove-static-libs (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out"))) (for-each delete-file - (list - (string-append out "/lib/libflite.a") - (string-append out "/lib/libflite_cmu_grapheme_l= ang.a") - (string-append out "/lib/libflite_cmu_grapheme_l= ex.a") - (string-append out "/lib/libflite_cmu_indic_lang= .a") - (string-append out "/lib/libflite_cmu_indic_lex.= a") - (string-append out "/lib/libflite_cmulex.a") - (string-append out "/lib/libflite_cmu_time_awb.a= ") - (string-append out "/lib/libflite_cmu_us_awb.a") - (string-append out "/lib/libflite_cmu_us_kal16.a= ") - (string-append out "/lib/libflite_cmu_us_kal.a") - (string-append out "/lib/libflite_cmu_us_rms.a") - (string-append out "/lib/libflite_cmu_us_slt.a") - (string-append out "/lib/libflite_usenglish.a"))= )) - #t))))) + (find-files out "\\.a$")) + #t)))))) (native-inputs `(("perl" ,perl))) (inputs zxing-cpp: Applied with the following changes diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm index 4921ae03a1..2c3df8f42b 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -28,6 +28,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (gnu packages autotools) + #:use-module (gnu packages check) #:use-module (gnu packages imagemagick) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) @@ -54,9 +55,31 @@ (file-name (git-file-name name version)) (sha256 (base32 "011sq8wcjfxbnd8sj6bf2fgkamlp8gj6q835g61c952npvwsnl71")))) + (native-inputs + `(("googletest-source" ,(package-source googletest)))) (build-system cmake-build-system) (arguments - `(#:tests? #f)) ; No target + `(#:out-of-source? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-googletest + ;; Copy the googletest sources to where the CMake build expects= them. + (lambda* (#:key inputs #:allow-other-keys) + (let ((source (assoc-ref inputs "googletest-source")) + (target "test/unit/googletest-src")) + (mkdir-p target) + (copy-recursively source target) + ;; Disable downloading via ExternalProject. + (substitute* "test/unit/CMakeLists.txt.in" + (("ExternalProject_Add\\(") "message(")) + #t))) + (replace 'check + (lambda _ + (with-directory-excursion "test/unit" + (invoke "cmake" ".") + (invoke "make") + (invoke "./ZXingUnitTest")) + #t))))) (synopsis "C++ port of ZXing") (description "ZXing-CPP is a barcode scanning library.") (home-page "https://github.com/nu-book/zxing-cpp") iqa: Applied with the following changes: diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 96fb8147a3..9754de03b7 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -107,7 +107,7 @@ (base32 "00mgwy031ammab6bwmd1whhvqv3fxy1cs1igabq0n3ag12zhjs77")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; No target + `(#:test-target "test" #:phases (modify-phases %standard-phases (delete 'configure) libnice: Moved gnutls to regular inputs because it's Requires.private in th= e .pc file. gst-plugins-bad: Patch does not apply gst-plugins-ugly: Patch does not apply gst-libav: Patch does not apply tesseract-ocr: Is it really necessary to propagate leptonica? openni2: Is it really necessary to have JRE and the JDK as REGULAR inputs? = Why? opesles: Did not review yet. Do we need that random commit ea5104b? Is th= ere a release to use instead? >+ (license (license:non-copyleft "Refer individual files")))) I don't think that's acceptable. If it were, we could just remove the "l= icense" field of all packages--because that's always true. --Sig_/qh0/7XheoQzPXwnVvh1XUqn Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl8CKRsACgkQ5xo1VCww uqUJXggAinnHfyH5q+memPYWl8crWbI+1eIxnFj4w67jrjQ/Bq+A+YOqMx0JDfFO 1BEw34VegXYbBFiLVyVMfhPGpRrdaru0N4zZe+pVTxnLvMEOWPlFW6RY7z88tShm 8v6GP3WZ+OGfz7OF+7pI1zQVIVP3V5WxgkIu3fVOpAyLEUvtN8p8vTS0bAt3xzoy 4lsNCNdDbX+e/ZFtHeoPnYEarfFU64TPLzc2F89ClXpX93NT/7/a2O7YY8S0rlcE 87Kw7uk04CjgSJpmYWaomfD0iNvka3PepxHHuRc3s04hsE+3bFUfKebhOEuo3QQF a90EslYEcGbgv1DkVOdkCEaBtt8CAg== =YeAi -----END PGP SIGNATURE----- --Sig_/qh0/7XheoQzPXwnVvh1XUqn--