diff options
| author | hapster <o.rojon@posteo.net> | 2024-05-26 08:42:10 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2024-06-30 12:06:11 +0200 |
| commit | c7b009285ec2ab7a27747de40f28e6ecfba82922 (patch) | |
| tree | 998dfcfe338194b1a1adfc2097c801872c1f510e /gnu/packages/patches | |
| parent | 103e9db1573275118d435a15f5fbe752734cc248 (diff) | |
gnu: mixxx: Update to 2.4.1.
* gnu/packages/music (mixxx): Update to 2.4.1.
* gnu/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch,
gnu/packages/patches/mixxx-system-googletest-benchmark.patch: Remove
files.
* gnu/local.mk (dist_patch_DATA): Unregister patches.
Change-Id: I2ee0f2848dba7a917598a97a295d838bc0656716
Signed-off-by: Andreas Enge <andreas@enge.fr>
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch | 25 | ||||
| -rw-r--r-- | gnu/packages/patches/mixxx-system-googletest-benchmark.patch | 43 |
2 files changed, 0 insertions, 68 deletions
diff --git a/gnu/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch b/gnu/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch deleted file mode 100644 index d7cd1c0d28..0000000000 --- a/gnu/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7554aefc886d4ebc4b4c139a5cddcab6163cf72f Mon Sep 17 00:00:00 2001 -From: Vinicius Monego <monego@posteo.net> -Date: Thu, 30 Sep 2021 23:37:29 -0300 -Subject: [PATCH] Link QtScriptByteArray with QtScript. - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 492ccae..05fec08 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2077,7 +2077,7 @@ add_library(QtScriptByteArray STATIC EXCLUDE_FROM_ALL - lib/qtscript-bytearray/bytearrayprototype.cpp - ) - set_target_properties(QtScriptByteArray PROPERTIES AUTOMOC ON) --target_link_libraries(QtScriptByteArray Qt5::Core) -+target_link_libraries(QtScriptByteArray Qt5::Core Qt5::Script) - target_include_directories(mixxx-lib SYSTEM PUBLIC lib/qtscript-bytearray) - target_link_libraries(mixxx-lib PRIVATE QtScriptByteArray) - --- -2.30.2 - diff --git a/gnu/packages/patches/mixxx-system-googletest-benchmark.patch b/gnu/packages/patches/mixxx-system-googletest-benchmark.patch deleted file mode 100644 index 7adbe66208..0000000000 --- a/gnu/packages/patches/mixxx-system-googletest-benchmark.patch +++ /dev/null @@ -1,43 +0,0 @@ -From eb2079d467f8658eea13e2ed86cc69d864632866 Mon Sep 17 00:00:00 2001 -From: Vinicius Monego <monego@posteo.net> -Date: Wed, 29 Sep 2021 19:07:35 -0300 -Subject: [PATCH] Use system googletest and benchmark. - ---- - CMakeLists.txt | 13 +++---------- - 1 file changed, 3 insertions(+), 10 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 10e9b0a..492ccae 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1467,12 +1467,7 @@ set(gtest_force_shared_crt ON CACHE BOOL "Pass Mixxx compiler/linker options to - # Prevent installation of GoogleTest libraries - set(INSTALL_GTEST OFF CACHE BOOL "Disable installation of GoogleTest" FORCE) - --# Add googletest directly to our build. This adds the following targets: --# gtest, gtest_main, gmock and gmock_main --add_subdirectory( -- "${CMAKE_CURRENT_SOURCE_DIR}/lib/googletest" -- "${CMAKE_CURRENT_BINARY_DIR}/lib/googletest" --) -+find_package(GTest CONFIG REQUIRED) - - add_executable(mixxx-test - src/test/analyserwaveformtest.cpp -@@ -1582,10 +1577,8 @@ set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "" FORCE) - # Prevent installation of google/benchmark artifacts - set(BENCHMARK_ENABLE_INSTALL OFF CACHE BOOL "Disable installation of google/benchmark" FORCE) - --add_subdirectory( -- "${CMAKE_CURRENT_SOURCE_DIR}/lib/benchmark" -- "${CMAKE_CURRENT_BINARY_DIR}/lib/benchmark" --) -+find_package(benchmark CONFIG REQUIRED) -+ - target_link_libraries(mixxx-test PRIVATE benchmark) - - # Test Suite --- -2.30.2 - |