gnu: gjs: Update to 1.48.3.
* gnu/packages/gnome.scm (gjs): Update to 1.48.3. [source]: Remove snippet. [arguments]: Disable failing tests. [propagated-inputs]: Use mozjs-38 instead of mozjs-24; add cairo.
This commit is contained in:
		
							parent
							
								
									962d017158
								
							
						
					
					
						commit
						144f94d0a2
					
				
					 1 changed files with 10 additions and 12 deletions
				
			
		|  | @ -4174,7 +4174,7 @@ configuration program to choose applications starting on login.") | ||||||
| (define-public gjs | (define-public gjs | ||||||
|   (package |   (package | ||||||
|     (name "gjs") |     (name "gjs") | ||||||
|     (version "1.46.0") |     (version "1.48.3") | ||||||
|     (source (origin |     (source (origin | ||||||
|               (method url-fetch) |               (method url-fetch) | ||||||
|               (uri (string-append "mirror://gnome/sources/" name "/" |               (uri (string-append "mirror://gnome/sources/" name "/" | ||||||
|  | @ -4182,10 +4182,7 @@ configuration program to choose applications starting on login.") | ||||||
|                                   name "-" version ".tar.xz")) |                                   name "-" version ".tar.xz")) | ||||||
|               (sha256 |               (sha256 | ||||||
|                (base32 |                (base32 | ||||||
|                 "1m2ssa6qsipbp8lz4xbhf0nhadhv0xkdpmz1jcvl9187lwgmk0r2")) |                 "0cqgv460wfhwkw6j1h46v6bg29bycg6dfl7c5rv0lfcqmmw7v6v6")))) | ||||||
|               (modules '((guix build utils))) |  | ||||||
|               (snippet '(substitute* "test/run-with-dbus" |  | ||||||
|                           (("/bin/rm") "rm"))))) |  | ||||||
|     (build-system gnu-build-system) |     (build-system gnu-build-system) | ||||||
|     (arguments |     (arguments | ||||||
|      '(#:phases |      '(#:phases | ||||||
|  | @ -4200,11 +4197,11 @@ configuration program to choose applications starting on login.") | ||||||
|             ;; For the missing /etc/machine-id. |             ;; For the missing /etc/machine-id. | ||||||
|             (setenv "DBUS_FATAL_WARNINGS" "0") |             (setenv "DBUS_FATAL_WARNINGS" "0") | ||||||
| 
 | 
 | ||||||
|             ;; XXX: fails with: |             ;; Our mozjs-38 package does not compile the required Intl API | ||||||
|             ;;   Failed to convert UTF-8 string to JS string: ... |             ;; support for these failing tests. | ||||||
|             ;; TODO: actually fix it. |             (substitute* "installed-tests/js/testLocale.js" | ||||||
|             (substitute* "installed-tests/js/testEverythingBasic.js" |               ((".*toBeDefined.*") "") | ||||||
|               ((".*test_utf8_inout.*") "")) |               ((".*expect\\(datestr\\).*") "")) | ||||||
|             #t))))) |             #t))))) | ||||||
|     (native-inputs |     (native-inputs | ||||||
|      `(("glib:bin" ,glib "bin")       ; for glib-compile-resources |      `(("glib:bin" ,glib "bin")       ; for glib-compile-resources | ||||||
|  | @ -4216,8 +4213,9 @@ configuration program to choose applications starting on login.") | ||||||
|        ("xvfb" ,xorg-server))) |        ("xvfb" ,xorg-server))) | ||||||
|     (propagated-inputs |     (propagated-inputs | ||||||
|      ;; These are all in the Requires.private field of gjs-1.0.pc. |      ;; These are all in the Requires.private field of gjs-1.0.pc. | ||||||
|      `(("gobject-introspection" ,gobject-introspection) |      `(("cairo" ,cairo) | ||||||
|        ("mozjs" ,mozjs-24))) |        ("gobject-introspection" ,gobject-introspection) | ||||||
|  |        ("mozjs" ,mozjs-38))) | ||||||
|     (inputs |     (inputs | ||||||
|      `(("gtk+" ,gtk+) |      `(("gtk+" ,gtk+) | ||||||
|        ("readline" ,readline))) |        ("readline" ,readline))) | ||||||
|  |  | ||||||
		Reference in a new issue