From 6e54ce9ca9b172189ab46eb14147304ff9cfa35b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 1 Jun 2022 12:18:00 +0200 Subject: gnu: pigx-chipseq: Update to 0.1.0. * gnu/packages/bioinformatics.scm (pigx-chipseq): Update to 0.1.0. [source]: Remove patch. [arguments]: Remove 'autoreconf phase. [native-inputs]: Remove autoconf and automake. * gnu/packages/patches/pigx-chipseq-no-citeproc.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove patch. --- gnu/local.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index af92253ddd..b9d62a3f0f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1629,7 +1629,6 @@ dist_patch_DATA = \ %D%/packages/patches/picprog-non-intel-support.patch \ %D%/packages/patches/pidgin-add-search-path.patch \ %D%/packages/patches/pigx-bsseq-no-citeproc.patch \ - %D%/packages/patches/pigx-chipseq-no-citeproc.patch \ %D%/packages/patches/pinball-system-ltdl.patch \ %D%/packages/patches/pingus-boost-headers.patch \ %D%/packages/patches/pingus-sdl-libs-config.patch \ -- cgit 1.4.1 From 93c97bfffba7ca0126c03967fbe058354e24f84d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 1 Jun 2022 12:41:59 +0200 Subject: gnu: pigx-bsseq: Update to 0.1.7. * gnu/packages/bioinformatics.scm (pigx-bsseq): Update to 0.1.7. [source]: Remove patch. [arguments]: Remove 'autoreconf phase. [native-inputs]: Remove automake and autoconf. * gnu/packages/patches/pigx-bsseq-no-citeproc.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove patch. --- gnu/local.mk | 1 - gnu/packages/bioinformatics.scm | 19 +++---------- gnu/packages/patches/pigx-bsseq-no-citeproc.patch | 33 ----------------------- 3 files changed, 3 insertions(+), 50 deletions(-) delete mode 100644 gnu/packages/patches/pigx-bsseq-no-citeproc.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index b9d62a3f0f..c7625a7679 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1628,7 +1628,6 @@ dist_patch_DATA = \ %D%/packages/patches/picard-fix-id3-rename-test.patch \ %D%/packages/patches/picprog-non-intel-support.patch \ %D%/packages/patches/pidgin-add-search-path.patch \ - %D%/packages/patches/pigx-bsseq-no-citeproc.patch \ %D%/packages/patches/pinball-system-ltdl.patch \ %D%/packages/patches/pingus-boost-headers.patch \ %D%/packages/patches/pingus-sdl-libs-config.patch \ diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f2800d3163..92d92e7d02 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10608,7 +10608,7 @@ in an easily configurable manner.") (define-public pigx-bsseq (package (name "pigx-bsseq") - (version "0.1.6") + (version "0.1.7") (source (origin (method url-fetch) (uri (string-append "https://github.com/BIMSBbioinfo/pigx_bsseq/" @@ -10616,8 +10616,7 @@ in an easily configurable manner.") "/pigx_bsseq-" version ".tar.gz")) (sha256 (base32 - "1dipikph0xdr8fp0h1flpafcrg60y4aabljg8fl1v92j3gxdggmw")) - (patches (search-patches "pigx-bsseq-no-citeproc.patch")))) + "1hfiignq3410dbl6f67vc6zr69abknpcgxixx475dspky2jb5lyn")))) (build-system gnu-build-system) (arguments `(;; TODO: tests currently require 12+GB of RAM. See @@ -10625,18 +10624,6 @@ in an easily configurable manner.") #:tests? #f #:phases (modify-phases %standard-phases - (add-before 'bootstrap 'autoreconf - (lambda _ - ;; This was fixed in commit - ;; d56ac732524da659afbbb0972f7a87fa178ae58e, but there is no - ;; release with this fix. - (call-with-output-file "VERSION" - (lambda (port) (display ,version port))) - ;; https://github.com/BIMSBbioinfo/pigx_bsseq/issues/181 - (substitute* "m4/ax_r_package.m4" - (("if\\(is.na\\(packageDescription\\(\"PKG\"\\)\\)\\)") - "if(system.file(package=\"PKG\") == \"\")")) - (invoke "autoreconf" "-vif"))) (add-before 'configure 'set-PYTHONPATH (lambda _ (setenv "PYTHONPATH" (getenv "GUIX_PYTHONPATH")))) @@ -10648,7 +10635,7 @@ in an easily configurable manner.") (search-input-directory inputs "share/zoneinfo"))))))) (native-inputs - (list tzdata automake autoconf)) + (list tzdata)) (inputs (list coreutils sed diff --git a/gnu/packages/patches/pigx-bsseq-no-citeproc.patch b/gnu/packages/patches/pigx-bsseq-no-citeproc.patch deleted file mode 100644 index 882e660fe4..0000000000 --- a/gnu/packages/patches/pigx-bsseq-no-citeproc.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Naur pigx_bsseq-0.1.5/configure.ac pigx_bsseq-0.1.5.patched/configure.ac ---- pigx_bsseq-0.1.5/configure.ac 2021-06-08 15:28:08.000000000 +0200 -+++ pigx_bsseq-0.1.5.patched/configure.ac 2021-10-05 14:43:56.806529137 +0200 -@@ -38,7 +38,6 @@ - find_or_override_prog([GNUBASH], [bash]) - find_or_override_prog([SNAKEMAKE], [snakemake]) - find_or_override_prog([PANDOC], [pandoc]) --find_or_override_prog([PANDOC_CITEPROC], [pandoc-citeproc]) - find_or_override_prog([FASTQC], [fastqc]) - find_or_override_prog([MULTIQC], [multiqc]) - find_or_override_prog([TRIMGALORE], [trim_galore]) -diff -Naur pigx_bsseq-0.1.5/Makefile.in pigx_bsseq-0.1.5.patched/Makefile.in ---- pigx_bsseq-0.1.5/Makefile.in 2021-06-08 16:17:03.000000000 +0200 -+++ pigx_bsseq-0.1.5.patched/Makefile.in 2021-10-05 14:43:34.635876855 +0200 -@@ -408,7 +408,6 @@ - PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PANDOC = @PANDOC@ --PANDOC_CITEPROC = @PANDOC_CITEPROC@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PYTHON = @PYTHON@ - PYTHONPATH = @PYTHONPATH@ -diff -Naur pigx_bsseq-0.1.5/pigx-common/common/pigx-runner.in pigx_bsseq-0.1.5.patched/pigx-common/common/pigx-runner.in ---- pigx_bsseq-0.1.5/pigx-common/common/pigx-runner.in 2021-06-08 10:14:29.000000000 +0200 -+++ pigx_bsseq-0.1.5.patched/pigx-common/common/pigx-runner.in 2021-10-05 14:43:44.296161069 +0200 -@@ -375,7 +375,6 @@ - if path.exists(bin): shutil.rmtree(bin) - os.makedirs(bin, exist_ok=True) - os.symlink('@PANDOC@', path.join(bin, "pandoc")) -- os.symlink('@PANDOC_CITEPROC@', path.join(bin, "pandoc-citeproc")) - os.symlink('@RSCRIPT@', path.join(bin, "Rscript")) - os.environ['PATH'] = path.abspath(bin) + ":" + os.environ['PATH'] - os.environ['PIGX_PATH'] = path.abspath(bin) + ":" + os.environ['PATH'] -- cgit 1.4.1 From 572bc6d7bd4d970183965375161fa910d66c1d80 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 1 Jun 2022 22:55:27 +0300 Subject: gnu: Remove unreferenced patch. This is a follow-up to a08c21f206d34a42d311e46b495b422188be70eb. * gnu/packages/patches/libmicrohttpd-0.9.73-test-ssl3.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../patches/libmicrohttpd-0.9.73-test-ssl3.patch | 35 ---------------------- 2 files changed, 36 deletions(-) delete mode 100644 gnu/packages/patches/libmicrohttpd-0.9.73-test-ssl3.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index c7625a7679..d814d46b14 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1403,7 +1403,6 @@ dist_patch_DATA = \ %D%/packages/patches/libmad-length-check.patch \ %D%/packages/patches/libmad-md_size.patch \ %D%/packages/patches/libmad-mips-newgcc.patch \ - %D%/packages/patches/libmicrohttpd-0.9.73-test-ssl3.patch \ %D%/packages/patches/libmp4v2-c++11.patch \ %D%/packages/patches/libmpeg2-arm-private-symbols.patch \ %D%/packages/patches/libmpeg2-global-symbol-test.patch \ diff --git a/gnu/packages/patches/libmicrohttpd-0.9.73-test-ssl3.patch b/gnu/packages/patches/libmicrohttpd-0.9.73-test-ssl3.patch deleted file mode 100644 index e8d5dce0ed..0000000000 --- a/gnu/packages/patches/libmicrohttpd-0.9.73-test-ssl3.patch +++ /dev/null @@ -1,35 +0,0 @@ - Disable usage of SSLv3 in testing - - Integrated uptream version 0.9.74 - - -diff --git a/src/testcurl/https/test_tls_options.c b/src/testcurl/https/test_tls_options.c - ---- a/src/testcurl/https/test_tls_options.c -+++ b/src/testcurl/https/test_tls_options.c -@@ -119,11 +119,6 @@ main (int argc, char *const *argv) - fprintf (stderr, "Curl does not support SSL. Cannot run the test.\n"); - return 77; - } -- if (0 != strncmp (ssl_version, "GnuTLS", 6)) -- { -- fprintf (stderr, "This test can be run only with libcurl-gnutls.\n"); -- return 77; -- } - - if (! testsuite_curl_global_init ()) - return 99; -@@ -152,10 +147,10 @@ main (int argc, char *const *argv) - fprintf (stderr, - "The following handshake should fail (and print an error message)...\n"); - if (0 != -- test_wrap ("TLS1.0 vs SSL3", -+ test_wrap ("TLS1.1 vs TLS1.0", - &test_unmatching_ssl_version, NULL, port, daemon_flags, - aes256_sha, -- CURL_SSLVERSION_SSLv3, -+ CURL_SSLVERSION_TLSv1_1, - MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, - MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, - MHD_OPTION_HTTPS_PRIORITIES, - -- cgit 1.4.1 From 3695a8d32ecbb7bf45b5adaa1f9b358467e22751 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sun, 29 May 2022 16:58:22 +0200 Subject: gnu: minetest: Update to 5.5.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/local.mk (dist_patch_DATA): Remove minetest-add-MINETEST_MOD_PATH.patch. * gnu/packages/minetest.scm (minetest): Update to 5.5.1. [patches]: Don’t use the patch anymore. [#:configure-flags]: Point cmake to irrlicht-for-minetest and zstd. [inputs]: Use irrlicht-for-minetest instead of irrlicht, and add zstd. (minetest-data): Update hash. Signed-off-by: Liliana Marie Prikler --- gnu/local.mk | 1 - gnu/packages/minetest.scm | 27 ++-- .../patches/minetest-add-MINETEST_MOD_PATH.patch | 156 --------------------- 3 files changed, 16 insertions(+), 168 deletions(-) delete mode 100644 gnu/packages/patches/minetest-add-MINETEST_MOD_PATH.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index d814d46b14..d51c1be0d3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1490,7 +1490,6 @@ dist_patch_DATA = \ %D%/packages/patches/meson-allow-dirs-outside-of-prefix.patch \ %D%/packages/patches/mhash-keygen-test-segfault.patch \ %D%/packages/patches/mia-fix-boost-headers.patch \ - %D%/packages/patches/minetest-add-MINETEST_MOD_PATH.patch \ %D%/packages/patches/mingw-w64-6.0.0-gcc.patch \ %D%/packages/patches/mingw-w64-dlltool-temp-prefix.patch \ %D%/packages/patches/mingw-w64-reproducible-gendef.patch \ diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index c431942473..2efd1468d2 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -26,6 +26,7 @@ #:use-module (gnu packages) #:use-module (gnu packages audio) #:use-module (gnu packages base) + #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages fontutils) #:use-module (gnu packages games) @@ -51,7 +52,7 @@ (define-public minetest (package (name "minetest") - (version "5.4.1") + (version "5.5.1") (source (origin (method git-fetch) (uri (git-reference @@ -60,11 +61,8 @@ (file-name (git-file-name name version)) (sha256 (base32 - "062ilb7s377q3hwfhl8q06vvcw2raydz5ljzlzwy2dmyzmdcndb8")) + "042v71gkk0xfixcsn82az2fri0n28fgf9d2zcz31bijqmg5q7imj")) (modules '((guix build utils))) - (patches - (search-patches - "minetest-add-MINETEST_MOD_PATH.patch")) (snippet '(begin ;; Delete bundled libraries. @@ -77,12 +75,18 @@ "-DENABLE_FREETYPE=1" "-DENABLE_GETTEXT=1" "-DENABLE_SYSTEM_JSONCPP=TRUE" - (string-append "-DIRRLICHT_INCLUDE_DIR=" - (assoc-ref %build-inputs "irrlicht") + (string-append "-DIRRLICHTMT_INCLUDE_DIR=" + (assoc-ref %build-inputs "irrlicht-for-minetest") "/include/irrlicht") (string-append "-DCURL_INCLUDE_DIR=" (assoc-ref %build-inputs "curl") - "/include/curl")) + "/include/curl") + (string-append "-DZSTD_INCLUDE_DIR=" + (assoc-ref %build-inputs "zstd") + "/include/zstd") + (string-append "-DZSTD_LIBRARY=" + (assoc-ref %build-inputs "zstd") + "/lib/libzstd.so")) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-sources @@ -123,7 +127,7 @@ ("freetype" ,freetype) ("gettext" ,gettext-minimal) ("gmp" ,gmp) - ("irrlicht" ,irrlicht) + ("irrlicht-for-minetest" ,irrlicht-for-minetest) ("jsoncpp" ,jsoncpp) ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) @@ -134,7 +138,8 @@ ("mesa" ,mesa) ("ncurses" ,ncurses) ("openal" ,openal) - ("sqlite" ,sqlite))) + ("sqlite" ,sqlite) + ("zstd" ,zstd "lib"))) (propagated-inputs (list minetest-data)) (synopsis "Infinite-world block sandbox game") @@ -159,7 +164,7 @@ in different ways.") (file-name (git-file-name name version)) (sha256 (base32 - "0i45lbnikvgj9kxdp0yphpjjwjcgp4ibn49xkj78j5ic1s9n8jd4")))) + "12cpaiww148szvnrc8r8cffwvl33smnrl7k29sh401yv0pbqi3j8")))) (build-system trivial-build-system) (native-inputs `(("source" ,source))) diff --git a/gnu/packages/patches/minetest-add-MINETEST_MOD_PATH.patch b/gnu/packages/patches/minetest-add-MINETEST_MOD_PATH.patch deleted file mode 100644 index 41338e6e6f..0000000000 --- a/gnu/packages/patches/minetest-add-MINETEST_MOD_PATH.patch +++ /dev/null @@ -1,156 +0,0 @@ -From d10ea2ad7efc2364a8a2007b4c6d3e85511e2f84 Mon Sep 17 00:00:00 2001 -From: Maxime Devos -Date: Tue, 3 Aug 2021 01:00:23 +0200 -Subject: [PATCH] Add environment variable MINETEST_MOD_PATH - -This adds an environment variable MINETEST_MOD_PATH. -When it exists, Minetest will look there for mods -in addition to ~/.minetest/mods/. Mods can still be -installed to ~/.minetest/mods/ with the built-in installer. - -With thanks to Liliana Marie Prikler. ---- - builtin/mainmenu/pkgmgr.lua | 7 +++---- - doc/menu_lua_api.txt | 8 +++++++- - src/content/subgames.cpp | 11 +++++++++++ - src/script/lua_api/l_mainmenu.cpp | 23 +++++++++++++++++++++++ - src/script/lua_api/l_mainmenu.h | 2 ++ - 5 files changed, 46 insertions(+), 5 deletions(-) - -diff --git a/builtin/mainmenu/pkgmgr.lua b/builtin/mainmenu/pkgmgr.lua -index 787936e31..d8fba0ebe 100644 ---- a/builtin/mainmenu/pkgmgr.lua -+++ b/builtin/mainmenu/pkgmgr.lua -@@ -682,10 +682,9 @@ function pkgmgr.preparemodlist(data) - local game_mods = {} - - --read global mods -- local modpath = core.get_modpath() -- -- if modpath ~= nil and -- modpath ~= "" then -+ local modpaths = core.get_modpaths() -+ --XXX what was ‘modpath ~= ""’ and ‘modpath ~= nil’ for? -+ for _,modpath in ipairs(modpaths) do - get_mods(modpath,global_mods) - end - -diff --git a/doc/menu_lua_api.txt b/doc/menu_lua_api.txt -index b3975bc1d..132444b14 100644 ---- a/doc/menu_lua_api.txt -+++ b/doc/menu_lua_api.txt -@@ -218,7 +218,13 @@ Package - content which is downloadable from the content db, may or may not be i - * returns path to global user data, - the directory that contains user-provided mods, worlds, games, and texture packs. - * core.get_modpath() (possible in async calls) -- * returns path to global modpath -+ * returns path to global modpath, where mods can be installed -+* core.get_modpaths() (possible in async calls) -+ * returns list of paths to global modpaths, where mods have been installed -+ -+ The difference with "core.get_modpath" is that no mods should be installed in these -+ directories by Minetest -- they might be read-only. -+ - * core.get_clientmodpath() (possible in async calls) - * returns path to global client-side modpath - * core.get_gamepath() (possible in async calls) -diff --git a/src/content/subgames.cpp b/src/content/subgames.cpp -index e9dc609b0..d73f95a1f 100644 ---- a/src/content/subgames.cpp -+++ b/src/content/subgames.cpp -@@ -61,6 +61,12 @@ std::string getSubgamePathEnv() - return subgame_path ? std::string(subgame_path) : ""; - } - -+std::string getModPathEnv() -+{ -+ char *mod_path = getenv("MINETEST_MOD_PATH"); -+ return mod_path ? std::string(mod_path) : ""; -+} -+ - SubgameSpec findSubgame(const std::string &id) - { - if (id.empty()) -@@ -110,6 +116,11 @@ SubgameSpec findSubgame(const std::string &id) - std::set mods_paths; - if (!user_game) - mods_paths.insert(share + DIR_DELIM + "mods"); -+ -+ Strfnd mod_search_paths(getModPathEnv()); -+ while (!mod_search_paths.at_end()) -+ mods_paths.insert(mod_search_paths.next(PATH_DELIM)); -+ - if (user != share || user_game) - mods_paths.insert(user + DIR_DELIM + "mods"); - -diff --git a/src/script/lua_api/l_mainmenu.cpp b/src/script/lua_api/l_mainmenu.cpp -index 3e9709bde..903ac3a22 100644 ---- a/src/script/lua_api/l_mainmenu.cpp -+++ b/src/script/lua_api/l_mainmenu.cpp -@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc., - #include "lua_api/l_internal.h" - #include "common/c_content.h" - #include "cpp_api/s_async.h" -+#include "util/strfnd.h" - #include "gui/guiEngine.h" - #include "gui/guiMainMenu.h" - #include "gui/guiKeyChangeMenu.h" -@@ -502,6 +503,26 @@ int ModApiMainMenu::l_get_modpath(lua_State *L) - return 1; - } - -+/******************************************************************************/ -+int ModApiMainMenu::l_get_modpaths(lua_State *L) -+{ -+ const char *c_modpath = getenv("MINETEST_MOD_PATH"); -+ if (c_modpath == NULL) -+ c_modpath = ""; -+ int index = 1; -+ lua_newtable(L); -+ Strfnd mod_search_paths{std::string(c_modpath)}; -+ while (!mod_search_paths.at_end()) { -+ std::string component = mod_search_paths.next(PATH_DELIM); -+ lua_pushstring(L, component.c_str()); -+ lua_rawseti(L, -2, index); -+ index++; -+ } -+ ModApiMainMenu::l_get_modpath(L); -+ lua_rawseti(L, -2, index); -+ return 1; -+} -+ - /******************************************************************************/ - int ModApiMainMenu::l_get_clientmodpath(lua_State *L) - { -@@ -949,6 +970,7 @@ void ModApiMainMenu::Initialize(lua_State *L, int top) - API_FCT(get_mapgen_names); - API_FCT(get_user_path); - API_FCT(get_modpath); -+ API_FCT(get_modpaths); - API_FCT(get_clientmodpath); - API_FCT(get_gamepath); - API_FCT(get_texturepath); -@@ -983,6 +1005,7 @@ void ModApiMainMenu::InitializeAsync(lua_State *L, int top) - API_FCT(get_mapgen_names); - API_FCT(get_user_path); - API_FCT(get_modpath); -+ API_FCT(get_modpaths); - API_FCT(get_clientmodpath); - API_FCT(get_gamepath); - API_FCT(get_texturepath); -diff --git a/src/script/lua_api/l_mainmenu.h b/src/script/lua_api/l_mainmenu.h -index 33ac9e721..a6a54a2cb 100644 ---- a/src/script/lua_api/l_mainmenu.h -+++ b/src/script/lua_api/l_mainmenu.h -@@ -112,6 +112,8 @@ class ModApiMainMenu: public ModApiBase - - static int l_get_modpath(lua_State *L); - -+ static int l_get_modpaths(lua_State *L); -+ - static int l_get_clientmodpath(lua_State *L); - - static int l_get_gamepath(lua_State *L); --- -2.32.0 - -- cgit 1.4.1 From 64e78659f44b2275ae92de5d1adf12dc161a6ef2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 May 2022 02:00:03 +0200 Subject: gnu: irrlicht: Update to 1.8.5. * gnu/packages/games.scm (irrlicht): Update to 1.8.5. [source]: Use unmodified Debian patches rather than manually maintain a custom mash-up. [arguments]: Add a new 'delete-broken-install-rule phase instead. Don't explicitly return #t from phases. * gnu/packages/patches/irrlicht-link-against-needed-libs.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/games.scm | 20 +++-- .../irrlicht-link-against-needed-libs.patch | 24 ++++++ .../patches/irrlicht-use-system-libs.patch | 95 ++++++---------------- 4 files changed, 60 insertions(+), 80 deletions(-) create mode 100644 gnu/packages/patches/irrlicht-link-against-needed-libs.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index d51c1be0d3..708bbdd35d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1299,6 +1299,7 @@ dist_patch_DATA = \ %D%/packages/patches/iputils-libcap-compat.patch \ %D%/packages/patches/ipxe-reproducible-geniso.patch \ %D%/packages/patches/irrlicht-use-system-libs.patch \ + %D%/packages/patches/irrlicht-link-against-needed-libs.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \ %D%/packages/patches/itk-snap-alt-glibc-compat.patch \ %D%/packages/patches/json-c-0.13-CVE-2020-12762.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 5b48369cec..c5c3e8af18 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3532,7 +3532,7 @@ are primarily in English, however some in other languages are provided.") (define-public irrlicht (package (name "irrlicht") - (version "1.8.4") + (version "1.8.5") (source (origin (method url-fetch) (uri (string-append @@ -3541,8 +3541,9 @@ are primarily in English, however some in other languages are provided.") "/" version "/irrlicht-" version ".zip")) (sha256 (base32 - "0cz4z4dwrv5ypl19ll67wl6jjpy5k6ly4vr042w4br88qq5jhazl")) - (patches (search-patches "irrlicht-use-system-libs.patch")) + "0gagjh2l3a3m8hsixxhhhan3m5xl7735ka8m4g79jl4qsgp7pyzg")) + (patches (search-patches "irrlicht-use-system-libs.patch" + "irrlicht-link-against-needed-libs.patch")) (modules '((guix build utils))) (snippet '(begin @@ -3556,8 +3557,7 @@ are primarily in English, however some in other languages are provided.") "source/Irrlicht/zlib")) (delete-file "source/Irrlicht/glext.h") (delete-file "source/Irrlicht/glxext.h") - (delete-file "source/Irrlicht/wglext.h") - #t)))) + (delete-file "source/Irrlicht/wglext.h"))))) (build-system gnu-build-system) (arguments `(#:phases @@ -3565,19 +3565,23 @@ are primarily in English, however some in other languages are provided.") (add-after 'unpack 'chdir-to-source (lambda _ ;; The actual source is buried a few directories deep. - (chdir "source/Irrlicht/") - #t)) + (chdir "source/Irrlicht/"))) (add-after 'chdir-to-source 'remove- (lambda _ (substitute* "COSOperator.cpp" (("#include ") "")))) + (add-after 'chdir-to-source 'delete-broken-install-rule + (lambda _ + (substitute* "Makefile" + ;; We neither build nor want a static library. Skip it. + ((".*\\bcp .*\\$\\(STATIC_LIB\\).*") "")))) (add-after 'chdir-to-source 'fix-build-env (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (substitute* "Makefile" (("INSTALL_DIR = /usr/local/lib") (string-append "INSTALL_DIR = " out "/lib")) - ;; Add '-fpermissive' to the CXXFLAGS + ;; Add '-fpermissive' to the CXXFLAGS. (("-Wall") "-Wall -fpermissive")) ; CImageLoaderJPG.cpp ;; The Makefile assumes these directories exist. (mkdir-p (string-append out "/lib")) diff --git a/gnu/packages/patches/irrlicht-link-against-needed-libs.patch b/gnu/packages/patches/irrlicht-link-against-needed-libs.patch new file mode 100644 index 0000000000..2e9f5c78d5 --- /dev/null +++ b/gnu/packages/patches/irrlicht-link-against-needed-libs.patch @@ -0,0 +1,24 @@ +From: Christoph Egger +Subject: [PATCH] debian/link-against-needed-libs + +There are quite some libraries irrlicht needs but does not link +against. This patch makes irrlicht link correctly against all the +needed libraries. + +Signed-off-by: Christoph Egger + +--- + source/Irrlicht/Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +--- irrlicht.orig/source/Irrlicht/Makefile ++++ irrlicht/source/Irrlicht/Makefile +@@ -90,7 +90,7 @@ + LIB_PATH = ../../lib/$(SYSTEM) + INSTALL_DIR = /usr/local/lib + sharedlib install: SHARED_LIB = libIrrlicht.so +-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm ++staticlib sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lX11 -lz -lpng -ljpeg -lbz2 + staticlib sharedlib: CXXINCS += -I/usr/X11R6/include + + #OSX specific options diff --git a/gnu/packages/patches/irrlicht-use-system-libs.patch b/gnu/packages/patches/irrlicht-use-system-libs.patch index e764f411d3..06cb6db062 100644 --- a/gnu/packages/patches/irrlicht-use-system-libs.patch +++ b/gnu/packages/patches/irrlicht-use-system-libs.patch @@ -1,40 +1,13 @@ -This patch is a combination of the two following patches with minor -changes to the install code -https://sources.debian.org/src/irrlicht/1.8.4+dfsg1-1/debian/patches/debian/link-against-needed-libs.diff/ -https://sources.debian.org/src/irrlicht/1.8.4+dfsg1-1/debian/patches/debian/use-system-libs.diff/ +Subject: [PATCH] debian/use-system-libs +Path to build irrlicht using the system libraries for png,zlib and +jpeg as well as the glext family of header files. ---- - include/IrrCompileConfig.h | 26 +++++++++------------ - source/Irrlicht/CIrrDeviceLinux.h | 2 +- - source/Irrlicht/COpenGLExtensionHandler.h | 8 +++---- - source/Irrlicht/COpenGLSLMaterialRenderer.h | 2 +- - source/Irrlicht/Makefile | 15 ++++++------ - 5 files changed, 25 insertions(+), 28 deletions(-) +Signed-off-by: Christoph Egger @@ -99,10 +70,8 @@ index 4d2a2c6..8cf24ba 100644 #endif #endif -diff --git a/source/Irrlicht/COpenGLExtensionHandler.h b/source/Irrlicht/COpenGLExtensionHandler.h -index 1b77bad..3886a0e 100644 ---- a/source/Irrlicht/COpenGLExtensionHandler.h -+++ b/source/Irrlicht/COpenGLExtensionHandler.h +--- irrlicht.orig/source/Irrlicht/COpenGLExtensionHandler.h ++++ irrlicht/source/Irrlicht/COpenGLExtensionHandler.h @@ -35,7 +35,7 @@ #endif #include @@ -133,10 +102,8 @@ index 1b77bad..3886a0e 100644 #endif #endif -diff --git a/source/Irrlicht/COpenGLSLMaterialRenderer.h b/source/Irrlicht/COpenGLSLMaterialRenderer.h -index ff71150..f8a6007 100644 ---- a/source/Irrlicht/COpenGLSLMaterialRenderer.h -+++ b/source/Irrlicht/COpenGLSLMaterialRenderer.h +--- irrlicht.orig/source/Irrlicht/COpenGLSLMaterialRenderer.h ++++ irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h @@ -25,7 +25,7 @@ #include #endif @@ -146,11 +113,9 @@ index ff71150..f8a6007 100644 #endif #endif -diff --git a/source/Irrlicht/Makefile b/source/Irrlicht/Makefile -index 67a3899..d9ea7f3 100644 ---- a/source/Irrlicht/Makefile -+++ b/source/Irrlicht/Makefile -@@ -43,7 +43,7 @@ IRRIMAGEOBJ = CColorConverter.o CImage.o CImageLoaderBMP.o CImageLoaderDDS.o CIm +--- irrlicht.orig/source/Irrlicht/Makefile ++++ irrlicht/source/Irrlicht/Makefile +@@ -45,7 +45,7 @@ CImageWriterBMP.o CImageWriterJPG.o CImageWriterPCX.o CImageWriterPNG.o CImageWriterPPM.o CImageWriterPSD.o CImageWriterTGA.o IRRVIDEOOBJ = CVideoModeList.o CFPSCounter.o $(IRRDRVROBJ) $(IRRIMAGEOBJ) IRRSWRENDEROBJ = CSoftwareDriver.o CSoftwareTexture.o CTRFlat.o CTRFlatWire.o CTRGouraud.o CTRGouraudWire.o CTRNormalMap.o CTRStencilShadow.o CTRTextureFlat.o CTRTextureFlatWire.o CTRTextureGouraud.o CTRTextureGouraudAdd.o CTRTextureGouraudNoZ.o CTRTextureGouraudWire.o CZBuffer.o CTRTextureGouraudVertexAlpha2.o CTRTextureGouraudNoZ2.o CTRTextureLightMap2_M2.o CTRTextureLightMap2_M4.o CTRTextureLightMap2_M1.o CSoftwareDriver2.o CSoftwareTexture2.o CTRTextureGouraud2.o CTRGouraud2.o CTRGouraudAlpha2.o CTRGouraudAlphaNoZ2.o CTRTextureDetailMap2.o CTRTextureGouraudAdd2.o CTRTextureGouraudAddNoZ2.o CTRTextureWire2.o CTRTextureLightMap2_Add.o CTRTextureLightMapGouraud2_M4.o IBurningShader.o CTRTextureBlend.o CTRTextureGouraudAlpha.o CTRTextureGouraudAlphaNoZ.o CDepthBuffer.o CBurningShader_Raster_Reference.o @@ -159,7 +124,7 @@ index 67a3899..d9ea7f3 100644 IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o IRRGUIOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o CGUIModalScreen.o CGUIScrollBar.o CGUISpinBox.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUITable.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o CGUIImageList.o CGUITreeView.o ZLIBOBJ = zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o -@@ -56,14 +56,14 @@ BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o +@@ -58,14 +58,14 @@ EXTRAOBJ = LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \ $(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \ @@ -178,25 +143,11 @@ index 67a3899..d9ea7f3 100644 ifndef NDEBUG CXXFLAGS += -g -D_DEBUG else -@@ -88,7 +88,7 @@ STATIC_LIB = libIrrlicht.a - LIB_PATH = ../../lib/$(SYSTEM) - INSTALL_DIR = /usr/local/lib - sharedlib install: SHARED_LIB = libIrrlicht.so --sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -+staticlib sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lX11 -lz -lpng -ljpeg -lbz2 - staticlib sharedlib: CXXINCS += -I/usr/X11R6/include - - #OSX specific options -@@ -153,7 +153,8 @@ install install_osx: - $(RM) -r $(INSTALL_DIR)/../include/irrlicht +@@ -156,6 +156,7 @@ mkdir -p $(INSTALL_DIR)/../include/irrlicht cp ../../include/*.h $(INSTALL_DIR)/../include/irrlicht/ -- cp $(LIB_PATH)/$(SHARED_FULLNAME) $(INSTALL_DIR) -+ cp $(LIB_PATH)/$(SHARED_FULLNAME) $(INSTALL_DIR) || true -+ cp $(LIB_PATH)/$(STATIC_LIB) $(INSTALL_DIR) || true + cp $(LIB_PATH)/$(SHARED_FULLNAME) $(INSTALL_DIR) ++ cp $(LIB_PATH)/$(STATIC_LIB) $(INSTALL_DIR) cd $(INSTALL_DIR) && ln -s -f $(SHARED_FULLNAME) $(SONAME) cd $(INSTALL_DIR) && ln -s -f $(SONAME) $(SHARED_LIB) # ldconfig -n $(INSTALL_DIR) --- -2.18.0 - -- cgit 1.4.1 From ce6d8ca4430e7df27c77e116a677679f241551da Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 5 Jun 2022 20:03:56 -0700 Subject: gnu: ncftp: Build reproducibly. * gnu/packages/patches/ncftp-reproducible.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/ftp.scm (ncftp): Add patch. --- gnu/local.mk | 1 + gnu/packages/ftp.scm | 3 +++ gnu/packages/patches/ncftp-reproducible.patch | 29 +++++++++++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 gnu/packages/patches/ncftp-reproducible.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 708bbdd35d..68b317b32a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1519,6 +1519,7 @@ dist_patch_DATA = \ %D%/packages/patches/m4-gnulib-libio.patch \ %D%/packages/patches/nautilus-add-libportal-gtk3.patch \ %D%/packages/patches/ncompress-fix-softlinks.patch \ + %D%/packages/patches/ncftp-reproducible.patch \ %D%/packages/patches/netcdf-date-time.patch \ %D%/packages/patches/netpbm-CVE-2017-2586.patch \ %D%/packages/patches/netpbm-CVE-2017-2587.patch \ diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index cf6cdb630f..3f17dcf407 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -103,6 +103,9 @@ reliability in mind.") (sha256 (base32 "1389657cwgw5a3kljnqmhvfh4vr2gcr71dwz1mlhf22xq23hc82z")) + (patches + (search-patches + "ncftp-reproducible.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/ncftp-reproducible.patch b/gnu/packages/patches/ncftp-reproducible.patch new file mode 100644 index 0000000000..043b3b1e70 --- /dev/null +++ b/gnu/packages/patches/ncftp-reproducible.patch @@ -0,0 +1,29 @@ +Author: Reiner Herrmann +Date: 2016-07-01 16:00:02 UTC +Bug-Debian: https://bugs.debian.org/829249 + + make ncftp build reproducible. + +diff --git a/ncftp/main.c b/ncftp/main.c +index a7fccac..b27a94e 100644 +--- a/ncftp/main.c ++++ b/ncftp/main.c +@@ -62,7 +62,7 @@ static void + Usage(void) + { + FILE *fp; +-#ifdef UNAME ++#if 0 + char s[80]; + #endif + +@@ -76,7 +76,7 @@ Usage(void) + -F Dump a sample $HOME/.ncftp/firewall prefs file to stdout and exit.\n"); + + (void) fprintf(fp, "\nProgram version: %s\nLibrary version: %s\n", gVersion + 5, gLibNcFTPVersion + 5); +-#ifdef UNAME ++#if 0 + AbbrevStr(s, UNAME, 60, 1); + (void) fprintf(fp, "Build system: %s\n", s); + #endif + -- cgit 1.4.1 From 49a47bdcc5fb6dd8363917ea005fb51155c8e266 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 7 Jun 2022 09:22:35 +0300 Subject: gnu: python-flake8-polyfill: Fix building with python-flake8@4. * gnu/packages/python-xyz.scm (python-flake8-polyfill)[source]: Add patch. * gnu/packages/patches/python-flake8-polyfill-flake8-4-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + .../python-flake8-polyfill-flake8-4-compat.patch | 32 ++++++++++++++++++++++ gnu/packages/python-xyz.scm | 3 +- 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/python-flake8-polyfill-flake8-4-compat.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 68b317b32a..4e58df6ff7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1593,6 +1593,7 @@ dist_patch_DATA = \ %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \ %D%/packages/patches/pthreadpool-system-libraries.patch \ %D%/packages/patches/python-chai-drop-python2.patch \ + %D%/packages/patches/python-flake8-polyfill-flake8-4-compat.patch \ %D%/packages/patches/python-random2-getrandbits-test.patch \ %D%/packages/patches/python-poppler-qt5-fix-build.patch \ %D%/packages/patches/python-w3lib-fix-test-failure.patch \ diff --git a/gnu/packages/patches/python-flake8-polyfill-flake8-4-compat.patch b/gnu/packages/patches/python-flake8-polyfill-flake8-4-compat.patch new file mode 100644 index 0000000000..7f5babd07d --- /dev/null +++ b/gnu/packages/patches/python-flake8-polyfill-flake8-4-compat.patch @@ -0,0 +1,32 @@ +https://github.com/PyCQA/flake8-polyfill/commit/3cf414350e82ceb835ca2edbd5d5967d33e9ff35.patch + + +From 3cf414350e82ceb835ca2edbd5d5967d33e9ff35 Mon Sep 17 00:00:00 2001 +From: Ian Stapleton Cordasco +Date: Mon, 1 Nov 2021 19:18:04 -0500 +Subject: [PATCH] Skip unnecessary tests on Flake8 4.x+ + +--- + tests/test_stdin.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tests/test_stdin.py b/tests/test_stdin.py +index 4350967..212b309 100644 +--- a/tests/test_stdin.py ++++ b/tests/test_stdin.py +@@ -1,4 +1,5 @@ + """Tests for polyfill's stdin monkey patching.""" ++import flake8 + import pep8 + import pycodestyle + import pytest +@@ -6,6 +7,9 @@ + from flake8_polyfill import stdin + from flake8_polyfill import version + ++if (4, 0, 0) <= flake8.__version_info__: ++ pytestmark = pytest.mark.skip ++ + + def test_modules_dict(): + """Verify that it works the way we expect.""" diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b9af0d4a3f..d5ad05f4d9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10359,7 +10359,8 @@ unnecessary plus operators for explicit string literal concatenation.") (uri (pypi-uri "flake8-polyfill" version)) (sha256 (base32 - "1nlf1mkqw856vi6782qcglqhaacb23khk9wkcgn55npnjxshhjz4")))) + "1nlf1mkqw856vi6782qcglqhaacb23khk9wkcgn55npnjxshhjz4")) + (patches (search-patches "python-flake8-polyfill-flake8-4-compat.patch")))) (build-system python-build-system) (arguments '(#:phases -- cgit 1.4.1 From 413b85ad4f033354038ba3a65948de029a5e638d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 7 Jun 2022 19:11:48 +0300 Subject: gnu: Remove unused patch. * gnu/packages/patches/python-flake8-polyfill-flake8-4-compat.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../python-flake8-polyfill-flake8-4-compat.patch | 32 ---------------------- 2 files changed, 33 deletions(-) delete mode 100644 gnu/packages/patches/python-flake8-polyfill-flake8-4-compat.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 4e58df6ff7..68b317b32a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1593,7 +1593,6 @@ dist_patch_DATA = \ %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \ %D%/packages/patches/pthreadpool-system-libraries.patch \ %D%/packages/patches/python-chai-drop-python2.patch \ - %D%/packages/patches/python-flake8-polyfill-flake8-4-compat.patch \ %D%/packages/patches/python-random2-getrandbits-test.patch \ %D%/packages/patches/python-poppler-qt5-fix-build.patch \ %D%/packages/patches/python-w3lib-fix-test-failure.patch \ diff --git a/gnu/packages/patches/python-flake8-polyfill-flake8-4-compat.patch b/gnu/packages/patches/python-flake8-polyfill-flake8-4-compat.patch deleted file mode 100644 index 7f5babd07d..0000000000 --- a/gnu/packages/patches/python-flake8-polyfill-flake8-4-compat.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://github.com/PyCQA/flake8-polyfill/commit/3cf414350e82ceb835ca2edbd5d5967d33e9ff35.patch - - -From 3cf414350e82ceb835ca2edbd5d5967d33e9ff35 Mon Sep 17 00:00:00 2001 -From: Ian Stapleton Cordasco -Date: Mon, 1 Nov 2021 19:18:04 -0500 -Subject: [PATCH] Skip unnecessary tests on Flake8 4.x+ - ---- - tests/test_stdin.py | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/tests/test_stdin.py b/tests/test_stdin.py -index 4350967..212b309 100644 ---- a/tests/test_stdin.py -+++ b/tests/test_stdin.py -@@ -1,4 +1,5 @@ - """Tests for polyfill's stdin monkey patching.""" -+import flake8 - import pep8 - import pycodestyle - import pytest -@@ -6,6 +7,9 @@ - from flake8_polyfill import stdin - from flake8_polyfill import version - -+if (4, 0, 0) <= flake8.__version_info__: -+ pytestmark = pytest.mark.skip -+ - - def test_modules_dict(): - """Verify that it works the way we expect.""" -- cgit 1.4.1