haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

cutemarked: fix build with new discount lib

Browse Source
This commit is contained in:
Gerasim Troeglazov
2024-03-05 22:02:05 +10:00
parent 0a281eba7f
commit 2ca15cf559
2 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app-text/cutemarked/cutemarked-0.11.3.recipe
View File

@@ -8,7 +8,7 @@ COPYRIGHT="2013 Christian Loose
2012 CodeCatalyst, LLC"
LICENSE="GNU GPL v2
MIT"
REVISION="4"
REVISION="5"
SOURCE_URI="https://github.com/cloose/CuteMarkEd/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="78a41808c2f0452375810abdff76eeaaee012f8d1368a2b8772ec6b4d2ceeec8"
SOURCE_DIR="CuteMarkEd-$portVersion"

45
app-text/cutemarked/patches/cutemarked-0.11.3.patchset
View File

@@ -1,4 +1,4 @@
From 3015d4614ea5e2c1d85dbc0a4869516927c86798 Mon Sep 17 00:00:00 2001
From ef8d20a8295b0ed165e2623c329b0ee6ab53b969 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Wed, 14 Aug 2019 10:04:03 +0200
Subject: Fix missing QAction
@@ -17,10 +17,10 @@ index 80452d1..e1f67a5 100644
#include <QItemEditorFactory>
#include <QKeySequence>
--
2.21.0
2.43.2
From 17c34f5d4e04492f604e7b344f6c25d9567059ac Mon Sep 17 00:00:00 2001
From fb23f671c17a3b890d4824f50dd0f702ab9630b5 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Wed, 14 Aug 2019 10:04:40 +0200
Subject: Fix path to find the myspel/hunspell dictionaries
@@ -41,5 +41,42 @@ index 59806c5..996b7e0 100644
paths << QStringLiteral("/usr/local/share/myspell")
<< QStringLiteral("/usr/share/myspell");
--
2.21.0
2.43.2
From c8491ae3811131dc00832d993ec70e7172752304 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 5 Mar 2024 21:56:15 +1000
Subject: Fixes for discount 3.x
diff --git a/app-static/converter/discountmarkdownconverter.cpp b/app-static/converter/discountmarkdownconverter.cpp
index be8715a..15fbd9c 100644
--- a/app-static/converter/discountmarkdownconverter.cpp
+++ b/app-static/converter/discountmarkdownconverter.cpp
@@ -74,9 +74,9 @@ MarkdownDocument *DiscountMarkdownConverter::createDocument(const QString &text,
unsigned long converterOptions = translateConverterOptions(options);
QByteArray utf8Data = markdownText.toUtf8();
- doc = mkd_string(utf8Data, utf8Data.length(), converterOptions);
+ doc = mkd_string(utf8Data, utf8Data.length(), &converterOptions);
- mkd_compile(doc, converterOptions);
+ mkd_compile(doc, &converterOptions);
}
return new DiscountMarkdownDocument(doc);
@@ -156,8 +156,8 @@ unsigned long DiscountMarkdownConverter::translateConverterOptions(ConverterOpti
}
// definition lists
- if (options.testFlag(MarkdownConverter::NoDefinitionListOption)) {
- converterOptions |= MKD_NODLIST;
+ if (!options.testFlag(MarkdownConverter::NoDefinitionListOption)) {
+ converterOptions |= MKD_DLDISCOUNT;
}
// SmartyPants
--
2.43.2