[rpms/qownnotes] rawhide: Use system md4c

[rpms/qownnotes] rawhide: Use system md4c

[Yaakov Selkowitz]

A new commit has been pushed.

Repo   : rpms/qownnotes
Branch : rawhide
Commit : 4833eeafb4d315341fe3d0223f0be9791329295a
Author : Yaakov Selkowitz <yselkowi@redhat.com>
Date   : 2026-08-16T16:42:47-04:00
Stats  : +72/-9 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/qownnotes/c/4833eeafb4d315341fe3d0223f0be9791329295a?branch=rawhide

Log:
Use system md4c

---
diff --git a/qownnotes.spec b/qownnotes.spec
index fbca8c9..405f694 100644
--- a/qownnotes.spec
+++ b/qownnotes.spec
@@ -17,9 +17,6 @@ ExcludeArch: %{ix86}
 %global qkeysequencewidget_commit       8cbb54a12f33e41bf7c4795405f4235db1ee8ff1
 %global qkeysequencewidget_shortcommit  %(c=%{qkeysequencewidget_commit}; echo ${c:0:7})
 
-%global md4c_commit                     c64ee9ab326c53962b5bd8cca98c086461bbdd6b
-%global md4c_shortcommit                %(c=%{md4c_commit}; echo ${c:0:7})
-
 %global qhotkey_commit                  4ebf343ec5dbae725ee3b3f68186c14a2836fae4
 %global qhotkey_shortcommit             %(c=%{qhotkey_commit}; echo ${c:0:7})
 
@@ -41,7 +38,6 @@ Summary:        Plain-text file notepad and todo-list manager with Markdown supp
 #               singleapplication
 #               simplecrypt
 # MIT:                  piwiktracker
-#                       md4c
 # GPL-2.0-only:         versionnumber
 # GPL-3.0-or-later:     qttoolbareditor
 # LGPL-2.1-or-later:    fakevim
@@ -54,12 +50,12 @@ Source2:        %{url1}/Qt-Toolbar-Editor/archive/%{qttoolbareditor_commit}/qtto
 Source3:        %{url1}/qtcsv/archive/%{qtcsv_commit}/qtcsv-%{qtcsv_shortcommit}.tar.gz
 Source5:        %{url1}/qt-piwik-tracker/archive/%{piwiktracker_commit}/piwiktracker-%{piwiktracker_shortcommit}.tar.gz
 Source6:        %{url1}/qkeysequencewidget/archive/%{qkeysequencewidget_commit}/qkeysequencewidget-%{qkeysequencewidget_shortcommit}.tar.gz
-Source7:        https://github.com/%{name}/md4c/archive/%{md4c_commit}/md4c-%{md4c_shortcommit}.tar.gz
 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
 
 Patch1000:      system-qtkeychain.patch
+Patch1001:      system-md4c.patch
 
 BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
@@ -82,6 +78,7 @@ BuildRequires:  cmake(Qt6Xml)
 BuildRequires:  cmake(Qt6Keychain)
 
 BuildRequires:  pkgconfig(botan-3)
+BuildRequires:  pkgconfig(md4c-html)
 
 Requires:       hicolor-icon-theme
 Requires:       qt6-qtbase%{?_isa}
@@ -90,7 +87,6 @@ Recommends:     %{name}-translations = %{version}-%{release}
 Recommends:     hunspell
 
 Provides:       bundled(fakevim) = 0.0.1
-Provides:       bundled(md4c) = 0.4.2~git%{md4c_shortcommit}
 Provides:       bundled(qhotkey) = 1.3.0~git%{qhotkey_commit}
 Provides:       bundled(qkeysequencewidget) = 1.0.1
 Provides:       bundled(qmarkdowntextedit) = 2019.4.0~git%{qmarkdowntextedit_shortcommit}
@@ -133,7 +129,6 @@ Translations files for %{name}.
 %setup -n %{appname}-%{version} -D -T -a3
 %setup -n %{appname}-%{version} -D -T -a5
 %setup -n %{appname}-%{version} -D -T -a6
