diff options
| -rw-r--r-- | gnu/local.mk | 2 | ||||
| -rw-r--r-- | gnu/packages/fpga.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/gimp.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/linux.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/patches/gimp-fix-metadata-editor.patch | 25 | ||||
| -rw-r--r-- | gnu/packages/patches/gimp-fix-tiff-load.patch | 25 | ||||
| -rw-r--r-- | gnu/packages/qt.scm | 11 |
7 files changed, 58 insertions, 13 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index dc31d028db..abaf016c8c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1439,6 +1439,8 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-id.patch \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ + %D%/packages/patches/gimp-fix-metadata-editor.patch \ + %D%/packages/patches/gimp-fix-tiff-load.patch \ %D%/packages/patches/git-filter-repo-generate-doc.patch \ %D%/packages/patches/gklib-suitesparse.patch \ %D%/packages/patches/glib-appinfo-watch.patch \ diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index e12bd6dce4..95a5e57a06 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -854,7 +854,7 @@ and coverage-analysis points. It outputs single- or multi-threaded (synopsis "Generic pipelined FFT core generator") (description "fftgen produces @acronym{FFT, fast-Fourier transforms} hardware designs in Verilog.") - (home-page "https://zipcpu.com/") + (home-page "https://github.com/ZipCPU/zipcpu/") (license license:lgpl3+)))) (define-public openfpgaloader diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 4a0fa38f0c..2a662752ba 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -349,7 +349,9 @@ buffers.") (version-major+minor version) "/gimp-" version ".tar.bz2")) (sha256 - (base32 "0vl57w9w31cgz6nbkpqfycsnwi5qym87jw31hvz3320wq7p4ba2h")))) + (base32 "0vl57w9w31cgz6nbkpqfycsnwi5qym87jw31hvz3320wq7p4ba2h")) + (patches (search-patches "gimp-fix-tiff-load.patch" + "gimp-fix-metadata-editor.patch")))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 9 MiB of gtk-doc HTML diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8300054355..9f6dcc69f3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3063,7 +3063,7 @@ deviation, and minimum and maximum values. It can show a nice histogram too.") ;; FIXME: For now we cannot reliably run tests on GNU/Hurd: ;; <https://bugs.gnu.org/47791>. #:tests? (and (not (%current-target-system)) - (not (string-suffix? "-gnu" (%current-system)))) + (not (system-hurd?))) #:phases #~(modify-phases %standard-phases diff --git a/gnu/packages/patches/gimp-fix-metadata-editor.patch b/gnu/packages/patches/gimp-fix-metadata-editor.patch new file mode 100644 index 0000000000..848227ff4b --- /dev/null +++ b/gnu/packages/patches/gimp-fix-metadata-editor.patch @@ -0,0 +1,25 @@ +From 51311f913d9f417d121f59b83d560c7b4b853d1c Mon Sep 17 00:00:00 2001 +From: Simon Budig <simon@budig.de> +Date: Sat, 20 May 2023 22:25:40 +0200 +Subject: [PATCH] metadata: shut up a weird warning + +--- + plug-ins/metadata/metadata-editor.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plug-ins/metadata/metadata-editor.c b/plug-ins/metadata/metadata-editor.c +index a3992e40ddc..5bf6ef709f1 100644 +--- a/plug-ins/metadata/metadata-editor.c ++++ b/plug-ins/metadata/metadata-editor.c +@@ -2846,7 +2846,7 @@ metadata_dialog_editor_set_metadata (GExiv2Metadata *metadata, + } + else + { +- if (! g_strv_contains (values, equiv_values[evi])) ++ if (! g_strv_contains ((const gchar * const *) values, equiv_values[evi])) + { + gchar *tmpvalue; + +-- +GitLab + diff --git a/gnu/packages/patches/gimp-fix-tiff-load.patch b/gnu/packages/patches/gimp-fix-tiff-load.patch new file mode 100644 index 0000000000..ba12d0892f --- /dev/null +++ b/gnu/packages/patches/gimp-fix-tiff-load.patch @@ -0,0 +1,25 @@ +From a2458f1528e5733574bb26ff5452b1329116e6db Mon Sep 17 00:00:00 2001 +From: Simon Budig <simon@budig.de> +Date: Sat, 20 May 2023 18:40:41 +0200 +Subject: [PATCH] file-tiff-load: fix mismatching variable type + +--- + plug-ins/file-tiff/file-tiff-load.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/plug-ins/file-tiff/file-tiff-load.c b/plug-ins/file-tiff/file-tiff-load.c +index 0aafbaec5fd..a26e7af2752 100644 +--- a/plug-ins/file-tiff/file-tiff-load.c ++++ b/plug-ins/file-tiff/file-tiff-load.c +@@ -1297,8 +1297,8 @@ load_image (GFile *file, + + /* any resolution info in the file? */ + { +- gfloat xres = 72.0; +- gfloat yres = 72.0; ++ gdouble xres = 72.0; ++ gdouble yres = 72.0; + gushort read_unit; + GimpUnit unit = GIMP_UNIT_PIXEL; /* invalid unit */ + + diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 34265cac0e..6632902b16 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -779,6 +779,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (patches (search-patches "qtbase-moc-ignore-gcc-macro.patch" "qtbase-absolute-runpath.patch" + "qtbase-fix-thread-test.patch" "qtbase-qmake-use-libname.patch" "qtbase-qmlimportscanner-qml-import-path.patch" "qtbase-qmake-fix-includedir.patch")))) @@ -899,16 +900,6 @@ tst_qt_cmake_create.cpp" "dirs.append(\"" #$(this-package-input "shared-mime-info") "/share/mime" "\");\n" all))))) - #$@(if (target-aarch64?) - ;; backport of 2bce75a6b53cccbf9c813581b64eea87f3ab55fc, - ;; which makes flaky tst_qthread less flaky. - #~((add-after 'patch-more-paths 'patch-aarch64-tests - (lambda _ - (invoke - "patch" "-p1" "-i" - #$(local-file - (search-patch "qtbase-fix-thread-test.patch")))))) - #~()) (delete 'do-not-capture-python) ;move after patch-source-shebangs (add-after 'patch-source-shebangs 'do-not-capture-python (lambda _ |