diff options
| author | Michele Guerini Rocco <rnhmjoj@users.noreply.github.com> | 2021-05-02 13:53:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-02 13:53:40 +0200 |
| commit | d5fe3a127079ecb1c15569b80d61bb36b60ab50e (patch) | |
| tree | e5c313d5b7ae9c966afa2408f877110d60c1e7cf /pkgs/applications/blockchains/monero-gui/use-system-libquirc.patch | |
| parent | d50819f1a17cdd661779d82c35d000eddb9a1ea0 (diff) | |
| parent | 3227f676cb168b9310b0f386e37ad706c1f84b8c (diff) | |
Merge pull request #121488 from rnhmjoj/monero
quirc: 2016-08-16 -> 2020-04-06; monero: 0.17.1.9 -> 0.17.2.0; monero-gui: 0.17.1.9 -> 0.17.2.1
Diffstat (limited to 'pkgs/applications/blockchains/monero-gui/use-system-libquirc.patch')
| -rw-r--r-- | pkgs/applications/blockchains/monero-gui/use-system-libquirc.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/pkgs/applications/blockchains/monero-gui/use-system-libquirc.patch b/pkgs/applications/blockchains/monero-gui/use-system-libquirc.patch new file mode 100644 index 0000000000000..b60057294b109 --- /dev/null +++ b/pkgs/applications/blockchains/monero-gui/use-system-libquirc.patch @@ -0,0 +1,37 @@ +diff --git a/src/QR-Code-scanner/CMakeLists.txt b/src/QR-Code-scanner/CMakeLists.txt +index 15e288df..2e9b3305 100644 +--- a/src/QR-Code-scanner/CMakeLists.txt ++++ b/src/QR-Code-scanner/CMakeLists.txt +@@ -1,11 +1,18 @@ ++find_library(QUIRC_LIBRARY quirc REQUIRED) ++find_path(QUIRC_INCLUDE_DIR quirc.h REQUIRED) ++ + add_library(qrdecoder STATIC + Decoder.cpp + ) ++target_include_directories(qrdecoder ++ PUBLIC ++ ${QUIRC_INCLUDE_DIR} ++) + target_link_libraries(qrdecoder + PUBLIC + Qt5::Gui + PRIVATE +- quirc ++ ${QUIRC_LIBRARY} + ) + + if(WITH_SCANNER) +diff --git a/src/QR-Code-scanner/Decoder.cpp b/src/QR-Code-scanner/Decoder.cpp +index 1bb99140..353ca189 100644 +--- a/src/QR-Code-scanner/Decoder.cpp ++++ b/src/QR-Code-scanner/Decoder.cpp +@@ -30,7 +30,7 @@ + + #include <limits> + +-#include "quirc.h" ++#include <quirc.h> + + QrDecoder::QrDecoder() + : m_qr(quirc_new()) |