diff options
| author | moson-mo | 2023-11-10 14:51:11 +0100 |
|---|---|---|
| committer | moson-mo | 2023-11-10 14:51:11 +0100 |
| commit | 1f1881fa0ec366fd5ac446cf52030b04b322e1f0 (patch) | |
| tree | 259fb5d19dc471907b15ffae7612785d5d08c590 | |
| parent | a78e5da558e70ff6020d3ec7c8647ad539e7cc09 (diff) | |
| download | aur-potatopresenter.tar.gz | |
KF5 update/fix
Signed-off-by: moson-mo <mo-son@mailbox.org>
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | ksyntaxhighlighting_build_fix.patch | 34 |
4 files changed, 49 insertions, 7 deletions
@@ -1,13 +1,13 @@ pkgbase = potatopresenter pkgdesc = Tool to create presentation slides that can be exported as PDF. pkgver = 1.0.2 - pkgrel = 1 + pkgrel = 2 url = https://github.com/thgier/PotatoPresenter arch = x86_64 license = LGPL2.1 makedepends = cmake makedepends = antlr4 - depends = ktexteditor + depends = ktexteditor5 depends = antlr4-runtime optdepends = texlive-latexextra: for LaTeX formular support optdepends = texlive-fontsextra: for LaTeX formular support @@ -17,8 +17,10 @@ pkgbase = potatopresenter source = potatopresenter-1.0.2.tar.gz::https://github.com/thgier/PotatoPresenter/archive/v1.0.2.tar.gz source = https://raw.githubusercontent.com/thgier/PotatoPresenter/master/potato_logo.svg source = potatopresenter.desktop + source = ksyntaxhighlighting_build_fix.patch sha256sums = 65b954265ac4f364566ebbaf5e41e25509d57b5eb18153d33d1b5b122787308c sha256sums = d96b384a4e8ba5365785f9be8cd77e2f54d0ae767de7ae4c2f2f52c9de0e083b sha256sums = 030597070eefe827d1895f3736cf2c70753e2ca13812350610122193976a2a7c + sha256sums = 4e0581a74afaa718894f68e6335f1715690c610ae5555960aed505542607053c pkgname = potatopresenter diff --git a/.gitignore b/.gitignore index 1efdd18dfffc..bfc73661dd4c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ !.gitignore !PKGBUILD !.SRCINFO -!potatopresenter.desktop
\ No newline at end of file +!potatopresenter.desktop +!ksyntaxhighlighting_build_fix.patch
\ No newline at end of file @@ -4,12 +4,12 @@ _name=PotatoPresenter pkgname=potatopresenter pkgver=1.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="Tool to create presentation slides that can be exported as PDF." arch=('x86_64') url="https://github.com/thgier/PotatoPresenter" license=('LGPL2.1') -depends=('ktexteditor' 'antlr4-runtime') +depends=('ktexteditor5' 'antlr4-runtime') makedepends=('cmake' 'antlr4') optdepends=('texlive-latexextra: for LaTeX formular support' 'texlive-fontsextra: for LaTeX formular support' @@ -18,16 +18,21 @@ provides=('potatopresenter') conflicts=('potatopresenter') source=("$pkgname-$pkgver.tar.gz::$url/archive/v${pkgver}.tar.gz" "https://raw.githubusercontent.com/thgier/PotatoPresenter/master/potato_logo.svg" - "potatopresenter.desktop") + "potatopresenter.desktop" + "ksyntaxhighlighting_build_fix.patch") sha256sums=('65b954265ac4f364566ebbaf5e41e25509d57b5eb18153d33d1b5b122787308c' 'd96b384a4e8ba5365785f9be8cd77e2f54d0ae767de7ae4c2f2f52c9de0e083b' - '030597070eefe827d1895f3736cf2c70753e2ca13812350610122193976a2a7c') + '030597070eefe827d1895f3736cf2c70753e2ca13812350610122193976a2a7c' + '4e0581a74afaa718894f68e6335f1715690c610ae5555960aed505542607053c') prepare() { cd $_name-$pkgver/src/antlr/markdown/ ./generate.sh cd ../potato/ ./generate.sh + + cd "$srcdir/$_name-$pkgver" + patch -p1 -i ../ksyntaxhighlighting_build_fix.patch } build() { diff --git a/ksyntaxhighlighting_build_fix.patch b/ksyntaxhighlighting_build_fix.patch new file mode 100644 index 000000000000..5d7a39740c90 --- /dev/null +++ b/ksyntaxhighlighting_build_fix.patch @@ -0,0 +1,34 @@ +diff --git a/src/core/codehighlighter.cpp b/src/core/codehighlighter.cpp +index 0f28745..71faef8 100644 +--- a/src/core/codehighlighter.cpp ++++ b/src/core/codehighlighter.cpp +@@ -5,9 +5,9 @@ + */ + + #include "codehighlighter.h" +-#include <format.h> +-#include <state.h> +-#include <definition.h> ++#include <KSyntaxHighlighting/format.h> ++#include <KSyntaxHighlighting/state.h> ++#include <KSyntaxHighlighting/definition.h> + #include <QDebug> + + CodeHighlighter::CodeHighlighter(QString language) +diff --git a/src/core/codehighlighter.h b/src/core/codehighlighter.h +index 9b6d0f8..9c29224 100644 +--- a/src/core/codehighlighter.h ++++ b/src/core/codehighlighter.h +@@ -9,9 +9,9 @@ + + #include <vector> + #include <QTextLayout> +-#include <abstracthighlighter.h> +-#include <repository.h> +-#include <theme.h> ++#include <KSyntaxHighlighting/abstracthighlighter.h> ++#include <KSyntaxHighlighting/repository.h> ++#include <KSyntaxHighlighting/theme.h> + + class CodeHighlighter : private KSyntaxHighlighting::AbstractHighlighter + { |