diff --git a/.files b/.files index 8f20996..107d264 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 0d00188..8064d13 100644 --- a/.rev +++ b/.rev @@ -7,4 +7,12 @@ New package 990589 + + fa335e9b1a0435dab347be776b5d1389 + 1.4.3 + + dimstar_suse + + 1077209 + diff --git a/0001-Add-missing-UsbDeviceMock-for-MustangTest.patch b/0001-Add-missing-UsbDeviceMock-for-MustangTest.patch new file mode 100644 index 0000000..10ab1e8 --- /dev/null +++ b/0001-Add-missing-UsbDeviceMock-for-MustangTest.patch @@ -0,0 +1,31 @@ +From db01f0ca6dc31cc0fec965e5b056cda4fbe82ac8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20Br=C3=BCns?= +Date: Mon, 18 Jul 2022 22:52:18 +0200 +Subject: [PATCH] Add missing UsbDeviceMock for MustangTest + +When the test is linked with -Wl,--no-undefined, LD detects the missing +`plug::com::usb::Device::receive(unsigned char, unsigned long)` and +similar, required from UsbComm. + +(The test does not actually call any of the missing functions, but the +linker is not able to detect this, in general. With LTO, the undefined +but unused symbols are removed completely.) +--- + test/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index b61a3ef..38bbcb9 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -24,6 +24,7 @@ target_link_libraries(MustangTest PRIVATE + plug-communication + TestLibs + LibUsbMocks ++ UsbDeviceMock + ) + + +-- +2.37.0 + diff --git a/0001-Build-helper-libraries-as-OBJECT-libraries.patch b/0001-Build-helper-libraries-as-OBJECT-libraries.patch index 1ab8b1c..58cc9da 100644 --- a/0001-Build-helper-libraries-as-OBJECT-libraries.patch +++ b/0001-Build-helper-libraries-as-OBJECT-libraries.patch @@ -1,13 +1,14 @@ -From b1981342d58c9da1b71100f34967a90378f75cb2 Mon Sep 17 00:00:00 2001 +From 94c1f8fa0764aab7eaee1a56160565e098073e08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Mon, 18 Jul 2022 18:23:37 +0200 Subject: [PATCH] Build helper libraries as OBJECT libraries --- - cmake/Template.cmake | 2 +- - src/com/CMakeLists.txt | 10 +++++----- - src/ui/CMakeLists.txt | 3 ++- - 3 files changed, 8 insertions(+), 7 deletions(-) + cmake/Template.cmake | 2 +- + src/com/CMakeLists.txt | 10 +++++----- + src/ui/CMakeLists.txt | 3 ++- + test/mocks/CMakeLists.txt | 4 ++-- + 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/cmake/Template.cmake b/cmake/Template.cmake index e7cfc25..6d04608 100644 @@ -60,6 +61,21 @@ index 5baab0c..1680247 100644 amplifier.cpp defaulteffects.cpp effect.cpp +diff --git a/test/mocks/CMakeLists.txt b/test/mocks/CMakeLists.txt +index fd87c49..d7877d7 100644 +--- a/test/mocks/CMakeLists.txt ++++ b/test/mocks/CMakeLists.txt +@@ -1,8 +1,8 @@ +-add_library(LibUsbMocks LibUsbMocks.cpp) ++add_library(LibUsbMocks OBJECT LibUsbMocks.cpp) + target_link_libraries(LibUsbMocks PRIVATE TestLibs) + target_include_directories(LibUsbMocks PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}") + +-add_library(UsbDeviceMock UsbDeviceMock.cpp) ++add_library(UsbDeviceMock OBJECT UsbDeviceMock.cpp) + target_link_libraries(UsbDeviceMock PRIVATE TestLibs) + + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") -- 2.37.0 diff --git a/add_missing_cstdint.patch b/add_missing_cstdint.patch new file mode 100644 index 0000000..8d29ab9 --- /dev/null +++ b/add_missing_cstdint.patch @@ -0,0 +1,21 @@ +From 79bdcbc2ed1209761d9a29795384b39b0dba5ca8 Mon Sep 17 00:00:00 2001 +From: offa +Date: Wed, 1 Feb 2023 16:50:22 +0100 +Subject: [PATCH] Add missing include (#268) + +--- + include/com/Packet.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/com/Packet.h b/include/com/Packet.h +index 6d8830f..0d0392a 100644 +--- a/include/com/Packet.h ++++ b/include/com/Packet.h +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + namespace plug::com + { diff --git a/mustang-plug.changes b/mustang-plug.changes index fe042c1..b05997c 100644 --- a/mustang-plug.changes +++ b/mustang-plug.changes @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Tue Apr 4 09:06:02 UTC 2023 - Stefan Brüns + +- Fix build with GCC 13, add add_missing_cstdint.patch + +------------------------------------------------------------------- +Mon Jul 18 20:53:14 UTC 2022 - Stefan Brüns + +- Fix failing builds of tests on Leap 15.x, + add 0001-Add-missing-UsbDeviceMock-for-MustangTest.patch, + update 0001-Build-helper-libraries-as-OBJECT-libraries.patch + +------------------------------------------------------------------- Mon Jul 18 16:00:19 UTC 2022 - Stefan Brüns - Initial package version (1.4.3) diff --git a/mustang-plug.spec b/mustang-plug.spec index 81e959f..5832e2e 100644 --- a/mustang-plug.spec +++ b/mustang-plug.spec @@ -26,6 +26,8 @@ Source0: https://github.com/offa/plug/archive/refs/tags/v%{version}.tar.g Source1: mustang-plug.svg Patch0: 0001-Build-helper-libraries-as-OBJECT-libraries.patch Patch1: 0001-Improve-udev-rules-add-uaccess-support.patch +Patch2: 0001-Add-missing-UsbDeviceMock-for-MustangTest.patch +Patch3: https://github.com/offa/plug/commit/79bdcbc2ed12.patch#/add_missing_cstdint.patch BuildRequires: cmake BuildRequires: hicolor-icon-theme BuildRequires: cmake(Qt5Core)