[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [OUTREACHY]: Integration of desktop environments into GNU Guix
From: |
Danny Milosavljevic |
Subject: |
Re: [OUTREACHY]: Integration of desktop environments into GNU Guix |
Date: |
Sun, 5 Jul 2020 21:25:15 +0200 |
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
│ │ │ -DirectFB/Core: %s Application Core. (2020-07-05 00:00) %s%s
│ │ │ +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/mjpegtools-2.1.0.tar.gz...
>download failed
>"https://sourceforge.net/projects/mjpegtools/files/mjpegtools/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 \\+= -Wl,-rpath [^ ]*")
+ "flite_LIBS_flags +="))
+ #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,,$(subst
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,,$(patsubst 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_lang.a")
- (string-append out
"/lib/libflite_cmu_grapheme_lex.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 the
.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 there
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
"license" field of all packages--because that's always true.
pgp2J3Loyy7IP.pgp
Description: OpenPGP digital signature
- Re: [OUTREACHY]: Integration of desktop environments into GNU Guix, Raghav Gururajan, 2020/07/04
- Re: [OUTREACHY]: Integration of desktop environments into GNU Guix, Raghav Gururajan, 2020/07/04
- Re: [OUTREACHY]: Integration of desktop environments into GNU Guix,
Danny Milosavljevic <=
- Re: [OUTREACHY]: Integration of desktop environments into GNU Guix, Raghav Gururajan, 2020/07/06
- Re: [OUTREACHY]: Integration of desktop environments into GNU Guix, Raghav Gururajan, 2020/07/15
- Re: [OUTREACHY]: Integration of desktop environments into GNU Guix, Danny Milosavljevic, 2020/07/17
- Re: [OUTREACHY]: Integration of desktop environments into GNU Guix, Raghav Gururajan, 2020/07/18
- Re: [OUTREACHY]: Integration of desktop environments into GNU Guix, Danny Milosavljevic, 2020/07/18
- Re: [OUTREACHY]: Integration of desktop environments into GNU Guix, Raghav Gururajan, 2020/07/18
- Re: [OUTREACHY]: Integration of desktop environments into GNU Guix, Raghav Gururajan, 2020/07/18
- Re: [OUTREACHY]: Integration of desktop environments into GNU Guix, Danny Milosavljevic, 2020/07/19