public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/xeus] epel10: Remove unused patches.
@ 2026-07-11 22:27 Elliott Sales de Andrade
0 siblings, 0 replies; only message in thread
From: Elliott Sales de Andrade @ 2026-07-11 22:27 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/xeus
Branch : epel10
Commit : 935864ea0ec4a2bbcbf0fde36e93c5cee16120c8
Author : Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date : 2019-09-23T20:14:57-04:00
Stats : +0/-230 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/xeus/c/935864ea0ec4a2bbcbf0fde36e93c5cee16120c8?branch=epel10
Log:
Remove unused patches.
---
diff --git a/0001-Don-t-set-_any_-options-if-DISABLE_ARCH_NATIVE-ON.patch b/0001-Don-t-set-_any_-options-if-DISABLE_ARCH_NATIVE-ON.patch
deleted file mode 100644
index 389c248..0000000
--- a/0001-Don-t-set-_any_-options-if-DISABLE_ARCH_NATIVE-ON.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From c15a7b64d1ab035dbdf0f4fdb0bada91cc4495f8 Mon Sep 17 00:00:00 2001
-From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
-Date: Sat, 7 Sep 2019 20:42:41 -0400
-Subject: [PATCH] Don't set _any_ options if DISABLE_ARCH_NATIVE=ON.
-
-On some platforms (e.g., s390x), even -mtune=generic is not allowed, so
-just don't pass anything.
-
-Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
----
- CMakeLists.txt | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a331df6..9d54cf3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -236,9 +236,7 @@ macro(xeus_create_target target_name linkage output_name)
-
- target_compile_options(${target_name} PUBLIC -Wunused-parameter -Wextra -Wreorder)
-
-- if (DISABLE_ARCH_NATIVE)
-- target_compile_options(${target_name} PUBLIC -mtune=generic)
-- else ()
-+ if (NOT DISABLE_ARCH_NATIVE)
- target_compile_options(${target_name} PUBLIC -march=native)
- endif ()
-
---
-2.21.0
-
diff --git a/184.patch b/184.patch
deleted file mode 100644
index 2615a6b..0000000
--- a/184.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From aba9b9899f38849f6ac6ad668c72083efd92e4c9 Mon Sep 17 00:00:00 2001
-From: Sylvain Corlay <sylvain.corlay@gmail.com>
-Date: Thu, 5 Sep 2019 00:31:00 +0200
-Subject: [PATCH] Do not use MDC2
-
----
- CMakeLists.txt | 2 +-
- src/xauthentication.cpp | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fb91263..a331df6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -49,7 +49,7 @@ message(STATUS "xeus binary version: v${XEUS_BINARY_VERSION}")
- set(nlohmann_json_REQUIRED_VERSION 3.2.0)
- set(xtl_REQUIRED_VERSION 0.5)
- set(cppzmq_REQUIRED_VERSION 4.3.0)
--set(zeromq_REQUIRED_VERSION 4.2.3)
-+set(zeromq_REQUIRED_VERSION 4.2.5)
-
- find_package(nlohmann_json ${nlohmann_json_REQUIRED_VERSION} REQUIRED)
- find_package(xtl ${xtl_REQUIRED_VERSION} REQUIRED)
-diff --git a/src/xauthentication.cpp b/src/xauthentication.cpp
-index 8039fa9..ff95141 100644
---- a/src/xauthentication.cpp
-+++ b/src/xauthentication.cpp
-@@ -108,7 +108,8 @@ namespace xeus
- static const std::map<std::string, const EVP_MD*(*)()> schemes = {
- {"hmac-md5", EVP_md5},
- {"hmac-sha1", EVP_sha1},
-- {"hmac-mdc2", EVP_mdc2},
-+ // MDC2 is disabled by default unless enable-mdc2 is specified
-+ // {"hmac-mdc2", EVP_mdc2},
- {"hmac-ripemd160", EVP_ripemd160},
- #if OPENSSL_VERSION_NUMBER >= 0x10100000L
- {"hmac-blake2b512", EVP_blake2b512},
diff --git a/fix-tests-cmake.patch b/fix-tests-cmake.patch
deleted file mode 100644
index d8ac7ca..0000000
--- a/fix-tests-cmake.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a331df6..228fb0b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -301,14 +301,14 @@ endif ()
- # Tests
- # =====
-
--OPTION(BUILD_TESTS "xeus test suite" OFF)
-+include(CTest)
- OPTION(DOWNLOAD_GTEST "build gtest from downloaded sources" OFF)
-
- if(DOWNLOAD_GTEST OR GTEST_SRC_DIR)
-- set(BUILD_TESTS ON)
-+ set(BUILD_TESTING ON)
- endif()
-
--if(BUILD_TESTS)
-+if(BUILD_TESTING)
- add_subdirectory(test)
- endif()
-
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 4061248..e04d98d 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -81,6 +81,9 @@ endif()
-
- find_package(Threads)
-
-+find_program(PYTEST
-+ NAMES pytest-3 pytest py.test-3 py.test)
-+
- include_directories(${GTEST_INCLUDE_DIRS})
-
- set(XEUS_TESTS
-@@ -115,23 +118,21 @@ foreach(filename IN LISTS XEUS_TESTS)
- add_test(NAME ${targetname} COMMAND ${targetname})
- endforeach()
-
--add_executable(test_xeus ${XEUS_TESTS} ${XEUS_HEADERS})
- if(DOWNLOAD_GTEST OR GTEST_SRC_DIR)
-- add_dependencies(test_xeus gtest_main)
--
- # https://github.com/QuantStack/xeus/pull/126
-+ # This should really just be post gtest and gtest_main targets, but CMake
-+ # won't allow us to do that. So do it after the last test (which depends on
-+ # those anyway.)
- if (BUILD_SHARED_LIBS)
- add_custom_command(
-- TARGET test_xeus POST_BUILD
-+ TARGET ${targetname} POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:gtest>" "${CMAKE_CURRENT_BINARY_DIR}/")
-+
- add_custom_command(
-- TARGET test_xeus POST_BUILD
-+ TARGET ${targetname} POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:gtest_main>" "${CMAKE_CURRENT_BINARY_DIR}/")
- endif ()
- endif()
--target_link_libraries(test_xeus ${xeus_TARGET} ${GTEST_BOTH_LIBRARIES} Threads::Threads ${nlohmann_json_TARGET})
--
--add_custom_target(xtest COMMAND test_xeus DEPENDS test_xeus)
-
- # Test_kernel tests
- # =================
-@@ -141,9 +142,9 @@ set(TEST_KERNEL_SOURCES
- test_interpreter.hpp
- main.cpp)
-
--configure_file (
-+configure_file(
- "${XEUS_TEST_DIR}/test_kernel/kernel.json.in"
-- "${XEUS_TEST_DIR}/test_kernel/kernel.json"
-+ "kernels/test_kernel/kernel.json"
- )
-
- add_executable(test_kernel ${TEST_KERNEL_SOURCES})
-@@ -153,12 +154,16 @@ target_compile_features(test_kernel PRIVATE cxx_std_11)
-
- set(CONNECTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/connection.json)
-
--add_custom_command(
-- TARGET test_kernel POST_BUILD
-- COMMAND jupyter-kernelspec install "${XEUS_TEST_DIR}/test_kernel" --sys-prefix)
--add_custom_command(
-- TARGET test_kernel POST_BUILD
-- COMMAND ${CMAKE_COMMAND} -E copy "${XEUS_TEST_DIR}/test_kernel.py" "${CMAKE_CURRENT_BINARY_DIR}/")
-+configure_file(
-+ "${XEUS_TEST_DIR}/test_kernel.py"
-+ "${CMAKE_CURRENT_BINARY_DIR}/"
-+ COPYONLY)
-+
-+add_test(NAME test_kernel
-+ COMMAND ${PYTEST} test_kernel.py)
-+set_tests_properties(test_kernel
-+ PROPERTIES
-+ ENVIRONMENT "JUPYTER_PATH=${CMAKE_CURRENT_BINARY_DIR}")
-
- # Test_kernel_control tests
- # =========================
-@@ -170,7 +175,7 @@ set(TEST_KERNEL_SPLIT_SOURCES
-
- configure_file(
- "${XEUS_TEST_DIR}/test_kernel_control/kernel.json.in"
-- "${XEUS_TEST_DIR}/test_kernel_control/kernel.json"
-+ "kernels/test_kernel_control/kernel.json"
- )
-
- add_executable(test_kernel_control ${TEST_KERNEL_SPLIT_SOURCES})
-@@ -180,12 +185,16 @@ target_compile_features(test_kernel_control PRIVATE cxx_std_11)
-
- set(CONNECTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/connection.json)
-
--add_custom_command(
-- TARGET test_kernel_control POST_BUILD
-- COMMAND jupyter-kernelspec install "${XEUS_TEST_DIR}/test_kernel_control" --sys-prefix)
--add_custom_command(
-- TARGET test_kernel_control POST_BUILD
-- COMMAND ${CMAKE_COMMAND} -E copy "${XEUS_TEST_DIR}/test_kernel_control.py" "${CMAKE_CURRENT_BINARY_DIR}/")
-+configure_file(
-+ "${XEUS_TEST_DIR}/test_kernel_control.py"
-+ "${CMAKE_CURRENT_BINARY_DIR}/"
-+ COPYONLY)
-+
-+add_test(NAME test_kernel_control
-+ COMMAND ${PYTEST} test_kernel_control.py)
-+set_tests_properties(test_kernel_control
-+ PROPERTIES
-+ ENVIRONMENT "JUPYTER_PATH=${CMAKE_CURRENT_BINARY_DIR}")
-
- # Test_kernel_shell tests
- # =======================
-@@ -197,7 +206,7 @@ set(TEST_KERNEL_SPLIT_SOURCES
-
- configure_file(
- "${XEUS_TEST_DIR}/test_kernel_shell/kernel.json.in"
-- "${XEUS_TEST_DIR}/test_kernel_shell/kernel.json"
-+ "kernels/test_kernel_shell/kernel.json"
- )
-
- add_executable(test_kernel_shell ${TEST_KERNEL_SPLIT_SOURCES})
-@@ -207,9 +216,13 @@ target_compile_features(test_kernel_shell PRIVATE cxx_std_11)
-
- set(CONNECTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/connection.json)
-
--add_custom_command(
-- TARGET test_kernel_shell POST_BUILD
-- COMMAND jupyter-kernelspec install "${XEUS_TEST_DIR}/test_kernel_shell" --sys-prefix)
--add_custom_command(
-- TARGET test_kernel_shell POST_BUILD
-- COMMAND ${CMAKE_COMMAND} -E copy "${XEUS_TEST_DIR}/test_kernel_shell.py" "${CMAKE_CURRENT_BINARY_DIR}/")
-+configure_file(
-+ "${XEUS_TEST_DIR}/test_kernel_shell.py"
-+ "${CMAKE_CURRENT_BINARY_DIR}/"
-+ COPYONLY)
-+
-+add_test(NAME test_kernel_shell
-+ COMMAND ${PYTEST} test_kernel_shell.py)
-+set_tests_properties(test_kernel_shell
-+ PROPERTIES
-+ ENVIRONMENT "JUPYTER_PATH=${CMAKE_CURRENT_BINARY_DIR}")
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-07-11 22:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-11 22:27 [rpms/xeus] epel10: Remove unused patches Elliott Sales de Andrade
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox