public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Yaakov Selkowitz <yselkowi@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/qownnotes] rawhide: Update to 26.7.9
Date: Tue, 04 Aug 2026 02:03:40 GMT [thread overview]
Message-ID: <178580902012.1.3757732894308119421.rpms-qownnotes-c2b3b2f97039@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/qownnotes
Branch : rawhide
Commit : c2b3b2f9703928940cc00c7a4043cef74b26af0a
Author : Yaakov Selkowitz <yselkowi@redhat.com>
Date : 2026-08-02T21:57:45-04:00
Stats : +44/-404 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/qownnotes/c/c2b3b2f9703928940cc00c7a4043cef74b26af0a?branch=rawhide
Log:
Update to 26.7.9
---
diff --git a/.gitignore b/.gitignore
index 2747495..1a76072 100644
--- a/.gitignore
+++ b/.gitignore
@@ -195,3 +195,6 @@
/QOwnNotes-26.1.13.tar.gz
/qmarkdowntextedit-4f6e531.tar.gz
/QOwnNotes-26.1.14.tar.gz
+/QOwnNotes-26.7.9.tar.gz
+/qhotkey-4ebf343.tar.gz
+/qmarkdowntextedit-43f049b.tar.gz
diff --git a/0001-Revert-2786-botan-use-botan3-with-cmake.patch b/0001-Revert-2786-botan-use-botan3-with-cmake.patch
deleted file mode 100644
index e3c31ac..0000000
--- a/0001-Revert-2786-botan-use-botan3-with-cmake.patch
+++ /dev/null
@@ -1,395 +0,0 @@
-From e15f28b5b7748b62dfed54f537ca06418bf7d03d Mon Sep 17 00:00:00 2001
-From: Artem Polishchuk <ego.cordatus@gmail.com>
-Date: Sat, 17 Jan 2026 21:28:16 +0300
-Subject: [PATCH] Revert "#2786 botan: use botan3 with cmake"
-
-This reverts commit 1b2f21777c4fac7c4cca7736737a2b179d813adf.
----
- default.nix | 100 -----------------
- src/cmake/FindBotan3.cmake | 21 ----
- src/libraries/botan/CMakeLists.txt | 8 +-
- src/libraries/botan/botan.h | 2 +-
- src/libraries/botan/botan.pri | 2 +-
- src/libraries/botan/botanwrapper.cpp | 158 +++++++++------------------
- 6 files changed, 60 insertions(+), 231 deletions(-)
- delete mode 100644 default.nix
- delete mode 100644 src/cmake/FindBotan3.cmake
-
-diff --git a/default.nix b/default.nix
-deleted file mode 100644
-index 188dc629f..000000000
---- a/default.nix
-+++ /dev/null
-@@ -1,100 +0,0 @@
--{
-- lib,
-- stdenv,
-- qt6Packages,
-- cmake,
-- makeWrapper,
-- botan3,
-- libgit2,
-- pkg-config,
-- xvfb-run,
-- installShellFiles,
-- aspell,
--}:
--
--let
-- pname = "qownnotes";
-- appname = "QOwnNotes";
-- versionMatch = builtins.match ".*#define VERSION \"([0-9.]+)\".*" (
-- builtins.readFile ./src/version.h
-- );
-- version = if versionMatch != null then builtins.head versionMatch else "unknown";
--in
--stdenv.mkDerivation (finalAttrs: {
-- inherit pname appname version;
--
-- src = builtins.path {
-- path = ./src;
-- name = "qownnotes";
-- };
--
-- nativeBuildInputs = [
-- cmake
-- qt6Packages.qttools
-- qt6Packages.wrapQtAppsHook
-- pkg-config
-- installShellFiles
-- ]
-- ++ lib.optionals stdenv.hostPlatform.isLinux [ xvfb-run ]
-- ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ];
--
-- buildInputs = [
-- qt6Packages.qtbase
-- qt6Packages.qtdeclarative
-- qt6Packages.qtsvg
-- qt6Packages.qtwebsockets
-- botan3
-- libgit2
-- aspell
-- ]
-- ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6Packages.qtwayland ];
--
-- cmakeFlags = [
-- "-DQON_QT6_BUILD=ON"
-- "-DBUILD_WITH_SYSTEM_BOTAN=ON"
-- "-DBUILD_WITH_LIBGIT2=ON"
-- "-DBUILD_WITH_ASPELL=ON"
-- ];
--
-- # Install shell completion on Linux (with xvfb-run)
-- postInstall =
-- lib.optionalString stdenv.hostPlatform.isLinux ''
-- installShellCompletion --cmd ${finalAttrs.appname} \
-- --bash <(xvfb-run $out/bin/${finalAttrs.appname} --completion bash) \
-- --fish <(xvfb-run $out/bin/${finalAttrs.appname} --completion fish)
-- installShellCompletion --cmd ${finalAttrs.pname} \
-- --bash <(xvfb-run $out/bin/${finalAttrs.appname} --completion bash) \
-- --fish <(xvfb-run $out/bin/${finalAttrs.appname} --completion fish)
-- ''
-- # Install shell completion on macOS
-- + lib.optionalString stdenv.hostPlatform.isDarwin ''
-- installShellCompletion --cmd ${finalAttrs.pname} \
-- --bash <($out/bin/${finalAttrs.appname} --completion bash) \
-- --fish <($out/bin/${finalAttrs.appname} --completion fish)
-- ''
-- # Create a lowercase symlink for Linux
-- + lib.optionalString stdenv.hostPlatform.isLinux ''
-- ln -s $out/bin/${finalAttrs.appname} $out/bin/${finalAttrs.pname}
-- ''
-- # Rename application for macOS as lowercase binary
-- + lib.optionalString stdenv.hostPlatform.isDarwin ''
-- # Prevent "same file" error
-- mv $out/bin/${finalAttrs.appname} $out/bin/${finalAttrs.pname}.bin
-- mv $out/bin/${finalAttrs.pname}.bin $out/bin/${finalAttrs.pname}
-- '';
--
-- meta = {
-- description = "Plain-text file notepad and todo-list manager with markdown support and Nextcloud/ownCloud integration";
-- homepage = "https://www.qownnotes.org/";
-- changelog = "https://www.qownnotes.org/changelog.html";
-- downloadPage = "https://github.com/pbek/QOwnNotes/releases/tag/v${finalAttrs.version}";
-- license = lib.licenses.gpl2Only;
-- maintainers = with lib.maintainers; [
-- pbek
-- totoroot
-- matthiasbeyer
-- ];
-- platforms = lib.platforms.unix;
-- mainProgram = "qownnotes";
-- };
--})
-diff --git a/src/cmake/FindBotan3.cmake b/src/cmake/FindBotan3.cmake
-deleted file mode 100644
-index be64f3821..000000000
---- a/src/cmake/FindBotan3.cmake
-+++ /dev/null
-@@ -1,21 +0,0 @@
--#[[
--FindBotan
-----------
--
--Searching system installed Botan 3 library using PkgConfig
--#]]
--
--if(MSVC OR MINGW)
-- message(FATAL_ERROR "Using system Botan 3 library in Window not supported")
--endif()
--
--if(TARGET Botan3::Botan3)
-- message(STATUS "Target Botan::Botan already exists. Skipping searching")
-- return()
--endif()
--
--find_package(PkgConfig REQUIRED QUIET)
--
--pkg_check_modules(Botan3 REQUIRED IMPORTED_TARGET botan-3)
--
--add_library(Botan3::Botan3 ALIAS PkgConfig::Botan3)
-diff --git a/src/libraries/botan/CMakeLists.txt b/src/libraries/botan/CMakeLists.txt
-index d8bf17839..31cff71bf 100644
---- a/src/libraries/botan/CMakeLists.txt
-+++ b/src/libraries/botan/CMakeLists.txt
-@@ -16,12 +16,12 @@ target_link_libraries(botan PUBLIC Qt${QT_VERSION_MAJOR}::Core)
- target_include_directories(botan PUBLIC ${CMAKE_CURRENT_LIST_DIR})
-
- if(BUILD_WITH_SYSTEM_BOTAN)
-- find_package(Botan3 REQUIRED)
-- if(NOT TARGET Botan3::Botan3)
-- message(FATAL_ERROR "Could not find system Botan 3 library using PkgConfig")
-+ find_package(Botan2 REQUIRED)
-+ if(NOT TARGET Botan2::Botan2)
-+ message(FATAL_ERROR "Could not find system Botan 2 library using PkgConfig")
- endif()
-
-- target_link_libraries(botan PUBLIC Botan3::Botan3)
-+ target_link_libraries(botan PUBLIC Botan2::Botan2)
-
- target_compile_definitions(botan PUBLIC USE_SYSTEM_BOTAN)
-
-diff --git a/src/libraries/botan/botan.h b/src/libraries/botan/botan.h
-index b102b4425..0cb2441ad 100644
---- a/src/libraries/botan/botan.h
-+++ b/src/libraries/botan/botan.h
-@@ -59,7 +59,7 @@
- #define BOTAN_MP_WORD_BITS 64
-
- #define BOTAN_INSTALL_PREFIX R"(/usr/local)"
--#define BOTAN_INSTALL_HEADER_DIR "include/botan-3"
-+#define BOTAN_INSTALL_HEADER_DIR "include/botan-2"
- #define BOTAN_INSTALL_LIB_DIR "/usr/local/lib"
- #define BOTAN_LIB_LINK ""
- #define BOTAN_LINK_FLAGS "-fstack-protector -m64 -pthread"
-diff --git a/src/libraries/botan/botan.pri b/src/libraries/botan/botan.pri
-index 43c2f4e1b..355572297 100644
---- a/src/libraries/botan/botan.pri
-+++ b/src/libraries/botan/botan.pri
-@@ -6,7 +6,7 @@ HEADERS += $$PWD/botan.h \
- equals(USE_SYSTEM_BOTAN, 1) {
- DEFINES += USE_SYSTEM_BOTAN
- CONFIG += link_pkgconfig
-- PKGCONFIG += botan-3
-+ PKGCONFIG += botan-2
- } else {
-
- SOURCES += $$PWD/botan.cpp
-diff --git a/src/libraries/botan/botanwrapper.cpp b/src/libraries/botan/botanwrapper.cpp
-index 8d2f15bc2..1abbaf864 100644
---- a/src/libraries/botan/botanwrapper.cpp
-+++ b/src/libraries/botan/botanwrapper.cpp
-@@ -5,11 +5,14 @@
- #ifdef USE_SYSTEM_BOTAN
- #include <botan/base64.h>
- #include <botan/cipher_mode.h>
--#include <botan/hash.h>
-+#include <botan/filters.h>
-+#include <botan/hmac.h>
- #include <botan/kdf.h>
--#include <botan/pbkdf.h>
-+#include <botan/pbkdf2.h>
-+#include <botan/pipe.h>
- #include <botan/secmem.h>
--#include <botan/system_rng.h>
-+#include <botan/sha160.h>
-+#include <botan/types.h>
- #else
- #include "botan.h"
- #endif
-@@ -29,124 +32,71 @@ BotanWrapper::BotanWrapper() {
-
- QString BotanWrapper::Hash(const QString &Data) {
- try {
-- auto hash = Botan::HashFunction::create("SHA-1");
-- if (!hash) {
-- qWarning() << "[Botan Error] Failed to create SHA-1 hash function";
-- return {};
-- }
--
-- std::string input = Data.toStdString();
-- hash->update(input);
-- Botan::secure_vector<uint8_t> result = hash->final();
--
-- std::string output(result.begin(), result.end());
-- return QString::fromStdString(output);
-- } catch (const Botan::Exception &e) {
-+ Botan::Pipe pipe(new Botan::Hash_Filter("SHA-1"));
-+ pipe.process_msg(Data.toStdString());
-+ QString Value = QString::fromStdString(pipe.read_all_as_string(0));
-+ return Value;
-+ } catch (Botan::Exception &e) {
- qWarning() << "[Botan Error] " << e.what();
-- return {};
-+ return QString();
- }
- }
-
- QString BotanWrapper::Encrypt(const QString &Data) {
- try {
-- // Setup PBKDF2
-- auto pbkdf = Botan::PBKDF::create("PBKDF2(HMAC(SHA-1))");
-- if (!pbkdf) {
-- qWarning() << "[Botan Error] Failed to create PBKDF2";
-- return {};
-- }
--
-+ // Setup the key derive functions
-+ Botan::PKCS5_PBKDF2 pbkdf2(new Botan::HMAC(new Botan::SHA_160));
- const uint32_t PBKDF2_ITERATIONS = 8192;
-
-- // Create the master key using PBKDF2
-- auto master_key = pbkdf->pbkdf_iterations(48, mPassword.toStdString(), mSalt.data(),
-- mSalt.size(), PBKDF2_ITERATIONS);
--
-- // Create KDF for key and IV derivation
-- auto kdf = Botan::KDF::create("KDF2(SHA-1)");
-- if (!kdf) {
-- qWarning() << "[Botan Error] Failed to create KDF2";
-- return {};
-- }
--
-- // Derive key and IV
-- auto key = kdf->derive_key(32, master_key, "salt1");
-- auto iv = kdf->derive_key(16, master_key, "salt2");
--
-- // Create cipher
-- auto cipher =
-- Botan::Cipher_Mode::create("AES-256/CBC/PKCS7", Botan::Cipher_Dir::ENCRYPTION);
-- if (!cipher) {
-- qWarning() << "[Botan Error] Failed to create AES-256/CBC/PKCS7 cipher";
-- return {};
-- }
--
-- cipher->set_key(key);
-- cipher->start(iv);
--
-- // Encrypt the data
-- std::string input = Data.toStdString();
-- Botan::secure_vector<uint8_t> buffer(input.begin(), input.end());
-- cipher->finish(buffer);
--
-- // Base64 encode the result
-- std::string encoded = Botan::base64_encode(buffer);
-- return QString::fromStdString(encoded);
--
-- } catch (const Botan::Exception &e) {
-+ // Create the KEY and IV
-+ Botan::KDF *kdf = Botan::get_kdf("KDF2(SHA-1)");
-+
-+ mSalt.data();
-+
-+ // Create the master key
-+ Botan::SecureVector<Botan::byte> mMaster =
-+ pbkdf2
-+ .derive_key(48, mPassword.toStdString(), &mSalt[0], mSalt.size(), PBKDF2_ITERATIONS)
-+ .bits_of();
-+ Botan::SymmetricKey mKey = kdf->derive_key(32, mMaster, "salt1");
-+ Botan::InitializationVector mIV = kdf->derive_key(16, mMaster, "salt2");
-+
-+ Botan::Pipe pipe(get_cipher("AES-256/CBC/PKCS7", mKey, mIV, Botan::ENCRYPTION),
-+ new Botan::Base64_Encoder);
-+ pipe.process_msg(Data.toStdString());
-+ QString Value = QString::fromStdString(pipe.read_all_as_string(0));
-+ return Value;
-+ } catch (Botan::Exception &e) {
- qWarning() << "[Botan Error] " << e.what();
-- return {};
-+ return QString();
- }
- }
-
- QString BotanWrapper::Decrypt(const QString &Data) {
- try {
-- // Setup PBKDF2
-- auto pbkdf = Botan::PBKDF::create("PBKDF2(HMAC(SHA-1))");
-- if (!pbkdf) {
-- qWarning() << "[Botan Error] Failed to create PBKDF2";
-- return {};
-- }
--
-+ // Setup the key derive functions
-+ Botan::PKCS5_PBKDF2 pbkdf2(new Botan::HMAC(new Botan::SHA_160));
- const uint32_t PBKDF2_ITERATIONS = 8192;
-
-- // Create the master key using PBKDF2
-- auto master_key = pbkdf->pbkdf_iterations(48, mPassword.toStdString(), mSalt.data(),
-- mSalt.size(), PBKDF2_ITERATIONS);
--
-- // Create KDF for key and IV derivation
-- auto kdf = Botan::KDF::create("KDF2(SHA-1)");
-- if (!kdf) {
-- qWarning() << "[Botan Error] Failed to create KDF2";
-- return {};
-- }
--
-- // Derive key and IV
-- auto key = kdf->derive_key(32, master_key, "salt1");
-- auto iv = kdf->derive_key(16, master_key, "salt2");
--
-- // Base64 decode the input
-- Botan::secure_vector<uint8_t> buffer = Botan::base64_decode(Data.toStdString());
--
-- // Create cipher
-- auto cipher =
-- Botan::Cipher_Mode::create("AES-256/CBC/PKCS7", Botan::Cipher_Dir::DECRYPTION);
-- if (!cipher) {
-- qWarning() << "[Botan Error] Failed to create AES-256/CBC/PKCS7 cipher";
-- return {};
-- }
--
-- cipher->set_key(key);
-- cipher->start(iv);
-- cipher->finish(buffer);
--
-- // Convert result to string
-- std::string output(buffer.begin(), buffer.end());
-- return QString::fromStdString(output);
--
-- } catch (const Botan::Exception &e) {
-+ // Create the KEY and IV
-+ Botan::KDF *kdf = Botan::get_kdf("KDF2(SHA-1)");
-+
-+ // Create the master key
-+ Botan::SecureVector<Botan::byte> mMaster =
-+ pbkdf2
-+ .derive_key(48, mPassword.toStdString(), &mSalt[0], mSalt.size(), PBKDF2_ITERATIONS)
-+ .bits_of();
-+ Botan::SymmetricKey mKey = kdf->derive_key(32, mMaster, "salt1");
-+ Botan::InitializationVector mIV = kdf->derive_key(16, mMaster, "salt2");
-+
-+ Botan::Pipe pipe(new Botan::Base64_Decoder,
-+ get_cipher("AES-256/CBC/PKCS7", mKey, mIV, Botan::DECRYPTION));
-+ pipe.process_msg(Data.toStdString());
-+ QString Value = QString::fromStdString(pipe.read_all_as_string(0));
-+ return Value;
-+ } catch (Botan::Exception &e) {
- qWarning() << "[Botan Error] " << e.what();
-- return {};
-+ return QString();
- }
- }
-
---
-2.52.0
-
diff --git a/qownnotes.spec b/qownnotes.spec
index 25813f3..fbca8c9 100644
--- a/qownnotes.spec
+++ b/qownnotes.spec
@@ -2,7 +2,7 @@
ExcludeArch: %{ix86}
# Git submodules
-%global qmarkdowntextedit_commit 4f6e531e72e1d3b480e2c5604b61486ba475175d
+%global qmarkdowntextedit_commit 43f049ba54695e26ea96ecc5cd2ff5009a8f421b
%global qmarkdowntextedit_shortcommit %(c=%{qmarkdowntextedit_commit}; echo ${c:0:7})
%global qttoolbareditor_commit ca0728c9924c6464234f7e477aa9509293d0a324
@@ -20,7 +20,7 @@ ExcludeArch: %{ix86}
%global md4c_commit c64ee9ab326c53962b5bd8cca98c086461bbdd6b
%global md4c_shortcommit %(c=%{md4c_commit}; echo ${c:0:7})
-%global qhotkey_commit f64d15c9f7e0b7457604f54c10c2fc6e2b1b936b
+%global qhotkey_commit 4ebf343ec5dbae725ee3b3f68186c14a2836fae4
%global qhotkey_shortcommit %(c=%{qhotkey_commit}; echo ${c:0:7})
@@ -29,7 +29,7 @@ ExcludeArch: %{ix86}
%global forgeurl %{url1}/%{appname}
Name: qownnotes
-Version: 26.1.14
+Version: 26.7.9
%forgemeta
Release: %autorelease
Summary: Plain-text file notepad and todo-list manager with Markdown support
@@ -58,8 +58,8 @@ Source7: https://github.com/%{name}/md4c/archive/%{md4c_commit}/md4c-%{md
Source8: https://github.com/%{name}/QHotkey/archive/%{qhotkey_commit}/qhotkey-%{qhotkey_shortcommit}.tar.gz
# AppData manifest
Source100: https://raw.githubusercontent.com/flathub/org.qownnotes.%{appname}/master/org.qownnotes.%{appname}.appdata.xml
-# Build with system Botan
-Patch: 0001-Revert-2786-botan-use-botan3-with-cmake.patch
+
+Patch1000: system-qtkeychain.patch
BuildRequires: cmake
BuildRequires: desktop-file-utils
@@ -79,8 +79,9 @@ BuildRequires: cmake(Qt6Sql)
BuildRequires: cmake(Qt6Svg)
BuildRequires: cmake(Qt6WebSockets)
BuildRequires: cmake(Qt6Xml)
+BuildRequires: cmake(Qt6Keychain)
-BuildRequires: pkgconfig(botan-2)
+BuildRequires: pkgconfig(botan-3)
Requires: hicolor-icon-theme
Requires: qt6-qtbase%{?_isa}
@@ -154,6 +155,7 @@ pushd src/%{_target_platform}
%qmake_qt6 \
PREFIX=%{buildroot}%{_prefix} \
USE_SYSTEM_BOTAN=1 \
+ CONFIG+=c++20 \
..
popd
%make_build -C src/%{_target_platform}
diff --git a/sources b/sources
index d7abfee..6ba5d6b 100644
--- a/sources
+++ b/sources
@@ -1,9 +1,9 @@
SHA512 (md4c-c64ee9a.tar.gz) = e6d748d13d46d51a96d4d975d5850441d55d808f7aa84472dc5ef331e61bada2bdd3c5b462f2f0d6a193dcfa366a5255b4df9c39ffc6efc20ec3ef385c294d94
SHA512 (piwiktracker-810a7e4.tar.gz) = e99f325f24d17ee6526f07ab3cdaedf656c70dc17c90fdb08283530040d1242796c50b8b7348bb696fcb5b99a663c59345c8258b1053dbed8bf42df3c2a9e0de
-SHA512 (qhotkey-f64d15c.tar.gz) = aac57bba626fd696c4cadea0a4e392e77bdbe224060b6ea22c500989b879a0855241cec530148ac8c6bce4d0c6f39b60023e35d69543268beea46111f64782b0
+SHA512 (qhotkey-4ebf343.tar.gz) = 7b64c2817a674436afa4bb80a15007def6c2ebec45437bd7b8f9055094e150c17073ab6ec7dc6767fe82c344ccc99564c0b67520834a08eff5892db32ef14a6b
SHA512 (qkeysequencewidget-8cbb54a.tar.gz) = 136c74e062902e962606d1604c6afafce57795d514a56c0a3247c6d4117269bc3d8e228be2b197c9ef89b53a3f80f42458dbf5585a441a3e079cb597071e6304
-SHA512 (qmarkdowntextedit-4f6e531.tar.gz) = ee3bf0a2db665c6ea027191fe0592c933cbbe4d561cef18352471024f6b6d3b6511ad4fa41b6ad0e292b6451a7fffa170ba16b25c0e5be8a6122bc26f28f4dbb
-SHA512 (QOwnNotes-26.1.14.tar.gz) = 5cecfee0c073c3255161901085124d6453ffbc2d0ab1548fefc8ae5cc79cd45ea5c2569d81b12c3f84e36dddeb7146eb6aba308e715f9d164e9456f0b3a06bf9
+SHA512 (qmarkdowntextedit-43f049b.tar.gz) = 9d750fc0578708d14f1e024fa39cb7e543ef3bcb45622990a865a49ea06a0135e391f83b131c8e3f61fbd64096bd07631d74f4a62ec5727c92754ac5f8f870d2
+SHA512 (QOwnNotes-26.7.9.tar.gz) = b99ab555e3ab6cd6a5583225b265fc17a9dcdc98737639b8a1e4b3cfe6a290ebe19ba94a8ea3acba17a0ae73d881a5447eab0de38c9b18aa6749cfb22e47985d
SHA512 (qtcsv-ae15c33.tar.gz) = ff6b9bc40c086c87b749bb90fc031b6580b0bc12e3ab6ecc9ddd60e1a47b61181fe5737f47e2ac89e2c821cd367d3002addc705924aef4c6df7f404d81529eee
SHA512 (qttoolbareditor-ca0728c.tar.gz) = 835ab5b96e204351bce0df6b6c8be3eb9cae380db5d89d50cfcb2c7ba307c10141604e5fe4674ba2efb9ef2f8f02b1d9faea3ec265295d0fcd6005570b451d0e
SHA512 (org.qownnotes.QOwnNotes.appdata.xml) = 6e9266188926d7694f87a108150612e9616dfcedbc09f00509355474f669cde51fa63a3a7f60d2f08f5e3a1039a8ac95753d2703b9238aa9285e0a7475ac7d88
diff --git a/system-qtkeychain.patch b/system-qtkeychain.patch
new file mode 100644
index 0000000..27039a7
--- /dev/null
+++ b/system-qtkeychain.patch
@@ -0,0 +1,30 @@
+diff --git a/src/QOwnNotes.pro b/src/QOwnNotes.pro
+index 1ad1807..3cb8ffc 100644
+--- a/src/QOwnNotes.pro
++++ b/src/QOwnNotes.pro
+@@ -37,12 +37,7 @@ CONFIG(USE_QLITEHTML) {
+ include(libraries/qlitehtml/src/qlitehtml.pri)
+ }
+
+-include(libraries/qtkeychain/qtkeychain.pri)
+-INCLUDEPATH += $$PWD/libraries/qtkeychain
+-lessThan(QT_VERSION, 5.15.0) {
+- # qtkeychain references QDataStream::Qt_5_15, which is unavailable in legacy Qt 5 builds.
+- DEFINES += Qt_5_15=Qt_5_0
+-}
++QT += Qt6Keychain
+
+ TARGET = QOwnNotes
+ TEMPLATE = app
+diff --git a/src/services/cryptoservice.cpp b/src/services/cryptoservice.cpp
+index 595f650..5445eb8 100644
+--- a/src/services/cryptoservice.cpp
++++ b/src/services/cryptoservice.cpp
+@@ -1,6 +1,6 @@
+ #include "cryptoservice.h"
+
+-#include <qtkeychain/keychain.h>
++#include <qt6keychain/keychain.h>
+
+ #include <QByteArray>
+ #include <QCoreApplication>
reply other threads:[~2026-08-04 2:03 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178580902012.1.3757732894308119421.rpms-qownnotes-c2b3b2f97039@fedoraproject.org \
--to=yselkowi@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox