From 9b090ad645481407090f514c1aac49ae4731c3eb Mon Sep 17 00:00:00 2001 From: Mihail Ivanchev Date: Tue, 19 Nov 2024 14:06:04 +0100 Subject: [PATCH] cutemarked: bump revision to update shlibs --- srcpkgs/cutemarked/patches/QAction.patch | 10 -- .../cutemarked/patches/compatibilities.patch | 110 ++++++++++++++++++ srcpkgs/cutemarked/template | 2 +- 3 files changed, 111 insertions(+), 11 deletions(-) delete mode 100644 srcpkgs/cutemarked/patches/QAction.patch create mode 100644 srcpkgs/cutemarked/patches/compatibilities.patch diff --git a/srcpkgs/cutemarked/patches/QAction.patch b/srcpkgs/cutemarked/patches/QAction.patch deleted file mode 100644 index c2fb7bef108..00000000000 --- a/srcpkgs/cutemarked/patches/QAction.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/app/optionsdialog.cpp 2016-03-28 13:48:50.000000000 +0200 -+++ b/app/optionsdialog.cpp 2016-03-28 13:48:50.000000000 +0200 -@@ -17,6 +17,7 @@ - #include "optionsdialog.h" - #include "ui_optionsdialog.h" - -+#include - #include - #include - #include diff --git a/srcpkgs/cutemarked/patches/compatibilities.patch b/srcpkgs/cutemarked/patches/compatibilities.patch new file mode 100644 index 00000000000..9121e6f2466 --- /dev/null +++ b/srcpkgs/cutemarked/patches/compatibilities.patch @@ -0,0 +1,110 @@ +diff --git a/app-static/converter/discountmarkdownconverter.cpp b/app-static/converter/discountmarkdownconverter.cpp +index be8715a..702ab3b 100644 +--- a/app-static/converter/discountmarkdownconverter.cpp ++++ b/app-static/converter/discountmarkdownconverter.cpp +@@ -71,12 +71,15 @@ MarkdownDocument *DiscountMarkdownConverter::createDocument(const QString &text, + markdownText.append('\n'); + } + +- unsigned long converterOptions = translateConverterOptions(options); ++ mkd_flag_t *converterOptions = mkd_flags(); ++ ++ translateConverterOptions(options, converterOptions); + + QByteArray utf8Data = markdownText.toUtf8(); + doc = mkd_string(utf8Data, utf8Data.length(), converterOptions); + + mkd_compile(doc, converterOptions); ++ mkd_free_flags(converterOptions); + } + + return new DiscountMarkdownDocument(doc); +@@ -136,44 +139,43 @@ MarkdownConverter::ConverterOptions DiscountMarkdownConverter::supportedOptions( + MarkdownConverter::NoSuperscriptOption; + } + +-unsigned long DiscountMarkdownConverter::translateConverterOptions(ConverterOptions options) const ++void DiscountMarkdownConverter::translateConverterOptions(ConverterOptions options, mkd_flag_t *flags) const + { +- unsigned long converterOptions = MKD_TOC | MKD_NOSTYLE; ++ mkd_set_flag_num(flags, MKD_TOC); ++ mkd_set_flag_num(flags, MKD_NOSTYLE); + + // autolink + if (options.testFlag(MarkdownConverter::AutolinkOption)) { +- converterOptions |= MKD_AUTOLINK; ++ mkd_set_flag_num(flags, MKD_AUTOLINK); + } + + // strikethrough + if (options.testFlag(MarkdownConverter::NoStrikethroughOption)) { +- converterOptions |= MKD_NOSTRIKETHROUGH; ++ mkd_set_flag_num(flags, MKD_NOSTRIKETHROUGH); + } + + // alphabetic lists + if (options.testFlag(MarkdownConverter::NoAlphaListOption)) { +- converterOptions |= MKD_NOALPHALIST; ++ mkd_set_flag_num(flags, MKD_NOALPHALIST); + } + + // definition lists + if (options.testFlag(MarkdownConverter::NoDefinitionListOption)) { +- converterOptions |= MKD_NODLIST; ++ // converterOptions |= MKD_NODLIST; + } + + // SmartyPants + if (options.testFlag(MarkdownConverter::NoSmartypantsOption)) { +- converterOptions |= MKD_NOPANTS; ++ mkd_set_flag_num(flags, MKD_NOPANTS); + } + + // Footnotes + if (options.testFlag(MarkdownConverter::ExtraFootnoteOption)) { +- converterOptions |= MKD_EXTRA_FOOTNOTE; ++ mkd_set_flag_num(flags, MKD_EXTRA_FOOTNOTE); + } + + // Superscript + if (options.testFlag(MarkdownConverter::NoSuperscriptOption)) { +- converterOptions |= MKD_NOSUPERSCRIPT; ++ mkd_set_flag_num(flags, MKD_NOSUPERSCRIPT); + } +- +- return converterOptions; + } +diff --git a/app-static/converter/discountmarkdownconverter.h b/app-static/converter/discountmarkdownconverter.h +index 2902b5b..fd4c8e9 100644 +--- a/app-static/converter/discountmarkdownconverter.h ++++ b/app-static/converter/discountmarkdownconverter.h +@@ -34,6 +34,8 @@ + + #include "markdownconverter.h" + ++typedef void mkd_flag_t; ++ + class DiscountMarkdownConverter : public MarkdownConverter + { + public: +@@ -48,7 +50,7 @@ public: + virtual ConverterOptions supportedOptions() const; + + private: +- unsigned long translateConverterOptions(ConverterOptions options) const; ++ void translateConverterOptions(ConverterOptions options, mkd_flag_t *flags) const; + }; + + #endif // DISCOUNTMARKDOWNCONVERTER_H +diff --git a/app/optionsdialog.cpp b/app/optionsdialog.cpp +index 80452d1..e1f67a5 100644 +--- a/app/optionsdialog.cpp ++++ b/app/optionsdialog.cpp +@@ -17,6 +17,7 @@ + #include "optionsdialog.h" + #include "ui_optionsdialog.h" + ++#include + #include + #include + #include diff --git a/srcpkgs/cutemarked/template b/srcpkgs/cutemarked/template index 9723219bda6..e52d53a0b86 100644 --- a/srcpkgs/cutemarked/template +++ b/srcpkgs/cutemarked/template @@ -2,7 +2,7 @@ pkgname=cutemarked reverts="v0.11.0_1" version=0.11.3 -revision=8 +revision=9 build_style=qmake hostmakedepends="pkg-config qt5-qmake" makedepends="qt5-devel qt5-tools-devel qt5-webkit-devel discount-devel hunspell-devel"