gnu: qtwebengine-5: Update to 5.15.8.
Fixes <https://issues.guix.gnu.org/52672>. * gnu/packages/qt.scm (qtwebengine-5): Update to 5.15.8. [source]: Fix indentation. [arguments]: Use gexps.
This commit is contained in:
		
							parent
							
								
									d1bafb1086
								
							
						
					
					
						commit
						0f47e71840
					
				
					 1 changed files with 218 additions and 216 deletions
				
			
		| 
						 | 
				
			
			@ -2430,14 +2430,14 @@ using the Enchant spell-checking library.")
 | 
			
		|||
  (package
 | 
			
		||||
    (inherit qtsvg-5)
 | 
			
		||||
    (name "qtwebengine")
 | 
			
		||||
    (version "5.15.5")
 | 
			
		||||
    (version "5.15.8")
 | 
			
		||||
    (source
 | 
			
		||||
     (origin
 | 
			
		||||
       (method url-fetch)
 | 
			
		||||
       (uri (qt-urls name version))
 | 
			
		||||
       (sha256
 | 
			
		||||
        (base32
 | 
			
		||||
         "0zahr9w6rqdxwh2whsgk3fhcszs7wa9j95lq4sqi8xzin2wcgl17"))
 | 
			
		||||
         "1qv15g5anhlfsdwnjxy21vc3zxxm8149vysi774l93iab6mxqmjg"))
 | 
			
		||||
       (modules '((ice-9 ftw)
 | 
			
		||||
                  (ice-9 match)
 | 
			
		||||
                  (srfi srfi-1)
 | 
			
		||||
| 
						 | 
				
			
			@ -2595,9 +2595,10 @@ using the Enchant spell-checking library.")
 | 
			
		|||
                  (substitute*
 | 
			
		||||
                      "base/third_party/dynamic_annotations/dynamic_annotations.c"
 | 
			
		||||
                    (("base/third_party/valgrind") "valgrind"))
 | 
			
		||||
                 (substitute*
 | 
			
		||||
                   '("third_party/breakpad/breakpad/src/common/linux/http_upload.cc"
 | 
			
		||||
                     "third_party/breakpad/breakpad/src/common/linux/libcurl_wrapper.h")
 | 
			
		||||
                  (substitute* '("third_party/breakpad/breakpad/src/common\
 | 
			
		||||
/linux/http_upload.cc"
 | 
			
		||||
                                 "third_party/breakpad/breakpad/src/common/\
 | 
			
		||||
linux/libcurl_wrapper.h")
 | 
			
		||||
                    (("third_party/curl") "curl"))
 | 
			
		||||
                  (substitute*
 | 
			
		||||
                      '("components/viz/common/gpu/vulkan_context_provider.h"
 | 
			
		||||
| 
						 | 
				
			
			@ -2689,10 +2690,9 @@ using the Enchant spell-checking library.")
 | 
			
		|||
          (guix build utils)
 | 
			
		||||
          (ice-9 textual-ports)))
 | 
			
		||||
       ((#:phases phases)
 | 
			
		||||
        `(modify-phases ,phases
 | 
			
		||||
        #~(modify-phases #$phases
 | 
			
		||||
            (add-before 'configure 'substitute-source
 | 
			
		||||
             (lambda* (#:key inputs outputs #:allow-other-keys)
 | 
			
		||||
               (let ((out (assoc-ref outputs "out")))
 | 
			
		||||
              (lambda* (#:key inputs #:allow-other-keys)
 | 
			
		||||
                (with-atomic-file-replacement
 | 
			
		||||
                 "src/buildtools/config/linux.pri"
 | 
			
		||||
                 (lambda (in out)
 | 
			
		||||
| 
						 | 
				
			
			@ -2705,9 +2705,11 @@ using the Enchant spell-checking library.")
 | 
			
		|||
                ;; translations and locales in the store.
 | 
			
		||||
                (substitute* "src/core/web_engine_library_info.cpp"
 | 
			
		||||
                  (("QLibraryInfo::location\\(QLibraryInfo::TranslationsPath\\)")
 | 
			
		||||
                    (string-append "QLatin1String(\"" out "/share/qt5/translations\")"))
 | 
			
		||||
                   (string-append "QLatin1String(\"" #$output
 | 
			
		||||
                                  "/share/qt5/translations\")"))
 | 
			
		||||
                  (("QLibraryInfo::location\\(QLibraryInfo::DataPath\\)")
 | 
			
		||||
                    (string-append "QLatin1String(\"" out "/share/qt5\")")))
 | 
			
		||||
                   (string-append "QLatin1String(\"" #$output
 | 
			
		||||
                                  "/share/qt5\")")))
 | 
			
		||||
                ;; Substitute full dynamic library path for nss.
 | 
			
		||||
                (substitute* "src/3rdparty/chromium/crypto/nss_util.cc"
 | 
			
		||||
                  (("libnssckbi.so")
 | 
			
		||||
| 
						 | 
				
			
			@ -2715,7 +2717,7 @@ using the Enchant spell-checking library.")
 | 
			
		|||
                ;; Substitute full dynamic library path for udev.
 | 
			
		||||
                (substitute* "src/3rdparty/chromium/device/udev_linux/udev1_loader.cc"
 | 
			
		||||
                  (("libudev.so.1")
 | 
			
		||||
                    (search-input-file inputs "lib/libudev.so.1"))))))
 | 
			
		||||
                   (search-input-file inputs "lib/libudev.so.1")))))
 | 
			
		||||
            (add-before 'configure 'set-env
 | 
			
		||||
              (lambda _
 | 
			
		||||
                ;; Avoids potential race conditions.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Reference in a new issue