diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..c57440e --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "libs/rnp"] + path = libs/rnp + url = https://github.com/rnpgp/rnp diff --git a/clickable.yaml b/clickable.yaml index 5cb119b..c93f51f 100644 --- a/clickable.yaml +++ b/clickable.yaml @@ -6,34 +6,37 @@ scripts: style: >- echo 'Running Astyle :' && astyle --options=.astylerc --recursive '*.cpp,*.h' --exclude=build && echo 'Running QmlFormat' && find . -name "*.qml" -exec qmlformat -i {} \; && echo 'Success' -skip_review: true - dependencies_target: -- libgpgmepp-dev -- libgpgme-dev - libgit2-dev - libquazip5-dev -- gpg-agent -- gpgconf +- libgpgmepp-dev +- libgpgme-dev - gpg -- fakechroot:all + +libraries: + rnp: + builder: cmake + make_jobs: 2 + dependencies_target: + - libbz2-dev + - zlib1g-dev + - libjson-c-dev + build_args: [ + -DCRYPTO_BACKEND=openssl + ] install_lib: -- "libgpg-error.so.0.28.0" -- "libassuan.so*" -- "libgpgme.so*" -- "libgpgmepp.so*" -- "libqgpgme.so*" - "libgit2.so*" -- "libquazip5.so*" - "libmbedtls.so*" - "libmbedx509.so*" - "libmbedcrypto.so*" - "libhttp_parser.so*" - "libssh2.so*" +- "libquazip5.so*" +- "libgpg-error.so.0.28.0" +- "libassuan.so*" +- "libgpgme.so*" +- "libgpgmepp.so*" +- "libqgpgme.so*" -install_bin: -- "fakechroot" -- "gpg-agent" -- "gpg" diff --git a/libs/rnp b/libs/rnp new file mode 160000 index 0000000..c41cef1 --- /dev/null +++ b/libs/rnp @@ -0,0 +1 @@ +Subproject commit c41cef116443d1572118844ecff0292f3ed4e55b diff --git a/plugins/Pass/CMakeLists.txt b/plugins/Pass/CMakeLists.txt index 5239f88..26554b6 100644 --- a/plugins/Pass/CMakeLists.txt +++ b/plugins/Pass/CMakeLists.txt @@ -28,6 +28,14 @@ set_target_properties(${PLUGIN} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PLUGIN}) qt5_use_modules(${PLUGIN} Qml Quick DBus) + +set(RNP_BUILD_DIR "${CMAKE_SOURCE_DIR}/build/${ARCH_TRIPLET}/rnp/install") + +INCLUDE_DIRECTORIES(${RNP_BUILD_DIR}/include) + +add_library(rnp STATIC IMPORTED) +set_property(TARGET rnp PROPERTY IMPORTED_LOCATION "${RNP_BUILD_DIR}/lib/librnp.a") + add_library(gpgerror SHARED IMPORTED) set_property(TARGET gpgerror PROPERTY IMPORTED_LOCATION "/usr/lib/${ARCH_TRIPLET}/libgpg-error.so.0.28.0") @@ -44,7 +52,7 @@ add_library(libqgpgme SHARED IMPORTED) set_property(TARGET libqgpgme PROPERTY IMPORTED_LOCATION "/usr/lib/${ARCH_TRIPLET}/libqgpgme.so") -target_link_libraries(${PLUGIN} gpgerror libassuan libgpgme libgpgmepp libqgpgme) +target_link_libraries(${PLUGIN} rnp gpgerror libassuan libgpgme libgpgmepp libqgpgme) set(QT_IMPORTS_DIR "/lib/${ARCH_TRIPLET}") diff --git a/po/utpass.qrouland.pot b/po/utpass.qrouland.pot index d4f56a9..71c26a4 100644 --- a/po/utpass.qrouland.pot +++ b/po/utpass.qrouland.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: utpass.qrouland\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-01-28 09:40+0100\n" +"POT-Creation-Date: 2025-01-28 12:44+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n"