Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vnote for openSUSE:Factory checked in at 2026-11-18 18:29:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vnote (Old) and /work/SRC/openSUSE:Factory/.vnote.new.1251 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vnote" Wed Nov 18 18:29:38 2026 rev:8 rq:1397566 version:4.14.4 Changes: -------- --- /work/SRC/openSUSE:Factory/vnote/vnote.changes 2026-07-02 20:16:20.715680448 +0200 +++ /work/SRC/openSUSE:Factory/.vnote.new.1251/vnote.changes 2026-11-18 18:30:01.792977178 +0100 @@ -1,0 +2,25 @@ +Sat Nov 14 11:01:25 UTC 2026 - Yunhe Guo <[email protected]> + +- Use the system libcurl, pugixml and libsodium instead of the + bundled copies, which drops three vendored source archives and + follows the distribution updates +- Add 0002-use-system-curl.patch, 0003-use-system-pugixml.patch and + 0004-use-system-libsodium.patch + +------------------------------------------------------------------- +Sat Nov 14 06:36:02 UTC 2026 - Yunhe Guo <[email protected]> + +- Update to 4.14.4: + * VNote 4 is a rewrite on Qt 6 with a WebEngine based editor and + a native Typst editor + * Qt 6.9 or newer is required +- Switch upstream to https://github.com/vnotex/vnote +- Bundle vtextedit, QHotkey, vxcore, qwindowkit and m3, and vendor + the Rust crates of the Typst backend +- Provide the sources upstream fetches at configure time from the + package instead of downloading them +- Drop 0001-fix-build-with-cmake-4.patch, fixed upstream +- Add 0001-QtKeychain-include-dir.patch to find keychain.h +- Build only where Rust 1.99 or newer is available + +------------------------------------------------------------------- Old: ---- 0001-fix-build-with-cmake-4.patch vnote-3.20.1.tar.gz New: ---- 0001-QtKeychain-include-dir.patch 0002-use-system-curl.patch 0003-use-system-pugixml.patch 0004-use-system-libsodium.patch cpp-httplib.tar.xz m3.tar.xz qwindowkit.tar.xz vnote-4.14.4.tar.gz vtextedit-typst-vendor.tar.xz vxcore.tar.xz ----------(Old B)---------- Old: package instead of downloading them - Drop 0001-fix-build-with-cmake-4.patch, fixed upstream - Add 0001-QtKeychain-include-dir.patch to find keychain.h ----------(Old E)---------- ----------(New B)---------- New:- Drop 0001-fix-build-with-cmake-4.patch, fixed upstream - Add 0001-QtKeychain-include-dir.patch to find keychain.h - Build only where Rust 1.99 or newer is available New: follows the distribution updates - Add 0002-use-system-curl.patch, 0003-use-system-pugixml.patch and 0004-use-system-libsodium.patch New: follows the distribution updates - Add 0002-use-system-curl.patch, 0003-use-system-pugixml.patch and 0004-use-system-libsodium.patch New:- Add 0002-use-system-curl.patch, 0003-use-system-pugixml.patch and 0004-use-system-libsodium.patch ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vnote.spec ++++++ --- /var/tmp/diff_new_pack.I8tIW3/_old 2026-11-18 18:30:05.436131483 +0100 +++ /var/tmp/diff_new_pack.I8tIW3/_new 2026-11-18 18:30:05.438131568 +0100 @@ -17,57 +17,127 @@ Name: vnote -Version: 3.20.1 +Version: 4.14.4 Release: 0 Summary: A Vim-inspired note-taking application, especially for Markdown -License: LGPL-3.0-only -Group: Productivity/Text/Editors -URL: https://github.com/tamlok/vnote -Source0: https://github.com/tamlok/vnote/archive/v%{version}.tar.gz#/vnote-%{version}.tar.gz +License: LGPL-3.0-only AND MIT AND BSD-2-Clause AND BSD-3-Clause AND Apache-2.0 AND Apache-2.0 WITH LLVM-exception AND ISC AND MPL-1.1 AND MPL-2.0 AND LGPL-2.1-or-later AND GPL-2.0-only WITH linking-exception AND LicenseRef-SUSE-Public-Domain AND OFL-1.1 AND Unicode-3.0 AND CC0-1.0 AND Zlib AND Unlicense AND 0BSD AND MIT-0 AND BSL-1.0 +URL: https://github.com/vnotex/vnote +Source0: https://github.com/vnotex/vnote/archive/v%{version}.tar.gz#/vnote-%{version}.tar.gz +# Bundled build dependencies, pinned to the commits referenced by vnote +# (git submodules) and to the revisions used by vxcore's FetchContent calls. Source1: vtextedit.tar.xz Source2: QHotkey.tar.xz -# PATCH-FIX-UPSTREAM 0001-fix-build-with-cmake-4.patch -- Fix build with CMake 4 -Patch0: 0001-fix-build-with-cmake-4.patch -BuildRequires: cmake(Qt6Core) +Source3: vxcore.tar.xz +Source4: qwindowkit.tar.xz +Source5: m3.tar.xz +Source6: cpp-httplib.tar.xz +# Crates vendored from libs/vtextedit/tools/typst-backend/Cargo.lock +Source7: vtextedit-typst-vendor.tar.xz +# PATCH-FIX-OPENSUSE 0001-QtKeychain-include-dir.patch -- Qt6Keychain installs keychain.h in an include subdirectory +Patch0: 0001-QtKeychain-include-dir.patch +# PATCH-FIX-OPENSUSE 0002-use-system-curl.patch -- Build against the system libcurl +Patch1: 0002-use-system-curl.patch +# PATCH-FIX-OPENSUSE 0003-use-system-pugixml.patch -- Build against the system pugixml +Patch2: 0003-use-system-pugixml.patch +# PATCH-FIX-OPENSUSE 0004-use-system-libsodium.patch -- Build against the system libsodium +Patch3: 0004-use-system-libsodium.patch +BuildRequires: cargo >= 1.99 +BuildRequires: cmake >= 3.21 +BuildRequires: gcc-c++ +BuildRequires: ninja +BuildRequires: pkgconfig +BuildRequires: rust >= 1.99 +BuildRequires: cmake(Qt6Concurrent) +BuildRequires: cmake(Qt6Core) >= 6.9 BuildRequires: cmake(Qt6Core5Compat) BuildRequires: cmake(Qt6Gui) +BuildRequires: cmake(Qt6GuiPrivate) +BuildRequires: cmake(Qt6Keychain) BuildRequires: cmake(Qt6LinguistTools) BuildRequires: cmake(Qt6Network) +BuildRequires: cmake(Qt6Pdf) BuildRequires: cmake(Qt6PrintSupport) -BuildRequires: cmake(Qt6Sql) BuildRequires: cmake(Qt6Svg) -BuildRequires: cmake(Qt6Test) BuildRequires: cmake(Qt6WebChannel) BuildRequires: cmake(Qt6WebEngineWidgets) BuildRequires: cmake(Qt6Widgets) +BuildRequires: cmake(pugixml) >= 1.16 +BuildRequires: pkgconfig(libcurl) >= 7.64 +BuildRequires: pkgconfig(libsodium) >= 1.0.18 +BuildRequires: pkgconfig(openssl) +Provides: bundled(cmark) +Provides: bundled(cpp-httplib) +Provides: bundled(hunspell) +Provides: bundled(libgit2) +Provides: bundled(m3) +Provides: bundled(qmsetup) +Provides: bundled(qwindowkit) +Provides: bundled(sonnet) +Provides: bundled(sqlite) +Provides: bundled(syntax-highlighting) +Provides: bundled(typst) Provides: bundled(vtextedit) -Requires: qt6-sql-sqlite -# vnote doesn't install development files, moving the bundled library to a separate package isn't useful -Obsoletes: libVTextEdit1 < 3.20.1 -ExclusiveArch: %{x86_64} aarch64 riscv64 +Provides: bundled(vxcore) %description VNote is a note-taking application, designed especially for Markdown. VNote provides both note management and Markdown edit experience. %prep -%autosetup -p1 +# The submodule directories are filled in below, so the patches that touch them +# are applied by hand instead of by %%autosetup. +%autosetup -N -p1 +%patch -P 0 -p1 + cd libs -rmdir QHotkey vtextedit -/usr/lib/rpm/rpmuncompress -x %{SOURCE1} -/usr/lib/rpm/rpmuncompress -x %{SOURCE2} +rmdir QHotkey m3 qwindowkit vtextedit vxcore +for tarball in %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5}; do + tar -xJf "${tarball}" -C . +done cd .. -# Useless and broken +%patch -P 1 -p1 +%patch -P 2 -p1 +%patch -P 3 -p1 + +# Build-time dependencies that upstream fetches from the network +mkdir -p %{_builddir}/vnote-deps +tar -xJf %{SOURCE6} -C %{_builddir}/vnote-deps + +# Offline crates for the Typst backend +mkdir -p libs/vtextedit/tools/typst-backend/vendor +tar -xJf %{SOURCE7} -C libs/vtextedit/tools/typst-backend/vendor --strip-components=1 +mkdir -p libs/vtextedit/tools/typst-backend/.cargo +cat > libs/vtextedit/tools/typst-backend/.cargo/config.toml <<EOF +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "%{_builddir}/vnote-%{version}/libs/vtextedit/tools/typst-backend/vendor" +EOF + +# Note: the bundled pdf.js web application ships prebuilt wasm decoders +# (jbig2, openjpeg, qcms, quickjs) that upstream does not provide sources +# for. They are part of the upstream web asset distribution and required +# for PDF preview. + +# CPack and the Windows/macOS deployment helpers are not used for RPMs sed -i '/Packaging.cmake/d' src/CMakeLists.txt # Use a less generic location for translations sed -i 's#app:translations#app:vnote/translations#' src/main.cpp %build -%cmake_qt6 -DCMAKE_SKIP_RPATH:BOOL=TRUE +%cmake_qt6 \ + -DCMAKE_SKIP_RPATH:BOOL=TRUE \ + -DVXCORE_USE_SYSTEM_CURL:BOOL=ON \ + -DVXCORE_USE_SYSTEM_PUGIXML:BOOL=ON \ + -DVXCORE_USE_SYSTEM_SODIUM:BOOL=ON \ + -DFETCHCONTENT_SOURCE_DIR_VNOTE_CPP_HTTPLIB=%{_builddir}/vnote-deps/cpp-httplib %qt6_build +# The application catalogs are only generated by this target +cmake --build build --target lrelease %install %qt6_install @@ -76,15 +146,33 @@ mkdir -p %{buildroot}%{_datadir}/vnote mv %{buildroot}%{_datadir}/translations %{buildroot}%{_datadir}/vnote/translations +# The bundled libraries are not meant to be used by other packages +rm -rf %{buildroot}%{_includedir}/vtextedit +rm -f %{buildroot}%{_libdir}/libVTextEdit.so %{buildroot}%{_libdir}/libvtextedit_typst.so +chmod 0755 %{buildroot}%{_libdir}/libvtextedit_typst.so.1 +# cmark is built as a static dependency of vtextedit only +rm -rf %{buildroot}%{_bindir}/cmark \ + %{buildroot}%{_includedir}/cmark.h \ + %{buildroot}%{_includedir}/cmark_export.h \ + %{buildroot}%{_includedir}/cmark_version.h \ + %{buildroot}%{_libdir}/cmake/cmark \ + %{buildroot}%{_libdir}/libcmark.a \ + %{buildroot}%{_libdir}/pkgconfig/libcmark.pc \ + %{buildroot}%{_mandir}/man1/cmark.1* \ + %{buildroot}%{_mandir}/man3/cmark.3* + %ldconfig_scriptlets %files %license COPYING.LESSER -%doc README.md changes.md +%doc README.md changes.md THIRD-PARTY-NOTICES.md %{_bindir}/vnote %{_datadir}/applications/vnote.desktop %{_datadir}/icons/hicolor +%{_datadir}/licenses/vnote/LICENSE.* %{_datadir}/vnote_extra.rcc %{_datadir}/vnote/ -%{_libdir}/libVTextEdit.so +# The bundled editor library is private to vnote, so it stays in this package +%{_libdir}/libVTextEdit.so.12* +%{_libdir}/libvtextedit_typst.so* ++++++ 0001-QtKeychain-include-dir.patch ++++++ From: Yunhe Guo <[email protected]> Subject: [PATCH] Add the QtKeychain header directory to the include path The Qt6Keychain package installs keychain.h below include/qt6keychain, but the exported imported target only propagates the plain include directory, so #include <keychain.h> fails. Add the subdirectory explicitly. --- src/core/services/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) --- a/src/core/services/CMakeLists.txt +++ b/src/core/services/CMakeLists.txt @@ -175,6 +175,10 @@ target_compile_definitions(core_services PRIVATE VNOTE_KEYCHAIN_AVAILABLE) if(TARGET Qt6Keychain::Qt6Keychain) target_link_libraries(core_services PRIVATE Qt6Keychain::Qt6Keychain) + # The Qt6Keychain package here installs its headers in a versioned + # subdirectory that the exported target does not add to the include path. + target_include_directories(core_services PRIVATE + ${CMAKE_INSTALL_PREFIX}/include/qt6keychain) elseif(TARGET qt6keychain) target_link_libraries(core_services PRIVATE qt6keychain) endif() ++++++ 0002-use-system-curl.patch ++++++ From: Yunhe Guo <[email protected]> Subject: [PATCH] Allow building against the system libcurl Add VXCORE_USE_SYSTEM_CURL, which links the platform libcurl instead of building the pinned static copy. The replacing TLS certificate verifier is OpenSSL specific, so it stays enabled only when the system libcurl was built with OpenSSL. Distribution packages use the shared library they already maintain instead of embedding their own copy. VNote then has no bundled curl license to install, so both install rules are skipped when vxcore does not provide one. --- libs/vxcore/third_party/CMakeLists.txt | 27 +++++++++++++++++++++++++-- src/CMakeLists.txt | 8 ++++++-- 2 files changed, 31 insertions(+), 4 deletions(-) --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -248,7 +248,9 @@ install(FILES "${VX_SODIUM_SOURCE_DIR}/LICENSE" DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME LICENSE.libsodium-cmake) install(FILES "${VX_PUGIXML_LICENSE}" DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME LICENSE.pugixml) - install(FILES "${VX_CURL_LICENSE}" DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME LICENSE.curl) + if(VX_CURL_LICENSE) + install(FILES "${VX_CURL_LICENSE}" DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME LICENSE.curl) + endif() install(FILES "${PROJECT_SOURCE_DIR}/libs/m3/LICENSE" DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME LICENSE.m3) install(FILES "${PROJECT_SOURCE_DIR}/libs/m3/third_party/nlohmann/LICENSE.MIT" @@ -293,7 +295,9 @@ install(FILES "${VX_SODIUM_SOURCE_DIR}/LICENSE" DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/vnote RENAME LICENSE.libsodium-cmake) install(FILES "${VX_PUGIXML_LICENSE}" DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/vnote RENAME LICENSE.pugixml) - install(FILES "${VX_CURL_LICENSE}" DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/vnote RENAME LICENSE.curl) + if(VX_CURL_LICENSE) + install(FILES "${VX_CURL_LICENSE}" DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/vnote RENAME LICENSE.curl) + endif() install(FILES "${PROJECT_SOURCE_DIR}/libs/m3/LICENSE" DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/vnote RENAME LICENSE.m3) install(FILES "${PROJECT_SOURCE_DIR}/libs/m3/third_party/nlohmann/LICENSE.MIT" --- a/libs/vxcore/third_party/CMakeLists.txt +++ b/libs/vxcore/third_party/CMakeLists.txt @@ -107,6 +107,8 @@ # Keep WebDAV dependency options local, just like the sodium adapter above. +option(VXCORE_USE_SYSTEM_CURL "Use the system libcurl instead of the pinned copy" OFF) + function(vxcore_add_webdav_dependencies) include(FetchContent) set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) @@ -120,7 +122,30 @@ set(BUILD_EXAMPLES OFF) add_library(vxcore_webdav_curl INTERFACE) - if(APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "iOS") + if(VXCORE_USE_SYSTEM_CURL) + # Use the platform libcurl instead of the pinned copy. + find_package(CURL 7.64 REQUIRED) + target_link_libraries(vxcore_webdav_curl INTERFACE CURL::libcurl) + # Only the OpenSSL backend exposes the replacing certificate verifier. + find_package(PkgConfig QUIET) + if(PkgConfig_FOUND) + pkg_check_modules(_vxcore_system_curl QUIET libcurl) + endif() + if(_vxcore_system_curl_FOUND) + execute_process(COMMAND "${PKG_CONFIG_EXECUTABLE}" --libs --static libcurl + OUTPUT_VARIABLE _vxcore_curl_static_libs + OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_QUIET) + endif() + if(_vxcore_curl_static_libs MATCHES "(^| )-lssl([ .]|$)") + find_package(OpenSSL REQUIRED COMPONENTS SSL Crypto) + target_compile_definitions(vxcore_webdav_curl INTERFACE VXCORE_SYNC_TLS_OPENSSL=1) + target_link_libraries(vxcore_webdav_curl INTERFACE OpenSSL::SSL OpenSSL::Crypto) + else() + message(WARNING "WebDAV: the system libcurl does not use OpenSSL, " + "so the replacing TLS certificate verifier is unavailable") + endif() + elseif(APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "iOS") if(IS_DIRECTORY "${CMAKE_OSX_SYSROOT}") set(_dav_sdk "${CMAKE_OSX_SYSROOT}") else() ++++++ 0003-use-system-pugixml.patch ++++++ From: Yunhe Guo <[email protected]> Subject: [PATCH] Allow building against the system pugixml Add VXCORE_USE_SYSTEM_PUGIXML, which uses the CMake package of the platform pugixml instead of building the pinned copy. Distribution packages ship the same 1.16 release already. VNote then has no bundled pugixml license to install, and the system package exports only the namespaced target, so both the property lookup and the two install rules are skipped. Apply on top of 0002-use-system-curl.patch. --- libs/vxcore/third_party/CMakeLists.txt | 19 ++++++++++++------- src/CMakeLists.txt | 12 ++++++++++-- 2 files changed, 24 insertions(+), 7 deletions(-) --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -179,7 +179,11 @@ endif() get_target_property(VX_SODIUM_SOURCE_DIR sodium SOURCE_DIR) -get_target_property(VX_PUGIXML_LICENSE pugixml VXCORE_LICENSE_FILE) +# A system pugixml ships no license file to install, and its CMake package does +# not provide the plain pugixml target. +if(TARGET pugixml) + get_target_property(VX_PUGIXML_LICENSE pugixml VXCORE_LICENSE_FILE) +endif() get_target_property(VX_HTTP_LICENSE vnote_http VNOTE_HTTP_LICENSE_FILE) if(NOT APPLE) get_target_property(VX_CURL_LICENSE vxcore_webdav_curl VXCORE_LICENSE_FILE) @@ -247,7 +251,9 @@ DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME LICENSE.libsodium) install(FILES "${VX_SODIUM_SOURCE_DIR}/LICENSE" DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME LICENSE.libsodium-cmake) - install(FILES "${VX_PUGIXML_LICENSE}" DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME LICENSE.pugixml) + if(VX_PUGIXML_LICENSE) + install(FILES "${VX_PUGIXML_LICENSE}" DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME LICENSE.pugixml) + endif() if(VX_CURL_LICENSE) install(FILES "${VX_CURL_LICENSE}" DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME LICENSE.curl) endif() @@ -294,7 +300,9 @@ DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/vnote RENAME LICENSE.libsodium) install(FILES "${VX_SODIUM_SOURCE_DIR}/LICENSE" DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/vnote RENAME LICENSE.libsodium-cmake) - install(FILES "${VX_PUGIXML_LICENSE}" DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/vnote RENAME LICENSE.pugixml) + if(VX_PUGIXML_LICENSE) + install(FILES "${VX_PUGIXML_LICENSE}" DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/vnote RENAME LICENSE.pugixml) + endif() if(VX_CURL_LICENSE) install(FILES "${VX_CURL_LICENSE}" DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/vnote RENAME LICENSE.curl) endif() --- a/libs/vxcore/third_party/CMakeLists.txt +++ b/libs/vxcore/third_party/CMakeLists.txt @@ -257,15 +257,22 @@ set_property(TARGET vxcore_webdav_curl PROPERTY VXCORE_LICENSE_FILE "${vxcore_curl_SOURCE_DIR}/COPYING") endif() - set(PUGIXML_BUILD_TESTS OFF) - set(PUGIXML_BUILD_SHARED_AND_STATIC_LIBS OFF) - set(PUGIXML_INSTALL OFF) - FetchContent_Declare(vxcore_pugixml - URL https://github.com/zeux/pugixml/releases/download/v1.16/pugixml-1.16.tar.gz - URL_HASH SHA256=4cee1ca4aad395170f4c7a07824f3bdd41f28316c6e1e1090a1425b278ec0b4b - ) - FetchContent_MakeAvailable(vxcore_pugixml) - set_property(TARGET pugixml PROPERTY VXCORE_LICENSE_FILE "${vxcore_pugixml_SOURCE_DIR}/LICENSE.md") + option(VXCORE_USE_SYSTEM_PUGIXML "Use the system pugixml instead of the pinned copy" OFF) + if(VXCORE_USE_SYSTEM_PUGIXML) + find_package(pugixml 1.16 REQUIRED) + # The imported target is directory scoped, but vxcore/src links it too. + set_property(TARGET pugixml::pugixml PROPERTY IMPORTED_GLOBAL TRUE) + else() + set(PUGIXML_BUILD_TESTS OFF) + set(PUGIXML_BUILD_SHARED_AND_STATIC_LIBS OFF) + set(PUGIXML_INSTALL OFF) + FetchContent_Declare(vxcore_pugixml + URL https://github.com/zeux/pugixml/releases/download/v1.16/pugixml-1.16.tar.gz + URL_HASH SHA256=4cee1ca4aad395170f4c7a07824f3bdd41f28316c6e1e1090a1425b278ec0b4b + ) + FetchContent_MakeAvailable(vxcore_pugixml) + set_property(TARGET pugixml PROPERTY VXCORE_LICENSE_FILE "${vxcore_pugixml_SOURCE_DIR}/LICENSE.md") + endif() endfunction() vxcore_add_webdav_dependencies() ++++++ 0004-use-system-libsodium.patch ++++++ From: Yunhe Guo <[email protected]> Subject: [PATCH] Allow building against the system libsodium Add VXCORE_USE_SYSTEM_SODIUM, which links the platform libsodium instead of building the pinned libsodium-cmake copy. vxcore only uses the stable high-level API (secretstream, aead, pwhash, hashing, randombytes). The bundled sources are then gone, so the sodium license files have nothing to install. Replace the SOURCE_DIR lookup with a VXCORE_LICENSE_DIR property that only the bundled branch sets, and skip the install rules without it. Apply on top of 0003-use-system-pugixml.patch. --- libs/vxcore/CMakeLists.txt | 8 ++++++-- libs/vxcore/third_party/CMakeLists.txt | 19 +++++++++++++++++++ src/CMakeLists.txt | 12 ++++++++---- 3 files changed, 34 insertions(+), 5 deletions(-) --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -178,7 +178,8 @@ target_link_libraries(vnote PRIVATE ${VX_APPKIT_LIBRARY}) endif() -get_target_property(VX_SODIUM_SOURCE_DIR sodium SOURCE_DIR) +# Set only when sodium is built from the bundled sources. +get_target_property(VX_SODIUM_SOURCE_DIR sodium VXCORE_LICENSE_DIR) # A system pugixml ships no license file to install, and its CMake package does # not provide the plain pugixml target. if(TARGET pugixml) @@ -247,10 +248,12 @@ install(FILES "${PROJECT_SOURCE_DIR}/scripts/windows-context-menu.ps1" DESTINATION ${CMAKE_INSTALL_BINDIR}) install(FILES ${VX_EXTRA_RESOURCE_FILES_RCC} DESTINATION ${CMAKE_INSTALL_BINDIR}) - install(FILES "${VX_SODIUM_SOURCE_DIR}/libsodium/LICENSE" - DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME LICENSE.libsodium) - install(FILES "${VX_SODIUM_SOURCE_DIR}/LICENSE" - DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME LICENSE.libsodium-cmake) + if(VX_SODIUM_SOURCE_DIR) + install(FILES "${VX_SODIUM_SOURCE_DIR}/libsodium/LICENSE" + DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME LICENSE.libsodium) + install(FILES "${VX_SODIUM_SOURCE_DIR}/LICENSE" + DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME LICENSE.libsodium-cmake) + endif() if(VX_PUGIXML_LICENSE) install(FILES "${VX_PUGIXML_LICENSE}" DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME LICENSE.pugixml) endif() @@ -296,10 +299,12 @@ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) install(FILES ${VX_EXTRA_RESOURCE_FILES_RCC} DESTINATION ${CMAKE_INSTALL_DATADIR}) - install(FILES "${VX_SODIUM_SOURCE_DIR}/libsodium/LICENSE" - DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/vnote RENAME LICENSE.libsodium) - install(FILES "${VX_SODIUM_SOURCE_DIR}/LICENSE" - DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/vnote RENAME LICENSE.libsodium-cmake) + if(VX_SODIUM_SOURCE_DIR) + install(FILES "${VX_SODIUM_SOURCE_DIR}/libsodium/LICENSE" + DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/vnote RENAME LICENSE.libsodium) + install(FILES "${VX_SODIUM_SOURCE_DIR}/LICENSE" + DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/vnote RENAME LICENSE.libsodium-cmake) + endif() if(VX_PUGIXML_LICENSE) install(FILES "${VX_PUGIXML_LICENSE}" DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/vnote RENAME LICENSE.pugixml) endif() --- a/libs/vxcore/CMakeLists.txt +++ b/libs/vxcore/CMakeLists.txt @@ -99,11 +99,14 @@ if(VXCORE_INSTALL) include(GNUInstallDirs) - get_target_property(_vxcore_sodium_source_dir sodium SOURCE_DIR) - install(FILES "${_vxcore_sodium_source_dir}/libsodium/LICENSE" - DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/vxcore RENAME LICENSE.libsodium) - install(FILES "${_vxcore_sodium_source_dir}/LICENSE" - DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/vxcore RENAME LICENSE.libsodium-cmake) + # Set only when sodium is built from the bundled sources. + get_target_property(_vxcore_sodium_license_dir sodium VXCORE_LICENSE_DIR) + if(_vxcore_sodium_license_dir) + install(FILES "${_vxcore_sodium_license_dir}/libsodium/LICENSE" + DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/vxcore RENAME LICENSE.libsodium) + install(FILES "${_vxcore_sodium_license_dir}/LICENSE" + DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/vxcore RENAME LICENSE.libsodium-cmake) + endif() get_target_property(_vxcore_pugixml_license pugixml VXCORE_LICENSE_FILE) install(FILES "${_vxcore_pugixml_license}" --- a/libs/vxcore/third_party/CMakeLists.txt +++ b/libs/vxcore/third_party/CMakeLists.txt @@ -86,6 +86,16 @@ # Function scope keeps sodium's options from changing other dependencies. function(vxcore_add_sodium) + if(VXCORE_USE_SYSTEM_SODIUM) + find_package(PkgConfig REQUIRED) + pkg_check_modules(vxcore_system_sodium REQUIRED IMPORTED_TARGET libsodium) + # vxcore/src links this target from another directory. + set_property(TARGET PkgConfig::vxcore_system_sodium PROPERTY IMPORTED_GLOBAL TRUE) + add_library(sodium INTERFACE) + target_link_libraries(sodium INTERFACE PkgConfig::vxcore_system_sodium) + return() + endif() + include(FetchContent) set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) set(BUILD_SHARED_LIBS OFF) @@ -100,9 +110,12 @@ FetchContent_MakeAvailable(vxcore_sodium) set_target_properties(sodium PROPERTIES MSVC_RUNTIME_LIBRARY "${CMAKE_MSVC_RUNTIME_LIBRARY}" + VXCORE_LICENSE_DIR "${vxcore_sodium_SOURCE_DIR}" ) endfunction() +option(VXCORE_USE_SYSTEM_SODIUM "Use the system libsodium instead of the pinned copy" OFF) + vxcore_add_sodium() ++++++ QHotkey.tar.xz ++++++ ++++++ _service ++++++ --- /var/tmp/diff_new_pack.I8tIW3/_old 2026-11-18 18:30:05.640140124 +0100 +++ /var/tmp/diff_new_pack.I8tIW3/_new 2026-11-18 18:30:05.647140421 +0100 @@ -1,14 +1,41 @@ <services> - <!-- git submodules used by vnote --> + <!-- git submodules used by vnote, pinned to the commits of v4.14.4 --> + <!-- Nested submodules are included automatically (submodules defaults to enable) --> <service name="obs_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/vnotex/vtextedit.git</param> - <param name="revision">b38bac974</param> + <param name="revision">77c867bcd09fe65706c2d88d2603f869e9a0a1f8</param> <param name="version">_none_</param> </service> <service name="obs_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/vnotex/QHotkey.git</param> + <param name="revision">d7b5250e3474da8185fe348d2443013dfb67306d</param> + <param name="version">_none_</param> + </service> + <service name="obs_scm" mode="disabled"> + <param name="scm">git</param> + <param name="url">https://github.com/vnotex/vxcore.git</param> + <param name="revision">6627808960e234d824f225c76b6c47710ae778ad</param> + <param name="version">_none_</param> + </service> + <service name="obs_scm" mode="disabled"> + <param name="scm">git</param> + <param name="url">https://github.com/vnotex/qwindowkit.git</param> + <param name="revision">83d37fc7051871f126a09c9f9f84abd66a91b889</param> + <param name="version">_none_</param> + </service> + <service name="obs_scm" mode="disabled"> + <param name="scm">git</param> + <param name="url">https://github.com/vnotex/m3.git</param> + <param name="revision">aaaadcfcef194734fea5ee904ad8e076b75e2fbd</param> + <param name="version">_none_</param> + </service> + <!-- Fetched by vnote/vxcore at configure time, provided offline instead --> + <service name="obs_scm" mode="disabled"> + <param name="scm">git</param> + <param name="url">https://github.com/yhirose/cpp-httplib.git</param> + <param name="revision">24e58ce5b25d55045af4cd6f463e83a8082fbe6b</param> <param name="version">_none_</param> </service> <service name="tar" mode="disabled"/> ++++++ vnote-3.20.1.tar.gz -> vnote-4.14.4.tar.gz ++++++ /work/SRC/openSUSE:Factory/vnote/vnote-3.20.1.tar.gz /work/SRC/openSUSE:Factory/.vnote.new.1251/vnote-4.14.4.tar.gz differ: char 12, line 1 ++++++ vtextedit.tar.xz ++++++ /work/SRC/openSUSE:Factory/vnote/vtextedit.tar.xz /work/SRC/openSUSE:Factory/.vnote.new.1251/vtextedit.tar.xz differ: char 15, line 1
