cutemarked: bump after hunspell bump, add patchset (#4091)

This commit is contained in:
Schrijvers Luc
2019-08-14 10:49:58 +02:00
committed by Sergei Reznikov
parent 798f7e4858
commit 24d4168e39
2 changed files with 49 additions and 3 deletions

View File

@@ -8,10 +8,11 @@ COPYRIGHT="2013 Christian Loose
2012 CodeCatalyst, LLC"
LICENSE="GNU GPL v2
MIT"
REVISION="3"
REVISION="4"
SOURCE_URI="https://github.com/cloose/CuteMarkEd/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="78a41808c2f0452375810abdff76eeaaee012f8d1368a2b8772ec6b4d2ceeec8"
SOURCE_DIR="CuteMarkEd-$portVersion"
PATCHES="cutemarked-$portVersion.patchset"
ADDITIONAL_FILES="CuteMarkEd.rdef.in"
ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
@@ -24,7 +25,7 @@ PROVIDES="
REQUIRES="
haiku$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
lib:libhunspell_1.6$secondaryArchSuffix
lib:libhunspell_1.7$secondaryArchSuffix
lib:libmarkdown$secondaryArchSuffix
lib:libQt5Core$secondaryArchSuffix
lib:libQt5Gui$secondaryArchSuffix
@@ -38,7 +39,7 @@ REQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libhunspell_1.6$secondaryArchSuffix
devel:libhunspell_1.7$secondaryArchSuffix
devel:libmarkdown$secondaryArchSuffix
devel:libQt5Core$secondaryArchSuffix
devel:libQt5Gui$secondaryArchSuffix

View File

@@ -0,0 +1,45 @@
From 3015d4614ea5e2c1d85dbc0a4869516927c86798 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
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 <QAction>
#include <QFontComboBox>
#include <QItemEditorFactory>
#include <QKeySequence>
--
2.21.0
From 17c34f5d4e04492f604e7b344f6c25d9567059ac 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
diff --git a/app/hunspell/spellchecker_unix.cpp b/app/hunspell/spellchecker_unix.cpp
index 59806c5..996b7e0 100644
--- a/app/hunspell/spellchecker_unix.cpp
+++ b/app/hunspell/spellchecker_unix.cpp
@@ -37,6 +37,9 @@ QMap<QString, Dictionary> SpellChecker::availableDictionaries()
// Ubuntu
paths << QStringLiteral("/usr/share/hunspell");
+ // Haiku
+ paths << QStringLiteral("/system/data/hunspell");
+
// Fedora
paths << QStringLiteral("/usr/local/share/myspell")
<< QStringLiteral("/usr/share/myspell");
--
2.21.0