-%setup -n %{appname}-%{version} -D -T -a7
 %setup -n %{appname}-%{version} -D -T -a8
 
 mv qmarkdowntextedit-%{qmarkdowntextedit_commit}/*      src/libraries/qmarkdowntextedit/
@@ -141,7 +136,6 @@ mv Qt-Toolbar-Editor-%{qttoolbareditor_commit}/*        src/libraries/qttoolbare
 mv qtcsv-%{qtcsv_commit}/*                              src/libraries/qtcsv/
 mv qt-piwik-tracker-%{piwiktracker_commit}/*            src/libraries/piwiktracker/
 mv qkeysequencewidget-%{qkeysequencewidget_commit}/*    src/libraries/qkeysequencewidget/
-mv md4c-%{md4c_commit}/*                                src/libraries/md4c/
 mv QHotkey-%{qhotkey_commit}/*                          src/libraries/qhotkey/
 mkdir -p src/%{_target_platform}
 

diff --git a/sources b/sources
index 6ba5d6b..1428492 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
-SHA512 (md4c-c64ee9a.tar.gz) = e6d748d13d46d51a96d4d975d5850441d55d808f7aa84472dc5ef331e61bada2bdd3c5b462f2f0d6a193dcfa366a5255b4df9c39ffc6efc20ec3ef385c294d94
 SHA512 (piwiktracker-810a7e4.tar.gz) = e99f325f24d17ee6526f07ab3cdaedf656c70dc17c90fdb08283530040d1242796c50b8b7348bb696fcb5b99a663c59345c8258b1053dbed8bf42df3c2a9e0de
 SHA512 (qhotkey-4ebf343.tar.gz) = 7b64c2817a674436afa4bb80a15007def6c2ebec45437bd7b8f9055094e150c17073ab6ec7dc6767fe82c344ccc99564c0b67520834a08eff5892db32ef14a6b
 SHA512 (qkeysequencewidget-8cbb54a.tar.gz) = 136c74e062902e962606d1604c6afafce57795d514a56c0a3247c6d4117269bc3d8e228be2b197c9ef89b53a3f80f42458dbf5585a441a3e079cb597071e6304

diff --git a/system-md4c.patch b/system-md4c.patch
new file mode 100644
index 0000000..c9ec35f
--- /dev/null
+++ b/system-md4c.patch
@@ -0,0 +1,70 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 32d1b90..6f267d4 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -734,8 +734,7 @@ if(BUILD_WITH_ASPELL)
+ endif()
+ 
+ # md4c
+-list(APPEND SOURCE_FILES libraries/md4c/src/md4c.c
+-     libraries/md4c/src/md4c-html.c libraries/md4c/src/entity.c)
++find_package(md4c REQUIRED)
+ 
+ # XDG Desktop Portal global shortcuts support for Wayland on Linux
+ if(UNIX AND NOT APPLE)
+@@ -843,6 +842,7 @@ target_link_libraries(
+           Botan::Botan
+           fakevim
+           Google::DiffMatchPatch
++          md4c::md4c-html
+           qt${QT_VERSION_MAJOR}keychain)
+ 
+ if(USE_QLITEHTML)
+diff --git a/src/QOwnNotes.pro b/src/QOwnNotes.pro
+index 7a10e2f..24c3844 100644
+--- a/src/QOwnNotes.pro
++++ b/src/QOwnNotes.pro
+@@ -139,9 +139,6 @@ SOURCES += main.cpp\
+     libraries/simplecrypt/simplecrypt.cpp \
+     libraries/versionnumber/versionnumber.cpp \
+     libraries/botan/botanwrapper.cpp \
+-    libraries/md4c/src/md4c.c \
+-    libraries/md4c/src/md4c-html.c \
+-    libraries/md4c/src/entity.c \
+     libraries/qtwaitingspinner/waitingspinnerwidget.cpp \
+     dialogs/aboutdialog.cpp \
+     dialogs/linkdialog.cpp \
+@@ -306,9 +303,6 @@ HEADERS  += mainwindow.h \
+     libraries/simplecrypt/simplecrypt.h \
+     libraries/versionnumber/versionnumber.h \
+     libraries/botan/botanwrapper.h \
+-    libraries/md4c/src/md4c.h \
+-    libraries/md4c/src/md4c-html.h \
+-    libraries/md4c/src/entity.h \
+     entities/notehistory.h \
+     entities/note.h \
+     entities/trashitem.h \
+@@ -547,6 +541,8 @@ include(libraries/singleapplication/singleapplication.pri)
+ include(libraries/sonnet/src/core/sonnet-core.pri)
+ include(libraries/qhotkey/qhotkey.pri)
+ 
++PKGCONFIG += md4c-html
++
+ # XDG Desktop Portal global shortcuts support for Wayland on Linux
+ unix:!mac {
+     QT += dbus
+diff --git a/src/entities/note.cpp b/src/entities/note.cpp
+index f3bf725..6632649 100644
+--- a/src/entities/note.cpp
++++ b/src/entities/note.cpp
+@@ -36,8 +36,8 @@
+ #include "entities/bookmark.h"
+ #include "entities/commandsnippet.h"
+ #include "helpers/codetohtmlconverter.h"
+-#include "libraries/md4c/src/md4c-html.h"
+-#include "libraries/md4c/src/md4c.h"
++#include "md4c-html.h"
++#include "md4c.h"
+ #include "libraries/simplecrypt/simplecrypt.h"
+ #include "mainwindow.h"
+ #include "notefolder.h"