diff options
| author | Andreas Enge <andreas@enge.fr> | 2023-03-20 18:21:47 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2023-03-20 18:49:06 +0100 |
| commit | ccb62d8feb50e2859d7c41429a9e3d9e0fe30bfe (patch) | |
| tree | 4ab573cee33f277828ad553a22579175b1dda22d /gnu/packages/patches | |
| parent | 098bd280f82350073e8280e37d56a14162eed09c (diff) | |
| parent | f80215c7c4ae5ea0c316f4766e6c05ae4218ede3 (diff) | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/patches')
28 files changed, 935 insertions, 688 deletions
diff --git a/gnu/packages/patches/boolector-find-googletest.patch b/gnu/packages/patches/boolector-find-googletest.patch new file mode 100644 index 0000000000..baa7c6cd96 --- /dev/null +++ b/gnu/packages/patches/boolector-find-googletest.patch @@ -0,0 +1,204 @@ +From 91533caf29a2c5b10b4912fd352e7af82c787598 Mon Sep 17 00:00:00 2001 +From: Aina Niemetz <aina.niemetz@gmail.com> +Date: Wed, 16 Jun 2021 16:17:27 -0700 +Subject: [PATCH] Configure google test as external project. + +--- + CMakeLists.txt | 7 ---- + cmake/FindGoogleTest.cmake | 60 +++++++++++++++++++++++++++++++++ + cmake/googletest-download.cmake | 28 --------------- + cmake/googletest.cmake | 41 ---------------------- + test/CMakeLists.txt | 5 ++- + 5 files changed, 64 insertions(+), 77 deletions(-) + create mode 100644 cmake/FindGoogleTest.cmake + delete mode 100644 cmake/googletest-download.cmake + delete mode 100644 cmake/googletest.cmake + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 38056ede6..d30475bcd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -440,13 +440,6 @@ configure_file( + #-----------------------------------------------------------------------------# + # Regression tests + +-# Get and configure google test +-include(cmake/googletest.cmake) +-fetch_googletest( +- ${PROJECT_SOURCE_DIR}/cmake +- ${PROJECT_BINARY_DIR}/googletest +- ) +- + enable_testing() + + #-----------------------------------------------------------------------------# +diff --git a/cmake/FindGoogleTest.cmake b/cmake/FindGoogleTest.cmake +new file mode 100644 +index 000000000..c6eecd179 +--- /dev/null ++++ b/cmake/FindGoogleTest.cmake +@@ -0,0 +1,60 @@ ++# Boolector: Satisfiablity Modulo Theories (SMT) solver. ++# ++# Copyright (C) 2007-2021 by the authors listed in the AUTHORS file. ++# ++# This file is part of Boolector. ++# See COPYING for more information on using this software. ++# ++ ++# Find GTest ++# ++# GTest_FOUND - Found GTest ++# GTest::GTest - GTest library ++ ++find_package(GTest 1.10.0) ++ ++if(NOT GTest_FOUND) ++ include(ExternalProject) ++ ++ set(GTest_VERSION "1.10.0") ++ ++ ExternalProject_Add( ++ GTest-EP ++ PREFIX "${CMAKE_BINARY_DIR}/deps" ++ URL https://github.com/google/googletest/archive/refs/tags/release-${GTest_VERSION}.tar.gz ++ URL_HASH SHA1=9c89be7df9c5e8cb0bc20b3c4b39bf7e82686770 ++ DOWNLOAD_NAME gtest.tar.gz ++ CMAKE_ARGS ++ -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> ++ BUILD_COMMAND ${CMAKE_COMMAND} --build . ++ BUILD_BYPRODUCTS ++ <INSTALL_DIR>/lib/libgtest.a ++ <INSTALL_DIR>/lib/libgtest_main.a ++ LOG_DOWNLOAD ON ++ LOG_UPDATE ON ++ LOG_CONFIGURE ON ++ LOG_BUILD ON ++ LOG_INSTALL ON ++ LOG_OUTPUT_ON_FAILURE TRUE ++ ) ++ ++ set(GTest_INCLUDE_DIR "${CMAKE_BINARY_DIR}/deps/include/") ++ set(GTest_MAIN_LIBRARY "${CMAKE_BINARY_DIR}/deps/lib/libgtest_main.a") ++ set(GTest_LIBRARY "${CMAKE_BINARY_DIR}/deps/lib/libgtest.a") ++ file(MAKE_DIRECTORY "${GTest_INCLUDE_DIR}") ++ ++ add_library(GTest::gtest_main STATIC IMPORTED GLOBAL) ++ set_target_properties(GTest::gtest_main ++ PROPERTIES ++ IMPORTED_LOCATION "${GTest_MAIN_LIBRARY}" ++ INTERFACE_INCLUDE_DIRECTORIES "${GTest_INCLUDE_DIR}" ++ INTERFACE_LINK_LIBRARIES "${GTest_LIBRARY}" ++ ) ++ set(GTest_FOUND TRUE) ++ add_dependencies(GTest::gtest_main GTest-EP) ++ message(STATUS "Building GTest ${GTest_VERSION}: ${GTest_MAIN_LIBRARY}") ++ ++ mark_as_advanced(GTest_FOUND) ++ mark_as_advanced(GTest_INCLUDE_DIR) ++ mark_as_advanced(GTest_LIBRARIES) ++endif() +diff --git a/cmake/googletest-download.cmake b/cmake/googletest-download.cmake +deleted file mode 100644 +index 8dca59539..000000000 +--- a/cmake/googletest-download.cmake ++++ /dev/null +@@ -1,28 +0,0 @@ +-# Boolector: Satisfiablity Modulo Theories (SMT) solver. +-# +-# Copyright (C) 2007-2021 by the authors listed in the AUTHORS file. +-# +-# This file is part of Boolector. +-# See COPYING for more information on using this software. +-# +- +-# code copied from https://crascit.com/2015/07/25/cmake-gtest/ +-cmake_minimum_required(VERSION 3.5 FATAL_ERROR) +- +-project(googletest-download NONE) +- +-include(ExternalProject) +- +-ExternalProject_Add( +- googletest +- SOURCE_DIR "@GOOGLETEST_DOWNLOAD_ROOT@/googletest-src" +- BINARY_DIR "@GOOGLETEST_DOWNLOAD_ROOT@/googletest-build" +- GIT_REPOSITORY +- https://github.com/google/googletest.git +- GIT_TAG +- release-1.10.0 +- CONFIGURE_COMMAND "" +- BUILD_COMMAND "" +- INSTALL_COMMAND "" +- TEST_COMMAND "" +- ) +diff --git a/cmake/googletest.cmake b/cmake/googletest.cmake +deleted file mode 100644 +index af5a5bc36..000000000 +--- a/cmake/googletest.cmake ++++ /dev/null +@@ -1,41 +0,0 @@ +-# Boolector: Satisfiablity Modulo Theories (SMT) solver. +-# +-# Copyright (C) 2007-2021 by the authors listed in the AUTHORS file. +-# +-# This file is part of Boolector. +-# See COPYING for more information on using this software. +-# +- +-# the following code to fetch googletest +-# is inspired by and adapted after https://crascit.com/2015/07/25/cmake-gtest/ +-# download and unpack googletest at configure time +- +-macro(fetch_googletest _download_module_path _download_root) +- set(GOOGLETEST_DOWNLOAD_ROOT ${_download_root}) +- configure_file( +- ${_download_module_path}/googletest-download.cmake +- ${_download_root}/CMakeLists.txt +- @ONLY +- ) +- unset(GOOGLETEST_DOWNLOAD_ROOT) +- +- execute_process( +- COMMAND +- "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . +- WORKING_DIRECTORY +- ${_download_root} +- ) +- execute_process( +- COMMAND +- "${CMAKE_COMMAND}" --build . +- WORKING_DIRECTORY +- ${_download_root} +- ) +- +- # adds the targers: gtest, gtest_main, gmock, gmock_main +- add_subdirectory( +- ${_download_root}/googletest-src +- ${_download_root}/googletest-build +- EXCLUDE_FROM_ALL +- ) +-endmacro() +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 13f87d5e0..f2e14fd81 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -5,6 +5,9 @@ + # This file is part of Boolector. + # See COPYING for more information on using this software. + # ++ ++find_package(GoogleTest REQUIRED) ++ + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/tests) + + set(test_names +@@ -47,7 +50,7 @@ foreach(test ${test_names}) + add_executable (test${test} test_${test}.cpp) + target_include_directories(test${test} PRIVATE ${PROJECT_SOURCE_DIR}/test/new_test) + target_link_libraries(test${test} boolector m) +- target_link_libraries(test${test} gtest_main) ++ target_link_libraries(test${test} GTest::gtest_main) + set_target_properties(test${test} PROPERTIES OUTPUT_NAME test${test}) + add_test(${test} ${CMAKE_BINARY_DIR}/bin/tests/test${test}) + endforeach() diff --git a/gnu/packages/patches/ccextractor-add-missing-header.patch b/gnu/packages/patches/ccextractor-add-missing-header.patch new file mode 100644 index 0000000000..6c6c02be51 --- /dev/null +++ b/gnu/packages/patches/ccextractor-add-missing-header.patch @@ -0,0 +1,33 @@ +Upstream status: https://github.com/CCExtractor/ccextractor/pull/1505 + +From 272e0e1410135c3a5de105cecce400c7b2a9ed5b Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer <maxim.cournoyer@gmail.com> +Date: Fri, 17 Mar 2023 09:49:29 -0400 +Subject: [PATCH] linux/Makefile.am: Add missing generated header. + +This header is generated by the pre-build.sh script. The compilation +fails if it is missing. + +* linux/Makefile.am (ccextractor_SOURCES): Add +../src/lib_ccx/compile_info_real.h. +--- + linux/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/linux/Makefile.am b/linux/Makefile.am +index fddc26a5..f83f1eff 100644 +--- a/linux/Makefile.am ++++ b/linux/Makefile.am +@@ -118,6 +118,7 @@ ccextractor_SOURCES = \ + ../src/lib_ccx/bitstream.h \ + ../src/lib_ccx/ccx_common_option.c \ + ../src/lib_ccx/ccx_common_common.c \ ++ ../src/lib_ccx/compile_info_real.h \ + ../src/lib_ccx/utility.c \ + ../src/lib_ccx/activity.c \ + ../src/lib_ccx/asf_functions.c \ + +base-commit: cb496a711923c984251483776e652ca9c027513c +-- +2.39.1 + diff --git a/gnu/packages/patches/ccextractor-autoconf-tesseract.patch b/gnu/packages/patches/ccextractor-autoconf-tesseract.patch new file mode 100644 index 0000000000..3ce2925acf --- /dev/null +++ b/gnu/packages/patches/ccextractor-autoconf-tesseract.patch @@ -0,0 +1,37 @@ +Upstream status: https://github.com/CCExtractor/ccextractor/pull/1504 + +From f587050c2b5805ff5feb667736381dcc9991a5d3 Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer <maxim.cournoyer@gmail.com> +Date: Fri, 17 Mar 2023 00:57:13 -0400 +Subject: [PATCH] linux/configure.ac: Fix tesseract conditional problem. + +For tesseract-ocr's stock pkg-config, it would produce an error due to +unquoted whitespace: + + $ test ! -z `pkg-config --libs-only-l --silence-errors tesseract` + bash: test: syntax error: `-larchive' unexpected + +* linux/configure.ac: Use a positive test, and double-quote the $() command +substitution. +--- + linux/configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/linux/configure.ac b/linux/configure.ac +index 45fc11f3..118ee7fa 100644 +--- a/linux/configure.ac ++++ b/linux/configure.ac +@@ -149,7 +149,7 @@ AS_IF([ (test x$ocr = xtrue || test x$hardsubx = xtrue) && test ! $HAS_LEPT -gt + AM_CONDITIONAL(HARDSUBX_IS_ENABLED, [ test x$hardsubx = xtrue ]) + AM_CONDITIONAL(OCR_IS_ENABLED, [ test x$ocr = xtrue || test x$hardsubx = xtrue ]) + AM_CONDITIONAL(FFMPEG_IS_ENABLED, [ test x$ffmpeg = xtrue ]) +-AM_CONDITIONAL(TESSERACT_PRESENT, [ test ! -z `pkg-config --libs-only-l --silence-errors tesseract` ]) ++AM_CONDITIONAL(TESSERACT_PRESENT, [ test -n "$(pkg-config --libs-only-l --silence-errors tesseract)" ]) + AM_CONDITIONAL(TESSERACT_PRESENT_RPI, [ test -d "/usr/include/tesseract" && test `ls -A /usr/include/tesseract | wc -l` -gt 0 ]) + AM_CONDITIONAL(SYS_IS_LINUX, [ test `uname -s` = "Linux"]) + AM_CONDITIONAL(SYS_IS_MAC, [ test `uname -s` = "Darwin"]) + +base-commit: cb496a711923c984251483776e652ca9c027513c +-- +2.39.1 + diff --git a/gnu/packages/patches/ccextractor-fix-ocr.patch b/gnu/packages/patches/ccextractor-fix-ocr.patch new file mode 100644 index 0000000000..9a06026724 --- /dev/null +++ b/gnu/packages/patches/ccextractor-fix-ocr.patch @@ -0,0 +1,29 @@ +Extracted from upstream commit 0264e7da2be67182deb031228eb07e6ed4943c81. + +diff --git a/src/lib_ccx/ocr.c b/src/lib_ccx/ocr.c +index 31cc1c5c..73bd4818 100644 +--- a/src/lib_ccx/ocr.c ++++ b/src/lib_ccx/ocr.c +@@ -331,6 +331,11 @@ char *ocr_bitmap(void *arg, png_color *palette, png_byte *alpha, unsigned char * + } + + BOX *crop_points = ignore_alpha_at_edge(copy->alpha, copy->data, w, h, color_pix, &color_pix_out); ++ ++ l_int32 x, y, _w, _h; ++ ++ boxGetGeometry(crop_points, &x, &y, &_w, &_h); ++ + // Converting image to grayscale for OCR to avoid issues with transparency + cpix_gs = pixConvertRGBToGray(cpix, 0.0, 0.0, 0.0); + +@@ -426,8 +431,8 @@ char *ocr_bitmap(void *arg, png_color *palette, png_byte *alpha, unsigned char * + { + for (int j = x1; j <= x2; j++) + { +- if (copy->data[(crop_points->y + i) * w + (crop_points->x + j)] != firstpixel) +- histogram[copy->data[(crop_points->y + i) * w + (crop_points->x + j)]]++; ++ if (copy->data[(y + i) * w + (x + j)] != firstpixel) ++ histogram[copy->data[(y + i) * w + (x + j)]]++; + } + } + /* sorted in increasing order of intensity */ diff --git a/gnu/packages/patches/efibootmgr-remove-extra-decl.patch b/gnu/packages/patches/efibootmgr-remove-extra-decl.patch deleted file mode 100644 index eb68108f88..0000000000 --- a/gnu/packages/patches/efibootmgr-remove-extra-decl.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 99b578501643377e0b1994b2a068b790d189d5ad Mon Sep 17 00:00:00 2001 -From: Peter Jones <pjones@redhat.com> -Date: Wed, 13 Jun 2018 09:41:01 -0400 -Subject: [PATCH] remove extra decl - -Signed-off-by: Peter Jones <pjones@redhat.com> ---- - src/efibootmgr.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/efibootmgr.c b/src/efibootmgr.c -index de38f01..4e1a680 100644 ---- a/src/efibootmgr.c -+++ b/src/efibootmgr.c -@@ -1536,9 +1536,6 @@ parse_opts(int argc, char **argv) - "invalid numeric value %s\n", - optarg); - } -- /* XXX efivar-36 accidentally doesn't have a public -- * header for this */ -- extern int efi_set_verbose(int verbosity, FILE *errlog); - efi_set_verbose(opts.verbose - 2, stderr); - break; - case 'V': --- -2.24.0 - diff --git a/gnu/packages/patches/emacs-helpful-fix-docstring-test.patch b/gnu/packages/patches/emacs-helpful-fix-docstring-test.patch deleted file mode 100644 index de40010fa2..0000000000 --- a/gnu/packages/patches/emacs-helpful-fix-docstring-test.patch +++ /dev/null @@ -1,18 +0,0 @@ -This patch fixing a build failure has been cherry-picked from upstream. -Originally submitted as pull request by Erik Šabič. -See also <https://github.com/Wilfred/helpful/pull/296>. -diff --git a/test/helpful-unit-test.el b/test/helpful-unit-test.el -index a07aa8e..8a95129 100644 ---- a/test/helpful-unit-test.el -+++ b/test/helpful-unit-test.el -@@ -119,7 +119,9 @@ bar"))) - (should - (equal - (helpful--docstring #'test-foo-advised t) -- "Docstring here too."))) -+ (if (version< emacs-version "28") -+ "Docstring here too." -+ "Docstring here too.\n\nThis function has :around advice: `ad-Advice-test-foo-advised'.")))) - - (defun test-foo-no-docstring () - nil) diff --git a/gnu/packages/patches/evdi-fix-build-with-linux-6.2.patch b/gnu/packages/patches/evdi-fix-build-with-linux-6.2.patch new file mode 100644 index 0000000000..0c53cd2ef7 --- /dev/null +++ b/gnu/packages/patches/evdi-fix-build-with-linux-6.2.patch @@ -0,0 +1,72 @@ +Fix the build with Linux 6.2: + +https://github.com/DisplayLink/evdi/issues/402 + +Patch copied from upstream pull request: + +https://github.com/DisplayLink/evdi/pull/401 + +From a90ecd5f0f09e976e4b8784fa16b92804138b1bd Mon Sep 17 00:00:00 2001 +From: listout <listout@protonmail.com> +Date: Wed, 22 Feb 2023 13:09:40 +0530 +Subject: [PATCH] Original patch was suggested by Crashdummyy. + +Since commit 9877d8f6bc374912b08dfe862cddbb78b395a5ef +feild fbdev has been renamed to info in struct drm_fb_helper. + +Fixes: https://github.com/DisplayLink/evdi/issues/402 +Fixes: https://github.com/DisplayLink/evdi/issues/394 +Fixes: https://github.com/DisplayLink/evdi/issues/384 +Signed-off-by: listout <listout@protonmail.com> +--- + module/evdi_fb.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/module/evdi_fb.c b/module/evdi_fb.c +index 6b367fe8..f5de81f1 100644 +--- a/module/evdi_fb.c ++++ b/module/evdi_fb.c +@@ -405,7 +405,11 @@ static int evdifb_create(struct drm_fb_helper *helper, + fb = &efbdev->efb.base; + + efbdev->helper.fb = fb; ++#if KERNEL_VERSION(6, 2, 0) <= LINUX_VERSION_CODE ++ efbdev->helper.info = info; ++#else + efbdev->helper.fbdev = info; ++#endif + + strcpy(info->fix.id, "evdidrmfb"); + +@@ -459,8 +463,13 @@ static void evdi_fbdev_destroy(__always_unused struct drm_device *dev, + { + struct fb_info *info; + ++#if KERNEL_VERSION(6, 2, 0) <= LINUX_VERSION_CODE ++ if (efbdev->helper.info) { ++ info = efbdev->helper.info; ++#else + if (efbdev->helper.fbdev) { + info = efbdev->helper.fbdev; ++#endif + unregister_framebuffer(info); + if (info->cmap.len) + fb_dealloc_cmap(&info->cmap); +@@ -537,10 +546,17 @@ void evdi_fbdev_unplug(struct drm_device *dev) + return; + + efbdev = evdi->fbdev; ++#if KERNEL_VERSION(6, 2, 0) <= LINUX_VERSION_CODE ++ if (efbdev->helper.info) { ++ struct fb_info *info; ++ ++ info = efbdev->helper.info; ++#else + if (efbdev->helper.fbdev) { + struct fb_info *info; + + info = efbdev->helper.fbdev; ++#endif + #if KERNEL_VERSION(5, 6, 0) <= LINUX_VERSION_CODE || defined(EL8) + unregister_framebuffer(info); + #else diff --git a/gnu/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch b/gnu/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch index 79fec8e526..bf9c487ba8 100644 --- a/gnu/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch +++ b/gnu/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch @@ -9,10 +9,10 @@ of host system. --- a/common/flatpak-run.c +++ b/common/flatpak-run.c -@@ -1853,6 +1853,7 @@ static const ExportData default_exports[] = { - {"GST_PTP_HELPER", NULL}, - {"GST_PTP_HELPER_1_0", NULL}, - {"GST_INSTALL_PLUGINS_HELPER", NULL}, +@@ -1900,6 +1900,7 @@ static const ExportData default_exports[] = { + {"XKB_CONFIG_ROOT", NULL}, + {"GIO_EXTRA_MODULES", NULL}, + {"GDK_BACKEND", NULL}, + {"GDK_PIXBUF_MODULE_FILE", NULL}, }; diff --git a/gnu/packages/patches/fluxbox-1.3.7-no-dynamic-cursor.patch b/gnu/packages/patches/fluxbox-1.3.7-no-dynamic-cursor.patch new file mode 100644 index 0000000000..8ac455833c --- /dev/null +++ b/gnu/packages/patches/fluxbox-1.3.7-no-dynamic-cursor.patch @@ -0,0 +1,163 @@ +From: Danny Milosavljevic <dannym@scratchpost.org> +Date: Sun, 19 Feb 2023 15:48:23 +0100 +Subject: Make fluxbox use libxcursor directly + +This patch makes fluxbox use libxcursor directly. This way, big cursors work. +Without it, libx11 would try to dlopen("libXcursor.so.1") and fail. + +--- orig/fluxbox-1.3.7/configure.ac 2015-02-08 11:44:45.333187008 +0100 ++++ fluxbox-1.3.7/configure.ac 2023-02-19 15:42:50.595886984 +0100 +@@ -214,6 +214,18 @@ + CXXFLAGS="$X11_CFLAGS $CXXFLAGS" + LIBS="$X11_LIBS $LIBS" + ++dnl Check for Xcursor ++PKG_CHECK_MODULES([XCURSOR], [ xcursor ], ++ [AC_DEFINE([HAVE_XCURSOR], [1], [Define if xcursor is available]) have_cursor=yes], ++ [have_xcursor=no]) ++AM_CONDITIONAL([XCURSOR], [test "$have_xcursor" = "yes"], AC_MSG_ERROR([Could not find XOpenDisplay in -lXcursor.])) ++AS_IF([test x$have_xcursor = "xno"], [ ++ AC_MSG_ERROR([Fluxbox requires the Xcursor libraries and headers.]) ++]) ++ ++CXXFLAGS="$XCURSOR_CFLAGS $CXXFLAGS" ++LIBS="$XCURSOR_LIBS $LIBS" ++ + dnl Check for xpg4 + AC_CHECK_LIB([xpg4], [setlocale], [LIBS="-lxpg4 $LIBS"]) + AC_CHECK_PROGS([gencat_cmd], [gencat]) +diff -ru orig/fluxbox-1.3.7/src/FbWinFrameTheme.cc fluxbox-1.3.7/src/FbWinFrameTheme.cc +--- orig/fluxbox-1.3.7/src/FbWinFrameTheme.cc 2015-02-08 11:44:45.365187009 +0100 ++++ fluxbox-1.3.7/src/FbWinFrameTheme.cc 2023-02-19 15:28:56.183284901 +0100 +@@ -20,6 +20,7 @@ + // DEALINGS IN THE SOFTWARE. + + #include "FbWinFrameTheme.hh" ++#include "Xutil.hh" + #include "IconbarTheme.hh" + + #include "FbTk/App.hh" +@@ -53,15 +54,15 @@ + + // create cursors + Display *disp = FbTk::App::instance()->display(); +- m_cursor_move = XCreateFontCursor(disp, XC_fleur); +- m_cursor_lower_left_angle = XCreateFontCursor(disp, XC_bottom_left_corner); +- m_cursor_lower_right_angle = XCreateFontCursor(disp, XC_bottom_right_corner); +- m_cursor_upper_right_angle = XCreateFontCursor(disp, XC_top_right_corner); +- m_cursor_upper_left_angle = XCreateFontCursor(disp, XC_top_left_corner); +- m_cursor_left_side = XCreateFontCursor(disp, XC_left_side); +- m_cursor_top_side = XCreateFontCursor(disp, XC_top_side); +- m_cursor_right_side = XCreateFontCursor(disp, XC_right_side); +- m_cursor_bottom_side = XCreateFontCursor(disp, XC_bottom_side); ++ m_cursor_move = Xutil::hidpiCreateFontCursor(disp, XC_fleur); ++ m_cursor_lower_left_angle = Xutil::hidpiCreateFontCursor(disp, XC_bottom_left_corner); ++ m_cursor_lower_right_angle = Xutil::hidpiCreateFontCursor(disp, XC_bottom_right_corner); ++ m_cursor_upper_right_angle = Xutil::hidpiCreateFontCursor(disp, XC_top_right_corner); ++ m_cursor_upper_left_angle = Xutil::hidpiCreateFontCursor(disp, XC_top_left_corner); ++ m_cursor_left_side = Xutil::hidpiCreateFontCursor(disp, XC_left_side); ++ m_cursor_top_side = Xutil::hidpiCreateFontCursor(disp, XC_top_side); ++ m_cursor_right_side = Xutil::hidpiCreateFontCursor(disp, XC_right_side); ++ m_cursor_bottom_side = Xutil::hidpiCreateFontCursor(disp, XC_bottom_side); + + FbTk::ThemeManager::instance().loadTheme(*this); + reconfigTheme(); +diff -ru orig/fluxbox-1.3.7/src/Screen.cc fluxbox-1.3.7/src/Screen.cc +--- orig/fluxbox-1.3.7/src/Screen.cc 2015-02-08 11:44:45.369187009 +0100 ++++ fluxbox-1.3.7/src/Screen.cc 2023-02-19 15:28:23.783092203 +0100 +@@ -53,6 +53,7 @@ + #include "SystemTray.hh" + #endif + #include "Debug.hh" ++#include "Xutil.hh" + + #include "FbTk/I18n.hh" + #include "FbTk/FbWindow.hh" +@@ -306,7 +307,7 @@ + if (keys) + keys->registerWindow(rootWindow().window(), *this, + Keys::GLOBAL|Keys::ON_DESKTOP); +- rootWindow().setCursor(XCreateFontCursor(disp, XC_left_ptr)); ++ rootWindow().setCursor(Xutil::hidpiCreateFontCursor(disp, XC_left_ptr)); + + // load this screens resources + fluxbox->load_rc(*this); +diff -ru orig/fluxbox-1.3.7/src/Xutil.cc fluxbox-1.3.7/src/Xutil.cc +--- orig/fluxbox-1.3.7/src/Xutil.cc 2015-02-08 11:44:45.377187009 +0100 ++++ fluxbox-1.3.7/src/Xutil.cc 2023-02-19 15:47:29.009541689 +0100 +@@ -28,6 +28,10 @@ + + #include <X11/Xutil.h> + #include <X11/Xatom.h> ++#include <X11/Xlibint.h> ++#undef min ++#undef max ++#include <X11/Xcursor/Xcursor.h> + #include <iostream> + + #ifdef HAVE_CSTRING +@@ -133,5 +137,19 @@ + return class_name; + } + ++static XColor _Xconst foreground = { 0, 0, 0, 0 }; /* black */ ++static XColor _Xconst background = { 0, 65535, 65535, 65535 }; /* white */ ++Cursor hidpiCreateFontCursor(Display* dpy, unsigned int shape) { ++ if (dpy->cursor_font == None) { ++ dpy->cursor_font = XLoadFont(dpy, "cursor"); ++ if (dpy->cursor_font == None) return None; ++ } ++ ++ Cursor result = XcursorTryShapeCursor(dpy, dpy->cursor_font, dpy->cursor_font, (int) shape, (int) shape + 1, &foreground, &background); ++ if (!result) ++ result = XCreateFontCursor(dpy, (int) shape); ++ return result; ++} ++ + } // end namespace Xutil + +diff -ru orig/fluxbox-1.3.7/src/Xutil.hh fluxbox-1.3.7/src/Xutil.hh +--- orig/fluxbox-1.3.7/src/Xutil.hh 2015-02-08 11:44:45.377187009 +0100 ++++ fluxbox-1.3.7/src/Xutil.hh 2023-02-19 15:26:37.495619659 +0100 +@@ -32,7 +32,7 @@ + + FbTk::FbString getWMClassName(Window win); + FbTk::FbString getWMClassClass(Window win); +- ++Cursor hidpiCreateFontCursor(Display* dpy, unsigned int shape); + + } // end namespace Xutil + +diff -ru orig/fluxbox-1.3.7/util/fbrun/FbRun.cc fluxbox-1.3.7/util/fbrun/FbRun.cc +--- orig/fluxbox-1.3.7/util/fbrun/FbRun.cc 2015-02-08 11:44:45.377187009 +0100 ++++ fluxbox-1.3.7/util/fbrun/FbRun.cc 2023-02-19 15:28:18.532468099 +0100 +@@ -26,6 +26,7 @@ + #include "FbTk/Color.hh" + #include "FbTk/KeyUtil.hh" + #include "FbTk/FileUtil.hh" ++#include "Xutil.hh" + + #ifdef HAVE_XPM + #include <X11/xpm.h> +@@ -67,7 +68,7 @@ + m_current_history_item(0), + m_last_completion_prefix(""), + m_current_apps_item(0), +- m_cursor(XCreateFontCursor(FbTk::App::instance()->display(), XC_xterm)) { ++ m_cursor(Xutil::hidpiCreateFontCursor(FbTk::App::instance()->display(), XC_xterm)) { + + setGC(m_gc.gc()); + setCursor(m_cursor); +diff -ru orig/fluxbox-1.3.7/util/fbrun/Makemodule.am fluxbox-1.3.7/util/fbrun/Makemodule.am +--- orig/fluxbox-1.3.7/util/fbrun/Makemodule.am 2015-02-08 11:44:45.377187009 +0100 ++++ fluxbox-1.3.7/util/fbrun/Makemodule.am 2023-02-19 15:50:33.029069099 +0100 +@@ -8,7 +8,8 @@ + util/fbrun/FbRun.hh \ + util/fbrun/FbRun.cc \ + util/fbrun/main.cc \ +- util/fbrun/fbrun.xpm ++ util/fbrun/fbrun.xpm \ ++ src/Xutil.cc + + fbrun_LDADD = libFbTk.a \ + $(FRIBIDI_LIBS) \ diff --git a/gnu/packages/patches/ipxe-reproducible-geniso.patch b/gnu/packages/patches/ipxe-reproducible-geniso.patch deleted file mode 100644 index ff6aa1da94..0000000000 --- a/gnu/packages/patches/ipxe-reproducible-geniso.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 052d24d8217c51c572c2f6cbb4a687be2e8ba52d Mon Sep 17 00:00:00 2001 -From: Brice Waegeneire <brice@waegenei.re> -Date: Fri, 5 Jun 2020 14:38:43 +0200 -Subject: [PATCH] [geniso] Make it reproducible - -Some timestamps get embedded in the generated ISO, making it -unreproducible so we overwrite those timestamps to be at the UNIX epoch. ---- - src/util/geniso | 24 +++++++++++++++++++++--- - 1 file changed, 21 insertions(+), 3 deletions(-) - -diff --git a/src/util/geniso b/src/util/geniso -index ff090d4a..e032ffb0 100755 ---- a/src/util/geniso -+++ b/src/util/geniso -@@ -11,6 +11,13 @@ function help() { - echo " -o FILE save iso image to file" - } - -+function reset_timestamp() { -+ for f in "$1"/*; do -+ touch -t 197001010100 "$f" -+ done -+ touch -t 197001010100 "$1" -+} -+ - LEGACY=0 - FIRST="" - -@@ -37,8 +44,9 @@ if [ -z "${OUT}" ]; then - exit 1 - fi - --# There should either be mkisofs or the compatible genisoimage program --for command in genisoimage mkisofs; do -+# There should either be mkisofs, xorriso or the compatible genisoimage -+# program -+for command in xorriso genisoimage mkisofs; do - if ${command} --version >/dev/null 2>/dev/null; then - mkisofs=(${command}) - break -@@ -46,8 +54,10 @@ for command in genisoimage mkisofs; do - done - - if [ -z "${mkisofs}" ]; then -- echo "${0}: mkisofs or genisoimage not found, please install or set PATH" >&2 -+ echo "${0}: mkisofs, xorriso or genisoimage not found, please install or set PATH" >&2 - exit 1 -+elif [ "$mkisofs" = "xorriso" ]; then -+ mkisofs+=(-as mkisofs) - fi - - dir=$(mktemp -d bin/iso.dir.XXXXXX) -@@ -115,6 +125,8 @@ case "${LEGACY}" in - exit 1 - fi - -+ reset_timestamp "$dir" -+ - # generate the iso image - "${mkisofs[@]}" -b boot.img -output ${OUT} ${dir} - ;; -@@ -127,6 +139,12 @@ case "${LEGACY}" in - cp ${LDLINUX_C32} ${dir} - fi - -+ reset_timestamp "$dir" -+ -+ if [ "${mkisofs[0]}" = "xorriso" ]; then -+ mkisofs+=(-isohybrid-mbr "$SYSLINUX_MBR_DISK_PATH") -+ fi -+ - # generate the iso image - "${mkisofs[@]}" -b isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table -output ${OUT} ${dir} - --- -2.26.2 diff --git a/gnu/packages/patches/m17n-lib-1.8.0-use-pkg-config-for-freetype.patch b/gnu/packages/patches/m17n-lib-1.8.0-use-pkg-config-for-freetype.patch new file mode 100644 index 0000000000..38c311bee5 --- /dev/null +++ b/gnu/packages/patches/m17n-lib-1.8.0-use-pkg-config-for-freetype.patch @@ -0,0 +1,125 @@ +backport from upstream. + +From b468fc95150b7ca0e766e7c385a60879e65322d4 Mon Sep 17 00:00:00 2001 +From: "K. Handa" <handa@gnu.org> +Date: Tue, 23 Oct 2018 00:05:46 +0900 +Subject: Use pkg-config for freetype, use %p to print a pointer + +--- + ChangeLog | 5 +++++ + configure.ac | 48 +++++++++++++++++++----------------------------- + src/ChangeLog | 5 +++++ + src/chartab.c | 4 ++-- + 4 files changed, 31 insertions(+), 31 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index b069d89..9dfc0b0 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,8 @@ ++2018-10-22 K. Handa <handa@gnu.org> ++ ++ * configure.ac: Do not use the program freetype-config, use ++ PKG_CHECK_MODULES for checking freetype2. ++ + 2018-02-08 K. Handa <handa@gnu.org> + + Version 1.8.0 released. +diff --git a/configure.ac b/configure.ac +index 7f8b08e..3516bad 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -204,36 +204,26 @@ fi + AC_SUBST(OTF_LD_FLAGS) + + dnl Check for Freetype2 usability. +-AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes) +-if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then +- FREETYPE_INC=`freetype-config --cflags` +- save_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $FREETYPE_INC" +- AC_CHECK_HEADER(ft2build.h, HAVE_FREETYPE=yes, +- HAVE_FREETYPE=no CPPFLAGS="$save_CPPFLAGS") +- if test "x$HAVE_FREETYPE" = "xyes" ; then +- save_LIBS="$LIBS" +- LIBS="$LIBS `freetype-config --libs`" +- AC_CHECK_LIB(freetype, FT_Init_FreeType, HAVE_FREETYPE=yes, +- HAVE_FREETYPE=no) +- LIBS="$save_LIBS" +- if test "x$HAVE_FREETYPE" = "xyes"; then +- FREETYPE_LD_FLAGS=`freetype-config --libs` +- AC_DEFINE(HAVE_FREETYPE, 1, +- [Define to 1 if you have FreeType library and header file.]) +- M17N_EXT_LIBS="$M17N_EXT_LIBS freetype" +- AC_CHECK_HEADER(freetype/ftbdf.h, HAVE_FTBDF_H=yes, HAVE_FTBDF_H=no, +- [#include <ft2build.h> ++PKG_CHECK_MODULES([FREETYPE], [freetype2], [HAVE_FREETYPE=yes], ++ [HAVE_FREETYPE=no]) ++AS_IF([test "x$HAVE_FREETYPE" = "xyes"], ++ [CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"; ++ FREETYPE_LD_FLAGS=FREETYPE_LIBS; ++ AC_DEFINE([HAVE_FREETYPE], [1], ++ [Define to 1 if you have FreeType library and header file.]) ++ M17N_EXT_LIBS="$M17N_EXT_LIBS freetype"; ++ AC_CHECK_HEADER([freetype/ftbdf.h], [HAVE_FTBDF_H=yes], [HAVE_FTBDF_H=no], ++ [#include <ft2build.h> + #include FT_FREETYPE_H]) +- if test "x$HAVE_FTBDF_H" = "xyes"; then +- AC_DEFINE(HAVE_FTBDF_H, 1, +- [Define to 1 if you have freetype/ftbdf.h.]) +- fi +- CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_FREETYPE" +- fi +- fi +-fi +-AC_SUBST(FREETYPE_LD_FLAGS) ++ AS_IF([test "x$HAVE_FTBDF_H" = "xyes"], ++ [AC_DEFINE([HAVE_FTBDF_H], [1], ++ [Define to 1 if you have freetype/ftbdf.h.])], ++ []) ++ CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_FREETYPE" ++ ], ++ [] ++ ) ++AC_SUBST([FREETYPE_LD_FLAGS]) + + dnl Check for Xft2 usability. + save_CPPFLAGS="$CPPFLAGS" +diff --git a/src/ChangeLog b/src/ChangeLog +index ee28ea6..8cb91c1 100644 +--- a/src/ChangeLog ++++ b/src/ChangeLog +@@ -1,3 +1,8 @@ ++2018-10-22 K. Handa <handa@gnu.org> ++ ++ * chartab.c (dump_sub_chartab): Use %p directive to print a ++ pointer value. ++ + 2018-02-08 K. Handa <handa@gnu.org> + + Version 1.8.0 released. +diff --git a/src/chartab.c b/src/chartab.c +index d58aa65..8aeb6d7 100644 +--- a/src/chartab.c ++++ b/src/chartab.c +@@ -558,7 +558,7 @@ dump_sub_chartab (MSubCharTable *table, void *default_value, + fprintf (mdebug__output, "(default nil)"); + } + else +- fprintf (mdebug__output, "(default #x%X)", (unsigned) table->default_value); ++ fprintf (mdebug__output, "(default #x%p)", table->default_value); + + default_value = table->default_value; + if (table->contents.tables) +@@ -589,7 +589,7 @@ dump_sub_chartab (MSubCharTable *table, void *default_value, + fprintf (mdebug__output, "nil)"); + } + else +- fprintf (mdebug__output, " #xx%X)", (unsigned) default_value); ++ fprintf (mdebug__output, " #x%p)", default_value); + } + } + fprintf (mdebug__output, ")"); +-- +cgit v1.1 + diff --git a/gnu/packages/patches/openbios-aarch64-riscv64-support.patch b/gnu/packages/patches/openbios-aarch64-riscv64-support.patch new file mode 100644 index 0000000000..25cf2499b8 --- /dev/null +++ b/gnu/packages/patches/openbios-aarch64-riscv64-support.patch @@ -0,0 +1,17 @@ +This was submitted upstream +https://github.com/openbios/openbios/pull/12 + +diff --git a/config/scripts/switch-arch b/config/scripts/switch-arch +index b5acc6c..a96ef4b 100755 +--- a/config/scripts/switch-arch ++++ b/config/scripts/switch-arch +@@ -38,7 +38,8 @@ longbits() + if test "$cpu" = "sparc64" -o "$cpu" = "ia64" \ + -o "$cpu" = "amd64" -o "$cpu" = "x86_64" \ + -o "$cpu" = "powerpc64" -o "$cpu" = "ppc64" \ +- -o "$cpu" = "ppc64le" -o "$cpu" = "alpha" ; then ++ -o "$cpu" = "ppc64le" -o "$cpu" = "alpha" \ ++ -o "$cpu" = "aarch64" -o "$cpu" = "riscv64" ; then + echo 64 + else + echo 32 diff --git a/gnu/packages/patches/openjdk-10-hotspot-pointer-comparison.patch b/gnu/packages/patches/openjdk-10-hotspot-pointer-comparison.patch deleted file mode 100644 index 2c64d06fbe..0000000000 --- a/gnu/packages/patches/openjdk-10-hotspot-pointer-comparison.patch +++ /dev/null @@ -1,15 +0,0 @@ -Avoid ordered comparison of pointer with integer to prevent compile error -with GCC 11. - -diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp ---- a/src/hotspot/os/linux/os_linux.cpp -+++ b/src/hotspot/os/linux/os_linux.cpp -@@ -2155,7 +2155,7 @@ void os::Linux::print_container_info(outputStream* st) { - } - - p = OSContainer::cpu_cpuset_memory_nodes(); -- if (p < 0) -+ if (p == NULL) - st->print("cpu_memory_nodes() failed\n"); - else { - st->print("cpu_memory_nodes: %s\n", p); diff --git a/gnu/packages/patches/openjdk-10-hotspot-stack-size.patch b/gnu/packages/patches/openjdk-10-hotspot-stack-size.patch deleted file mode 100644 index 2c246dbdbc..0000000000 --- a/gnu/packages/patches/openjdk-10-hotspot-stack-size.patch +++ /dev/null @@ -1,28 +0,0 @@ -Dynamically allocate the stack since SIGSTKSZ is not constant since glibc 2.34. - -Backported from: - - https://github.com/openjdk/jdk17u/commit/bb7c412e259893091210267252faf3c0a1be0969 - -diff --git a/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c b/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c ---- a/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c -+++ b/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c -@@ -67,8 +67,17 @@ static void handler(int sig, siginfo_t *si, void *unused) { - longjmp(context, 1); - } - -+static char* altstack = NULL; -+ - void set_signal_handler() { -- static char altstack[SIGSTKSZ]; -+ if (altstack == NULL) { -+ // Dynamically allocated in case SIGSTKSZ is not constant -+ altstack = malloc(SIGSTKSZ); -+ if (altstack == NULL) { -+ fprintf(stderr, "Test ERROR. Unable to malloc altstack space\n"); -+ exit(7); -+ } -+ } - - stack_t ss = { - .ss_size = SIGSTKSZ, diff --git a/gnu/packages/patches/openjdk-9-hotspot-pointer-comparison.patch b/gnu/packages/patches/openjdk-9-hotspot-pointer-comparison.patch deleted file mode 100644 index b90d736211..0000000000 --- a/gnu/packages/patches/openjdk-9-hotspot-pointer-comparison.patch +++ /dev/null @@ -1,27 +0,0 @@ -Avoid ordered comparison of pointer with integer to prevent compile error -with GCC 11. - -diff --git a/hotspot/src/share/vm/memory/virtualspace.cpp b/hotspot/src/share/vm/memory/virtualspace.cpp ---- a/hotspot/src/share/vm/memory/virtualspace.cpp -+++ b/hotspot/src/share/vm/memory/virtualspace.cpp -@@ -581,7 +581,7 @@ ReservedHeapSpace::ReservedHeapSpace(size_t size, size_t alignment, bool large) - assert(markOopDesc::encode_pointer_as_mark(&_base[size])->decode_pointer() == &_base[size], - "area must be distinguishable from marks for mark-sweep"); - -- if (base() > 0) { -+ if (base() != NULL) { - MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap); - } - } -diff --git a/hotspot/src/share/vm/opto/lcm.cpp b/hotspot/src/share/vm/opto/lcm.cpp ---- a/hotspot/src/share/vm/opto/lcm.cpp -+++ b/hotspot/src/share/vm/opto/lcm.cpp -@@ -39,7 +39,7 @@ - // Check whether val is not-null-decoded compressed oop, - // i.e. will grab into the base of the heap if it represents NULL. - static bool accesses_heap_base_zone(Node *val) { -- if (Universe::narrow_oop_base() > 0) { // Implies UseCompressedOops. -+ if (Universe::narrow_oop_base() != NULL) { // Implies UseCompressedOops. - if (val && val->is_Mach()) { - if (val->as_Mach()->ideal_Opcode() == Op_DecodeN) { - // This assumes all Decodes with TypePtr::NotNull are matched to nodes that diff --git a/gnu/packages/patches/openjdk-9-hotspot-stack-size.patch b/gnu/packages/patches/openjdk-9-hotspot-stack-size.patch deleted file mode 100644 index 27af0ab6c2..0000000000 --- a/gnu/packages/patches/openjdk-9-hotspot-stack-size.patch +++ /dev/null @@ -1,28 +0,0 @@ -Dynamically allocate the stack since SIGSTKSZ is not constant since glibc 2.34. - -Backported from: - - https://github.com/openjdk/jdk17u/commit/bb7c412e259893091210267252faf3c0a1be0969 - -diff --git a/hotspot/test/runtime/StackGuardPages/exeinvoke.c b/hotspot/test/runtime/StackGuardPages/exeinvoke.c ---- a/hotspot/test/runtime/StackGuardPages/exeinvoke.c -+++ b/hotspot/test/runtime/StackGuardPages/exeinvoke.c -@@ -67,8 +67,17 @@ static void handler(int sig, siginfo_t *si, void *unused) { - longjmp(context, 1); - } - -+static char* altstack = NULL; -+ - void set_signal_handler() { -- static char altstack[SIGSTKSZ]; -+ if (altstack == NULL) { -+ // Dynamically allocated in case SIGSTKSZ is not constant -+ altstack = malloc(SIGSTKSZ); -+ if (altstack == NULL) { -+ fprintf(stderr, "Test ERROR. Unable to malloc altstack space\n"); -+ exit(7); -+ } -+ } - - stack_t ss = { - .ss_size = SIGSTKSZ, diff --git a/gnu/packages/patches/python-hiredis-fix-header.patch b/gnu/packages/patches/python-hiredis-fix-header.patch new file mode 100644 index 0000000000..168b76920d --- /dev/null +++ b/gnu/packages/patches/python-hiredis-fix-header.patch @@ -0,0 +1,49 @@ +Upstream status: https://github.com/redis/hiredis-py/pull/159 + +From c2a20695aae53de7b5160e29675344df0b805fa6 Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer <maxim.cournoyer@gmail.com> +Date: Sat, 18 Mar 2023 15:18:08 -0400 +Subject: [PATCH] pack: Replace sdsalloc.h with alloc.h + +Fixes #158. + +* src/pack.c: Replace sdsalloc.h with alloc.h. +(pack_command): Replace s_malloc with hi_malloc. +--- + src/pack.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/pack.c b/src/pack.c +index 443e9d3..23e4004 100644 +--- a/src/pack.c ++++ b/src/pack.c +@@ -16,7 +16,7 @@ extern sds sdscpylen(sds s, const char *t, size_t len); + extern sds sdsnewlen(const void *init, size_t initlen); + #endif + +-#include <hiredis/sdsalloc.h> ++#include <hiredis/alloc.h> + + PyObject * + pack_command(PyObject *cmd) +@@ -32,7 +32,7 @@ pack_command(PyObject *cmd) + } + + Py_ssize_t tokens_number = PyTuple_Size(cmd); +- sds *tokens = s_malloc(sizeof(sds) * tokens_number); ++ sds *tokens = hi_malloc(sizeof(sds) * tokens_number); + if (tokens == NULL) + { + return PyErr_NoMemory(); +@@ -118,4 +118,4 @@ cleanup: + sdsfreesplitres(tokens, tokens_number); + hi_free(lengths); + return result; +-} +\ No newline at end of file ++} + +base-commit: 8adb1b3cb38b82cdc73fa2d72879712da1f74e70 +-- +2.39.1 + diff --git a/gnu/packages/patches/python-hiredis-use-system-hiredis.patch b/gnu/packages/patches/python-hiredis-use-system-hiredis.patch new file mode 100644 index 0000000000..622f049da7 --- /dev/null +++ b/gnu/packages/patches/python-hiredis-use-system-hiredis.patch @@ -0,0 +1,82 @@ +Upstream status: https://github.com/redis/hiredis-py/pull/161 + +From 7b3c8a364f6167f4b1828dd9c48ada3d8b0786f6 Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer <maxim.cournoyer@gmail.com> +Date: Sat, 18 Mar 2023 21:32:21 -0400 +Subject: [PATCH] setup.py: Fallback to use the system hiredis library. + +Fixes #158 fully, including using a system-prodived hiredis. + +When the hiredis git submodule hasn't been initialized, print a +message about it, and attempt to link against the a system-provided +hiredis library instead. + +* setup.py (is_hiredis_bundled): New procedure. +(get_hiredis_bundled_sources): Likewise. Print a message when +bundled_hiredis_sources is empty. +(get_sources): Adjust to use the above procedure. +(get_linker_args): Add -lhiredis when the bundled hiredis is not used. +--- + setup.py | 30 +++++++++++++++++++++++++++--- + 1 file changed, 27 insertions(+), 3 deletions(-) + +diff --git a/setup.py b/setup.py +index 905df59..a77aca3 100644 +--- a/setup.py ++++ b/setup.py +@@ -7,6 +7,7 @@ except ImportError: + import importlib + import glob + import io ++import os + import sys + + +@@ -17,16 +18,39 @@ def version(): + return module.__version__ + + ++def is_hiredis_bundled(): ++ hiredis_submodule = 'vendor/hiredis' ++ if (os.path.exists(hiredis_submodule) ++ and not os.path.isfile(hiredis_submodule)): ++ return not os.listdir() ++ return False ++ ++ ++def get_hiredis_bundled_sources(): ++ hiredis_sources = ("alloc", "async", "hiredis", "net", "read", ++ "sds", "sockcompat") ++ if is_hiredis_bundled(): ++ return ["vendor/hiredis/%s.c" % src for src in hiredis_sources] ++ return [] ++ ++ ++if not is_hiredis_bundled(): ++ print('the bundled hiredis sources were not found;' ++ ' system hiredis will be used\n' ++ 'to use the bundled hiredis sources instead,' ++ ' run "git submodule update --init"') ++ ++ + def get_sources(): +- hiredis_sources = ("alloc", "async", "hiredis", "net", "read", "sds", "sockcompat") +- return sorted(glob.glob("src/*.c") + ["vendor/hiredis/%s.c" % src for src in hiredis_sources]) ++ return sorted(glob.glob("src/*.c") + get_hiredis_bundled_sources()) + + + def get_linker_args(): + if 'win32' in sys.platform or 'darwin' in sys.platform: + return [] + else: +- return ["-Wl,-Bsymbolic", ] ++ return ["-Wl,-Bsymbolic", ] + \ ++ ['-lhiredis'] if not is_hiredis_bundled() else [] + + + def get_compiler_args(): + +base-commit: 8adb1b3cb38b82cdc73fa2d72879712da1f74e70 +-- +2.39.1 + diff --git a/gnu/packages/patches/python-pillow-CVE-2022-45199.patch b/gnu/packages/patches/python-pillow-CVE-2022-45199.patch new file mode 100644 index 0000000000..3b01d3a8f4 --- /dev/null +++ b/gnu/packages/patches/python-pillow-CVE-2022-45199.patch @@ -0,0 +1,36 @@ +From 13f2c5ae14901c89c38f898496102afd9daeaf6d Mon Sep 17 00:00:00 2001 +From: Eric Soroos <eric-github@soroos.net> +Date: Fri, 28 Oct 2022 14:11:25 +0200 +Subject: [PATCH 1/5] Prevent DOS with large SAMPLESPERPIXEL in Tiff IFD + +A large value in the SAMPLESPERPIXEL tag could lead to a memory and +runtime DOS in TiffImagePlugin.py when setting up the context for +image decoding. + +diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py +index 04a63bd2b44..46166fc6335 100644 +--- a/src/PIL/TiffImagePlugin.py ++++ b/src/PIL/TiffImagePlugin.py +@@ -257,6 +257,8 @@ + (MM, 8, (1,), 1, (8, 8, 8), ()): ("LAB", "LAB"), + } + ++MAX_SAMPLESPERPIXEL = max(len(key_tp[4]) for key_tp in OPEN_INFO.keys()) ++ + PREFIXES = [ + b"MM\x00\x2A", # Valid TIFF header with big-endian byte order + b"II\x2A\x00", # Valid TIFF header with little-endian byte order +@@ -1396,6 +1398,12 @@ def _setup(self): + SAMPLESPERPIXEL, + 3 if self._compression == "tiff_jpeg" and photo in (2, 6) else 1, + ) ++ ++ if samples_per_pixel > MAX_SAMPLESPERPIXEL: ++ # DOS check, samples_per_pixel can be a Long, and we extend the tuple below ++ logger.error("More samples per pixel than can be decoded: %s", samples_per_pixel) ++ raise SyntaxError("Invalid value for samples per pixel") ++ + if samples_per_pixel < bps_actual_count: + # If a file has more values in bps_tuple than expected, + # remove the excess. + diff --git a/gnu/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch b/gnu/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch deleted file mode 100644 index ffa75918b8..0000000000 --- a/gnu/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4c02c080475c9d08dbed98dd64ecca337aa359ae Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@member.fsf.org> -Date: Sat, 20 Feb 2021 20:37:39 +0800 -Subject: [PATCH] Allow set libretro_directory via environment variable - ---- - retroarch.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/retroarch.c b/retroarch.c -index 8a0461c816..cbf11d8b6a 100644 ---- a/retroarch.c -+++ b/retroarch.c -@@ -17603,7 +17603,18 @@ static bool retroarch_parse_input_and_config( - p_rarch->configuration_settings->bools.log_to_file, - p_rarch->configuration_settings->bools.log_to_file_timestamp, - p_rarch->configuration_settings->paths.log_dir); -- -+ -+ /* Override settings via environment variables */ -+ { -+ settings_t *settings = p_rarch->configuration_settings; -+ char *value = getenv("LIBRETRO_DIRECTORY"); -+ if (value != NULL) -+ { -+ retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_LIBRETRO_DIRECTORY, NULL); -+ configuration_set_string(settings, settings->paths.directory_libretro, value); -+ } -+ } -+ - /* Second pass: All other arguments override the config file */ - optind = 1; - --- -2.33.0 - diff --git a/gnu/packages/patches/rng-tools-revert-build-randstat.patch b/gnu/packages/patches/rng-tools-revert-build-randstat.patch new file mode 100644 index 0000000000..6402884af0 --- /dev/null +++ b/gnu/packages/patches/rng-tools-revert-build-randstat.patch @@ -0,0 +1,49 @@ +Source: https://src.fedoraproject.org/rpms/rng-tools/blob/aaca5d6d9c9a50e0d0eed74c67b09863ac37149a/f/2-rt-revert-build-randstat.patch + +From de2ee0d8b7e8ad2915165ef941a6ec37442a2fdc Mon Sep 17 00:00:00 2001 +From: Vladis Dronov <vdronov@redhat.com> +Date: Tue, 6 Jul 2021 14:36:46 +0200 +Subject: [PATCH] Revert "Build randstat binary" + +We do not want new and mostly useless randstat binary. +This reverts commit 2ce93190cb0111fcab2f622a539689d70960643a. + +Signed-off-by: Vladis Dronov <vdronov@redhat.com> +--- + .gitignore | 3 +-- + contrib/Makefile.am | 5 +++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git .gitignore .gitignore +index 943fa2b..5dc334d 100644 +--- .gitignore ++++ .gitignore +@@ -1,6 +1,6 @@ + *.a + *.o +-.deps/ ++/.deps/ + /aclocal.m4 + /ar-lib + /autom4te.cache/ +@@ -10,7 +10,6 @@ + /config.status + /config.sub + /configure +-/contrib/randstat + /depcomp + /install-sh + /missing +diff --git contrib/Makefile.am contrib/Makefile.am +index a81fb0e..18c4fbc 100644 +--- contrib/Makefile.am ++++ contrib/Makefile.am +@@ -1,2 +1,3 @@ +-bin_PROGRAMS = randstat +-randstat_SOURCES = randstat.c ++ ++EXTRA_DIST = randstat.c ++ +-- +2.26.3 + diff --git a/gnu/packages/patches/rnp-add-version.cmake.patch b/gnu/packages/patches/rnp-add-version.cmake.patch deleted file mode 100644 index 67e3b75457..0000000000 --- a/gnu/packages/patches/rnp-add-version.cmake.patch +++ /dev/null @@ -1,169 +0,0 @@ -From b4326f4649ceb146d5cc74f8579b68d8dc8f51e6 Mon Sep 17 00:00:00 2001 -From: Justus Winter <teythoon@avior.uberspace.de> -Date: Mon, 27 Jul 2020 14:00:25 +0200 -Subject: [PATCH 3/3] Add external version.cmake. - -This file is maintained in an external repository. It is only -included in released versions. For building snapshots of RNP, a fixed -snapshot of version.cmake is downloaded on demand. To avoid this, -this patch explicitly provides the file. ---- - cmake/version.cmake | 146 ++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 146 insertions(+) - create mode 100644 cmake/version.cmake - -diff --git a/cmake/version.cmake b/cmake/version.cmake -new file mode 100644 -index 00000000..514027aa ---- /dev/null -+++ b/cmake/version.cmake -@@ -0,0 +1,146 @@ -+# Copyright (c) 2018 Ribose Inc. -+# All rights reserved. -+# -+# Redistribution and use in source and binary forms, with or without -+# modification, are permitted provided that the following conditions -+# are met: -+# 1. Redistributions of source code must retain the above copyright -+# notice, this list of conditions and the following disclaimer. -+# 2. Redistributions in binary form must reproduce the above copyright -+# notice, this list of conditions and the following disclaimer in the -+# documentation and/or other materials provided with the distribution. -+# -+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS -+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+# POSSIBILITY OF SUCH DAMAGE. -+ -+# desired length of commit hash -+set(GIT_REV_LEN 7) -+ -+# call git, store output in var (can fail) -+macro(_git var) -+ execute_process( -+ COMMAND "${GIT_EXECUTABLE}" ${ARGN} -+ WORKING_DIRECTORY "${source_dir}" -+ RESULT_VARIABLE _git_ec -+ OUTPUT_VARIABLE ${var} -+ OUTPUT_STRIP_TRAILING_WHITESPACE -+ ERROR_QUIET -+ ) -+endmacro() -+ -+# call git, store output in var (can not fail) -+macro(git var) -+ _git(${var} ${ARGN}) -+ if (NOT _git_ec EQUAL 0) -+ string(REPLACE ";" " " args "${ARGN}") -+ message(FATAL_ERROR "Failed to execute: git ${args}") -+ endif() -+endmacro() -+ -+function(extract_version_info version var_prefix) -+ # extract the main components -+ # v1.9.0-3-g5b92266+1546836556 -+ # v1.9.0-3-g5b92266-dirty+1546836556 -+ string(REGEX MATCH "^v?([0-9]+\\.[0-9]+\\.[0-9]+)(-([0-9]+)-g([0-9a-f]+)(-dirty)?)?(\\+([0-9]+))?$" matches "${version}") -+ if (NOT matches) -+ message(FATAL_ERROR "Failed to extract version components.") -+ endif() -+ set(${var_prefix}_VERSION "${CMAKE_MATCH_1}" PARENT_SCOPE) # 1.9.0 -+ if (NOT CMAKE_MATCH_3) -+ set(CMAKE_MATCH_3 "0") -+ endif() -+ set(${var_prefix}_VERSION_NCOMMITS "${CMAKE_MATCH_3}" PARENT_SCOPE) # 3 -+ if (NOT CMAKE_MATCH_4) -+ set(CMAKE_MATCH_4 "0") -+ endif() -+ set(${var_prefix}_VERSION_GIT_REV "${CMAKE_MATCH_4}" PARENT_SCOPE) # 5b92266 -+ if (CMAKE_MATCH_5 STREQUAL "-dirty") -+ set(${var_prefix}_VERSION_IS_DIRTY TRUE PARENT_SCOPE) -+ else() -+ set(${var_prefix}_VERSION_IS_DIRTY FALSE PARENT_SCOPE) -+ endif() -+ # timestamp is optional, default to 0 -+ if (NOT CMAKE_MATCH_7) -+ set(CMAKE_MATCH_7 "0") -+ endif() -+ set(${var_prefix}_VERSION_COMMIT_TIMESTAMP "${CMAKE_MATCH_7}" PARENT_SCOPE) # 1546836556 -+endfunction() -+ -+function(determine_version source_dir var_prefix) -+ if (EXISTS "${source_dir}/.git") -+ # for GIT_EXECUTABLE -+ find_package(Git REQUIRED) -+ # get a description of the version, something like: -+ # v1.9.1-0-g38ffe82 (a tagged release) -+ # v1.9.1-0-g38ffe82-dirty (a tagged release with local modifications) -+ # v1.9.0-3-g5b92266 (post-release snapshot) -+ # v1.9.0-3-g5b92266-dirty (post-release snapshot with local modifications) -+ _git(version describe --abbrev=${GIT_REV_LEN} --match "v[0-9]*" --long --dirty) -+ if (NOT _git_ec EQUAL 0) -+ # no annotated tags, fake one -+ git(revision rev-parse --short=${GIT_REV_LEN} --verify HEAD) -+ set(version "v0.0.0-0-g${revision}") -+ # check if dirty (this won't detect untracked files, but should be ok) -+ _git(changes diff-index --quiet HEAD --) -+ if (NOT _git_ec EQUAL 0) -+ string(APPEND version "-dirty") -+ endif() -+ # append the commit timestamp of the most recent commit (only -+ # in non-release branches -- typically master) -+ git(commit_timestamp show -s --format=%ct) -+ string(APPEND version "+${commit_timestamp}") -+ endif() -+ else() -+ # same as above, but used for snapshots -+ file(STRINGS "${source_dir}/version.txt" version) -+ endif() -+ set(local_prefix "_determine_ver") -+ extract_version_info("${version}" "${local_prefix}") -+ foreach(suffix VERSION VERSION_NCOMMITS VERSION_GIT_REV VERSION_IS_DIRTY VERSION_COMMIT_TIMESTAMP) -+ if (NOT DEFINED ${local_prefix}_${suffix}) -+ message(FATAL_ERROR "Unable to determine version.") -+ endif() -+ set(${var_prefix}_${suffix} "${${local_prefix}_${suffix}}" PARENT_SCOPE) -+ message(STATUS "${var_prefix}_${suffix}: ${${local_prefix}_${suffix}}") -+ endforeach() -+ # Set VERSION_SUFFIX and VERSION_FULL. When making changes, be aware that -+ # this is used in packaging as well and will affect ordering. -+ # | state | version_full | -+ # |------------------------------------------------| -+ # | exact tag | 0.9.0 | -+ # | exact tag, dirty | 0.9.0+git20180604 | -+ # | after tag | 0.9.0+git20180604.1.085039f | -+ # | no tag | 0.0.0+git20180604.2ee02af | -+ string(TIMESTAMP date "%Y%m%d" UTC) -+ set(version_suffix "") -+ if ((NOT ${local_prefix}_VERSION_NCOMMITS EQUAL 0) OR (${local_prefix}_VERSION STREQUAL "0.0.0")) -+ # 0.9.0+git20150604.4.289818b -+ string(APPEND version_suffix "+git${date}") -+ if (NOT ${local_prefix}_VERSION_NCOMMITS EQUAL 0) -+ string(APPEND version_suffix ".${${local_prefix}_VERSION_NCOMMITS}") -+ endif() -+ string(APPEND version_suffix ".${${local_prefix}_VERSION_GIT_REV}") -+ else() -+ if (${local_prefix}_VERSION_IS_DIRTY) -+ # 0.9.0+git20150604 -+ string(APPEND version_suffix "+git${date}") -+ endif() -+ endif() -+ set(version_full "${${local_prefix}_VERSION}${version_suffix}") -+ # set the results -+ set(${var_prefix}_VERSION_SUFFIX "${version_suffix}" PARENT_SCOPE) -+ set(${var_prefix}_VERSION_FULL "${version_full}" PARENT_SCOPE) -+ # for informational purposes -+ message(STATUS "${var_prefix}_VERSION_SUFFIX: ${version_suffix}") -+ message(STATUS "${var_prefix}_VERSION_FULL: ${version_full}") -+endfunction() -+ --- -2.20.1 - diff --git a/gnu/packages/patches/rnp-disable-ruby-rnp-tests.patch b/gnu/packages/patches/rnp-disable-ruby-rnp-tests.patch deleted file mode 100644 index 5a75b6f40f..0000000000 --- a/gnu/packages/patches/rnp-disable-ruby-rnp-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 40e53d639d86337cf58be3a2b9750b6c97a3c740 Mon Sep 17 00:00:00 2001 -From: Justus Winter <teythoon@avior.uberspace.de> -Date: Tue, 21 Jul 2020 16:10:21 +0200 -Subject: [PATCH 2/2] Disable ruby-rnp tests. - -Prevents cmake from cloning the ruby-rnp repository in order to run its tests. ---- - src/tests/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt -index d3c4fbe6..e7e1965e 100644 ---- a/src/tests/CMakeLists.txt -+++ b/src/tests/CMakeLists.txt -@@ -125,7 +125,7 @@ gtest_discover_tests(rnp_tests - - # ruby-rnp - # cruby does not currently play nice with ASaN et al. --if (NOT ENABLE_SANITIZERS AND BUILD_SHARED_LIBS AND NOT WIN32) -+if (NOT ENABLE_SANITIZERS AND BUILD_SHARED_LIBS AND NOT WIN32 AND IGNORE) - include(ExternalProject) - set(_sourcedir "${CMAKE_BINARY_DIR}/ruby-rnp") - if (DEFINED ENV{RUBY_RNP_INSTALL}) --- -2.20.1 - diff --git a/gnu/packages/patches/rnp-unbundle-googletest.patch b/gnu/packages/patches/rnp-unbundle-googletest.patch deleted file mode 100644 index b85bfd1f0e..0000000000 --- a/gnu/packages/patches/rnp-unbundle-googletest.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 4b4697c8dd66bd2b1e4d6b831bbde46e27d62c46 Mon Sep 17 00:00:00 2001 -From: Justus Winter <teythoon@avior.uberspace.de> -Date: Tue, 21 Jul 2020 16:10:12 +0200 -Subject: [PATCH 1/2] Unbundle googletest. - ---- - src/tests/CMakeLists.txt | 2 +- - src/tests/gtest-CMakeLists.txt.in | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt -index 0a841666..d3c4fbe6 100644 ---- a/src/tests/CMakeLists.txt -+++ b/src/tests/CMakeLists.txt -@@ -53,7 +53,7 @@ endif() - # maintain compiler/linker settings on Windows - set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) - # add to our build (provides gtest_main target) --add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/googletest-src -+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/googletest-src - ${CMAKE_CURRENT_BINARY_DIR}/googletest-build - EXCLUDE_FROM_ALL) - -diff --git a/src/tests/gtest-CMakeLists.txt.in b/src/tests/gtest-CMakeLists.txt.in -index a43e8e5d..3cc0ddd5 100644 ---- a/src/tests/gtest-CMakeLists.txt.in -+++ b/src/tests/gtest-CMakeLists.txt.in -@@ -4,9 +4,9 @@ project(googletest-download NONE) - - include(ExternalProject) - ExternalProject_Add(googletest -- GIT_REPOSITORY https://github.com/google/googletest.git -- GIT_TAG c43f710 -- SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src" -+# GIT_REPOSITORY https://github.com/google/googletest.git -+# GIT_TAG c43f710 -+ SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/googletest-src" - BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-build" - CONFIGURE_COMMAND "" - BUILD_COMMAND "" --- -2.20.1 - diff --git a/gnu/packages/patches/sbcl-eazy-gnuplot-skip-path-check.patch b/gnu/packages/patches/sbcl-eazy-gnuplot-skip-path-check.patch new file mode 100644 index 0000000000..ccc9c09fb9 --- /dev/null +++ b/gnu/packages/patches/sbcl-eazy-gnuplot-skip-path-check.patch @@ -0,0 +1,14 @@ +Don't check whether gnuplot is present in $PATH, because we know it is. + +diff --git a/eazy-gnuplot.asd b/eazy-gnuplot.asd +index 7b1c09b..4657cd6 100644 +--- a/eazy-gnuplot.asd ++++ b/eazy-gnuplot.asd +@@ -37,7 +37,4 @@ + :fill-pointer t))) + (setf (fill-pointer seq) (read-sequence seq stream)) + seq))) +- :perform (load-op :before (op c) +- (unless (zerop (nth-value 2 (uiop:run-program "which gnuplot" :ignore-error-status t))) +- (warn "Could not find GNUPLOT in $PATH"))) + :in-order-to ((test-op (test-op eazy-gnuplot.test)))) diff --git a/gnu/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch b/gnu/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch index 17413c71ae..548c3c2a1d 100644 --- a/gnu/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch +++ b/gnu/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch @@ -2,14 +2,14 @@ This patch disables build targets that contain pre-built Java archives that would be copied to the build's output. Patch by Roel Janssen <roel@gnu.org> -*** a-virtuoso-opensource-7.2.7/binsrc/Makefile.am 1970-01-01 01:00:01.000000000 +0100 ---- b-virtuoso-opensource-7.2.7/binsrc/Makefile.am 2022-05-27 12:20:52.909135774 +0200 +*** a-virtuoso-opensource-7.2.9/binsrc/Makefile.am 1970-01-01 01:00:01.000000000 +0100 +--- b-virtuoso-opensource-7.2.9/binsrc/Makefile.am 2023-03-05 13:05:37.946449855 +0100 *************** *** 19,25 **** # # -! SUBDIRS = dav mono virtuoso tests rdf_mappers driver maildrop sqldoc hosting bpel fct tutorial conductor samples vsp ws sync vspx vad cached_resources virtodbc virtoledb virtuoso_sink xddl VirtuosoClient.Net oat isparql jena jena2 jena3 jena4 sesame sesame2 sesame3 sesame4 redland hibernate dbpedia rdb2rdf rdf4j +! SUBDIRS = dav mono virtuoso tests rdf_mappers driver maildrop sqldoc hosting graphql bpel fct tutorial conductor samples vsp ws sync vspx vad cached_resources virtodbc virtoledb virtuoso_sink xddl VirtuosoClient.Net oat isparql jena jena2 jena3 jena4 sesame sesame2 sesame3 sesame4 redland hibernate dbpedia rdb2rdf rdf4j rdf4j_4 websocket # ---------------------------------------------------------------------- @@ -17,42 +17,41 @@ Patch by Roel Janssen <roel@gnu.org> # # -! SUBDIRS = dav mono virtuoso tests rdf_mappers driver maildrop sqldoc hosting bpel fct tutorial conductor samples vsp ws sync vspx vad cached_resources virtodbc virtoledb virtuoso_sink xddl VirtuosoClient.Net oat isparql redland dbpedia rdb2rdf +! SUBDIRS = dav mono virtuoso tests rdf_mappers driver maildrop sqldoc hosting graphql bpel fct tutorial conductor samples vsp ws sync vspx vad cached_resources virtodbc virtoledb virtuoso_sink xddl VirtuosoClient.Net oat isparql redland dbpedia rdb2rdf websocket # ---------------------------------------------------------------------- -*** a-virtuoso-opensource-7.2.7/configure.ac 1970-01-01 01:00:01.000000000 +0100 ---- b-virtuoso-opensource-7.2.7/configure.ac 2022-05-27 12:27:51.879208018 +0200 +*** a-virtuoso-opensource-7.2.9/configure.ac 1970-01-01 01:00:01.000000000 +0100 +--- b-virtuoso-opensource-7.2.9/configure.ac 2023-03-05 13:03:01.302629421 +0100 *************** -*** 57,64 **** +*** 57,63 **** dnl AM_INIT_AUTOMAKE([1.8]) dnl AM_INIT_AUTOMAKE([1.9 tar-ustar]) dnl ! AM_INIT_AUTOMAKE([1.9 tar-ustar]) -! - AM_MAINTAINER_MODE + AM_MAINTAINER_MODE --- 57,63 ---- dnl AM_INIT_AUTOMAKE([1.8]) dnl AM_INIT_AUTOMAKE([1.9 tar-ustar]) dnl ! AM_INIT_AUTOMAKE([1.9 tar-ustar subdir-objects]) - AM_MAINTAINER_MODE + AM_MAINTAINER_MODE *************** -*** 3157,3163 **** - binsrc/dbpedia/Makefile +*** 3210,3216 **** binsrc/driver/Makefile binsrc/fct/Makefile + binsrc/graphql/Makefile - binsrc/hibernate/Makefile binsrc/hosting/Makefile binsrc/hosting/mono/Makefile binsrc/hosting/mono/tests/Makefile ---- 3156,3161 ---- +--- 3210,3215 ---- *************** -*** 3169,3184 **** +*** 3222,3238 **** binsrc/hosting/ruby/Makefile binsrc/hosting/shapefileio/Makefile binsrc/isparql/Makefile @@ -66,12 +65,13 @@ Patch by Roel Janssen <roel@gnu.org> binsrc/rdf_mappers/Makefile binsrc/rdb2rdf/Makefile - binsrc/rdf4j/Makefile +- binsrc/rdf4j_4/Makefile binsrc/redland/Makefile binsrc/samples/demo/Makefile binsrc/samples/hslookup/Makefile ---- 3167,3177 ---- +--- 3221,3231 ---- *************** -*** 3191,3200 **** +*** 3245,3254 **** binsrc/samples/webapp/Makefile binsrc/samples/xpath/Makefile binsrc/samples/xquery/Makefile @@ -82,9 +82,9 @@ Patch by Roel Janssen <roel@gnu.org> binsrc/sqldoc/Makefile binsrc/sync/Makefile binsrc/tests/biftest/Makefile ---- 3184,3189 ---- +--- 3238,3243 ---- *************** -*** 3236,3245 **** +*** 3291,3300 **** docsrc/stylesheets/Makefile docsrc/xmlsource/Makefile libsrc/Dk/Makefile @@ -95,9 +95,9 @@ Patch by Roel Janssen <roel@gnu.org> libsrc/langfunc/Makefile libsrc/odbcsdk/Makefile libsrc/plugin/Makefile ---- 3225,3230 ---- -*** a-virtuoso-opensource-7.2.7/libsrc/Makefile.am 1970-01-01 01:00:01.000000000 +0100 ---- b-virtuoso-opensource-7.2.7/libsrc/Makefile.am 2022-05-27 12:30:12.658593011 +0200 +--- 3280,3285 ---- +*** a-virtuoso-opensource-7.2.9/libsrc/Makefile.am 1970-01-01 01:00:01.000000000 +0100 +--- b-virtuoso-opensource-7.2.9/libsrc/Makefile.am 2023-03-05 13:03:17.616027294 +0100 *************** *** 19,25 **** # diff --git a/gnu/packages/patches/widelands-add-missing-map-include.patch b/gnu/packages/patches/widelands-add-missing-map-include.patch deleted file mode 100644 index 633731bea2..0000000000 --- a/gnu/packages/patches/widelands-add-missing-map-include.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 316eaea209754368a57f445ea4dd016ecf8eded6 Mon Sep 17 00:00:00 2001 -From: matthiakl <t-m.42@mailpost.spdns.org> -Date: Sat, 14 Aug 2021 19:24:08 +0200 -Subject: [PATCH] Added missing direct incude (#5025) - ---- -This patch is from -https://github.com/widelands/widelands/pull/5025 -which has been merged after the release of Widelands 1.0. - - src/network/bufferedconnection.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/network/bufferedconnection.h b/src/network/bufferedconnection.h -index fe974b9e..7e1ecf87 100644 ---- a/src/network/bufferedconnection.h -+++ b/src/network/bufferedconnection.h -@@ -20,6 +20,7 @@ - #ifndef WL_NETWORK_BUFFEREDCONNECTION_H - #define WL_NETWORK_BUFFEREDCONNECTION_H - -+#include <map> - #include <memory> - #include <mutex> - #include <thread> --- -2.30.2 - diff --git a/gnu/packages/patches/widelands-system-wide_minizip.patch b/gnu/packages/patches/widelands-system-wide_minizip.patch deleted file mode 100644 index b59fed7531..0000000000 --- a/gnu/packages/patches/widelands-system-wide_minizip.patch +++ /dev/null @@ -1,141 +0,0 @@ -Description: use the system-wide minizip instead of the embeeded one if found. -Forwarded-Upstream: It was provided by upstream: http://bazaar.launchpad.net/~widelands-dev/widelands/b19-debian/revision/8147 - . - Thanks to Fòram na Gàidhlig for the patch. - -=== modified file 'CMakeLists.txt' ---- - CMakeLists.txt | 1 + - cmake/Modules/FindMinizip.cmake | 37 +++++++++++++++++++++++++++++++++++++ - cmake/WlFunctions.cmake | 8 ++++++++ - src/io/filesystem/CMakeLists.txt | 2 +- - src/io/filesystem/zip_filesystem.h | 6 ++++++ - src/third_party/CMakeLists.txt | 20 +++++++++++--------- - 6 files changed, 64 insertions(+), 10 deletions(-) - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -142,6 +142,7 @@ - find_package(SDL2_mixer REQUIRED) - find_package(SDL2_ttf REQUIRED) - find_package(ZLIB REQUIRED) -+find_package(Minizip) - if(${CMAKE_VERSION} VERSION_LESS 3.9.0) - find_package(ICU_old REQUIRED) - else() ---- /dev/null -+++ b/cmake/Modules/FindMinizip.cmake -@@ -0,0 +1,37 @@ -+# - Try to find Minizip -+# Once done this will define -+# -+# MINIZIP_FOUND - system has MINIZIP -+# MINIZIP_INCLUDE_DIR - the MINIZIP include directory -+# MINIZIP_LIBRARY_DIR - where the libraries are -+# MINIZIP_LIBRARY - Link these to use MINIZIP -+# -+ -+IF (MINIZIP_INCLUDE_DIR) -+ # Already in cache, be silent -+ SET(MINIZIP_FIND_QUIETLY TRUE) -+ENDIF (MINIZIP_INCLUDE_DIR) -+ -+FIND_PATH( MINIZIP_INCLUDE_DIR -+ NAMES zip.h unzip.h ioapi.h -+ PATHS /usr/local/include /usr/include -+ PATH_SUFFIXES minizip/ ) -+SET( MINIZIP_NAMES minizip MINIZIP ) -+FIND_LIBRARY( MINIZIP_LIBRARY -+ NAMES ${MINIZIP_NAMES} -+ PATHS /usr/lib /usr/local/lib ) -+ -+GET_FILENAME_COMPONENT( MINIZIP_LIBRARY_DIR ${MINIZIP_LIBRARY} PATH ) -+ -+IF (MINIZIP_INCLUDE_DIR AND MINIZIP_LIBRARY) -+ SET(MINIZIP_FOUND TRUE) -+ SET(MINIZIP_LIBRARY_DIR ${MINIZIP_LIBRARY} ) -+ IF (NOT MINIZIP_FIND_QUIETLY) -+ MESSAGE (STATUS "Found Minizip: ${MINIZIP_LIBRARY} ${MINIZIP_INCLUDE_DIR}") -+ ENDIF (NOT MINIZIP_FIND_QUIETLY) -+ELSE (MINIZIP_INCLUDE_DIR AND MINIZIP_LIBRARY) -+ SET( MINIZIP_FOUND FALSE ) -+ SET( MINIZIP_LIBRARY_DIR ) -+ SET( MINIZIP_EXTRA_DEFINITIONS ) -+ENDIF (MINIZIP_INCLUDE_DIR AND MINIZIP_LIBRARY) -+ ---- a/cmake/WlFunctions.cmake -+++ b/cmake/WlFunctions.cmake -@@ -84,6 +84,14 @@ - - if(ARG_USES_ZLIB) - target_link_libraries(${NAME} ZLIB::ZLIB) -+ if (MINIZIP_FOUND) -+ wl_include_system_directories(${NAME} ${MINIZIP_INCLUDE_DIR}) -+ target_link_libraries(${NAME} ${MINIZIP_LIBRARY}) -+ target_compile_definitions(${NAME} PUBLIC -DHAVE_SYSTEM_MINIZIP) -+ else(MINIZIP_FOUND) -+ target_link_libraries(${NAME} third_party_minizip) -+ message(FATAL_ERROR "You are using widelands-bundled minizip sources. Please install your distribution's minizip dev library or urge your distribution maintainer to include the minizip library in your package repository. Thank you.") -+ endif(MINIZIP_FOUND) - endif() - - # OpenGL and GLEW are one thing for us. If you use the one, you also use the ---- a/src/third_party/CMakeLists.txt -+++ b/src/third_party/CMakeLists.txt -@@ -1,12 +1,14 @@ --wl_library(third_party_minizip -- THIRD_PARTY -- SRCS -- minizip/ioapi.h -- minizip/unzip.cc -- minizip/unzip.h -- minizip/zip.h -- USES_ZLIB --) -+if(NOT MINIZIP_FOUND) -+ wl_library(third_party_minizip -+ THIRD_PARTY -+ SRCS -+ ioapi.h -+ unzip.cc -+ unzip.h -+ zip.h -+ USES_ZLIB -+ ) -+endif(NOT MINIZIP_FOUND) - - wl_library(third_party_eris - THIRD_PARTY ---- a/src/io/filesystem/CMakeLists.txt -+++ b/src/io/filesystem/CMakeLists.txt -@@ -12,6 +12,7 @@ - zip_exceptions.h - zip_filesystem.cc - zip_filesystem.h -+ USES_ZLIB - DEPENDS - base_exceptions - base_i18n -@@ -19,5 +20,4 @@ - base_macros - graphic_text_layout - io_stream -- third_party_minizip - ) ---- a/src/io/filesystem/zip_filesystem.h -+++ b/src/io/filesystem/zip_filesystem.h -@@ -25,8 +25,14 @@ - #include "io/filesystem/filesystem.h" - #include "io/streamread.h" - #include "io/streamwrite.h" -+ -+#ifndef HAVE_SYSTEM_MINIZIP - #include "third_party/minizip/unzip.h" - #include "third_party/minizip/zip.h" -+#else -+#include <minizip/unzip.h> -+#include <minizip/zip.h> -+#endif - - class ZipFilesystem : public FileSystem { - public: |