summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntonio Rojas2015-10-11 21:46:15 +0200
committerAntonio Rojas2015-10-11 21:46:15 +0200
commitf4cebff801e4c71c9c14b860f6bfc0e9983e452c (patch)
tree411c296c6c85861d66b9eab43b9c1d8c40032464
parentf77c5198f36241e2cdbd93b5ab08969d5b764526 (diff)
downloadaur-f4cebff801e4c71c9c14b860f6bfc0e9983e452c.tar.gz
Rebase patch
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--pkgbuild-syntax-highlight.patch4
3 files changed, 6 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9aba67b9e38f..1d8fded2b748 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ktexteditor-git
pkgdesc = KTextEditor framework
- pkgver = r972.61bf5b0
+ pkgver = r1114.f3f4319
pkgrel = 1
url = https://projects.kde.org/projects/frameworks/ktexteditor
arch = i686
@@ -15,7 +15,7 @@ pkgbase = ktexteditor-git
source = git://anongit.kde.org/ktexteditor.git
source = pkgbuild-syntax-highlight.patch
md5sums = SKIP
- md5sums = cc66f75c967dd7ac7c97375875772d69
+ md5sums = 3a03efe92f1403991c51f2859ee092f6
pkgname = ktexteditor-git
diff --git a/PKGBUILD b/PKGBUILD
index 5a79da0a311a..dea7ccd3bb19 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=ktexteditor-git
-pkgver=r972.61bf5b0
+pkgver=r1114.f3f4319
pkgrel=1
pkgdesc='KTextEditor framework'
arch=(i686 x86_64)
@@ -13,7 +13,7 @@ provides=(ktexteditor)
conflicts=(ktexteditor)
source=('git://anongit.kde.org/ktexteditor.git' "pkgbuild-syntax-highlight.patch")
md5sums=('SKIP'
- 'cc66f75c967dd7ac7c97375875772d69')
+ '3a03efe92f1403991c51f2859ee092f6')
pkgver() {
cd ktexteditor
diff --git a/pkgbuild-syntax-highlight.patch b/pkgbuild-syntax-highlight.patch
index bcecc7e52acd..5105553f0a03 100644
--- a/pkgbuild-syntax-highlight.patch
+++ b/pkgbuild-syntax-highlight.patch
@@ -4,8 +4,8 @@
<!ENTITY noword "(?![\w$+-])"> <!-- no word, $, + or - following -->
<!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )"> <!-- valid character in a file name -->
]>
--<language name="Bash" version="2.17" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
-+<language name="Bash" version="2.17" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+-<language name="Bash" version="2.18" kateversion="5.0" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
++<language name="Bash" version="2.18" kateversion="5.0" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
<!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)