diff options
Diffstat (limited to 'kde-frameworks')
15 files changed, 180 insertions, 179 deletions
diff --git a/kde-frameworks/kcompletion/files/kcompletion-5.78.0-fix-klineedit.patch b/kde-frameworks/kcompletion/files/kcompletion-5.78.0-fix-klineedit.patch new file mode 100644 index 000000000000..0dd7ace61cd9 --- /dev/null +++ b/kde-frameworks/kcompletion/files/kcompletion-5.78.0-fix-klineedit.patch @@ -0,0 +1,27 @@ +From 7acda936f06193e9fc85ae5cf9ccc8d65971f657 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid <aacid@kde.org> +Date: Tue, 12 Jan 2021 23:43:19 +0100 +Subject: [PATCH] Fix regression caused due to porting from operator+ to + operator| + +BUGS: 431493 +--- + src/klineedit.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/klineedit.cpp b/src/klineedit.cpp +index 1cc9316..8201259 100644 +--- a/src/klineedit.cpp ++++ b/src/klineedit.cpp +@@ -1222,7 +1222,7 @@ bool KLineEditPrivate::overrideShortcut(const QKeyEvent *e) + // but doesn't dare force as "stronger than kaction shortcuts"... + else if (e->matches(QKeySequence::SelectAll)) { + return true; +- } else if (qApp->platformName() == QLatin1String("xcb") && (key == Qt::CTRL | Qt::Key_E || key == Qt::CTRL | Qt::Key_U)) { ++ } else if (qApp->platformName() == QLatin1String("xcb") && (key == (Qt::CTRL | Qt::Key_E) || key == (Qt::CTRL | Qt::Key_U))) { + return true; + } + +-- +GitLab + diff --git a/kde-frameworks/kcompletion/kcompletion-5.78.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.78.0-r1.ebuild index 3381e8ca5305..e75d75f2fc92 100644 --- a/kde-frameworks/kcompletion/kcompletion-5.78.0.ebuild +++ b/kde-frameworks/kcompletion/kcompletion-5.78.0-r1.ebuild @@ -25,6 +25,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${P}-fix-klineedit.patch" ) # KDE-Bug 431493 + src_configure() { local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866 diff --git a/kde-frameworks/kio/files/kio-5.77.0-gcc11.patch b/kde-frameworks/kio/files/kio-5.77.0-gcc11.patch new file mode 100644 index 000000000000..7432364a9864 --- /dev/null +++ b/kde-frameworks/kio/files/kio-5.77.0-gcc11.patch @@ -0,0 +1,32 @@ +From 9965ec1b9e6f6db192a2355e4e3eb80bc27fc092 Mon Sep 17 00:00:00 2001 +From: Ahmad Samir <a.samirh78@gmail.com> +Date: Sun, 24 Jan 2021 11:10:27 +0200 +Subject: [PATCH] Fix build with gcc11 + +Apparently now we need to #include <limit>. + +Patch by Geoff Leach: +https://bugs.gentoo.org/766480 +https://invent.kde.org/frameworks/kio/-/issues/3 + +NO_CHANGELOG +--- + src/kntlm/des.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/kntlm/des.cpp b/src/kntlm/des.cpp +index 18d85bfd..65c86f06 100644 +--- a/src/kntlm/des.cpp ++++ b/src/kntlm/des.cpp +@@ -29,6 +29,8 @@ + #include <string.h> + #include <qendian.h> + ++#include <limits> ++ + static void permute_ip(unsigned char *inblock, DES_KEY *key, unsigned char *outblock); + static void permute_fp(unsigned char *inblock, DES_KEY *key, unsigned char *outblock); + static void perminit_ip(DES_KEY *key); +-- +GitLab + diff --git a/kde-frameworks/kio/kio-5.77.0-r1.ebuild b/kde-frameworks/kio/kio-5.77.0-r1.ebuild index 6b8abe7e5b5e..7219074c6230 100644 --- a/kde-frameworks/kio/kio-5.77.0-r1.ebuild +++ b/kde-frameworks/kio/kio-5.77.0-r1.ebuild @@ -16,6 +16,9 @@ LICENSE="LGPL-2+" KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" IUSE="acl +handbook kerberos +kwallet X" +# tests hang +RESTRICT+=" test" + RDEPEND=" dev-libs/libxml2 dev-libs/libxslt @@ -68,10 +71,10 @@ PDEPEND=" >=kde-frameworks/kded-${PVCUT}:5 " -# tests hang -RESTRICT+=" test" - -PATCHES=( "${FILESDIR}/${P}-crashfix.patch" ) +PATCHES=( + "${FILESDIR}/${P}-crashfix.patch" + "${FILESDIR}/${P}-gcc11.patch" # bug 766480 +) src_configure() { local mycmakeargs=( diff --git a/kde-frameworks/kio/kio-5.78.0.ebuild b/kde-frameworks/kio/kio-5.78.0.ebuild index 04866eaeffa4..4b22f628f1f7 100644 --- a/kde-frameworks/kio/kio-5.78.0.ebuild +++ b/kde-frameworks/kio/kio-5.78.0.ebuild @@ -16,6 +16,9 @@ LICENSE="LGPL-2+" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="acl +handbook kerberos +kwallet X" +# tests hang +RESTRICT+=" test" + RDEPEND=" dev-libs/libxml2 dev-libs/libxslt @@ -68,8 +71,7 @@ PDEPEND=" >=kde-frameworks/kded-${PVCUT}:5 " -# tests hang -RESTRICT+=" test" +PATCHES=( "${FILESDIR}/${PN}-5.77.0-gcc11.patch" ) # bug 766480 src_configure() { local mycmakeargs=( diff --git a/kde-frameworks/kirigami/files/kirigami-5.77.0-no-reverseTwinsChanged-destr-FormLayout.patch b/kde-frameworks/kirigami/files/kirigami-5.77.0-no-reverseTwinsChanged-destr-FormLayout.patch new file mode 100644 index 000000000000..5bda9da38249 --- /dev/null +++ b/kde-frameworks/kirigami/files/kirigami-5.77.0-no-reverseTwinsChanged-destr-FormLayout.patch @@ -0,0 +1,35 @@ +From b4a6c562cde4e064494e261bc3f64000cbf628a5 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Thu, 14 Jan 2021 15:23:39 +0100 +Subject: [PATCH] Don't manually call reverseTwinsChanged when destructing + FormLayout + +This line causes a crash when destructing the screenlocker KCM. +It doesn't seem to be caused by reverseTwinsChanged itself but rather by +accessing the Qt object. I don't fully undestand the root cause. + +However the call itself appears to be unnecessary since in the line +above we write to reverseTwins and that triggers the changed signal if +needed. + +BUG: 431419 +BUG: 428461 +--- + src/controls/FormLayout.qml | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/controls/FormLayout.qml b/src/controls/FormLayout.qml +index 74292fda..a27903f2 100644 +--- a/src/controls/FormLayout.qml ++++ b/src/controls/FormLayout.qml +@@ -84,7 +84,6 @@ Item { + Component.onDestruction: { + for (let i in twinFormLayouts) { + twinFormLayouts[i].children[0].reverseTwins = twinFormLayouts[i].children[0].reverseTwins.filter(function(value, index, arr){ return value != root;}) +- Qt.callLater(() => twinFormLayouts[i].children[0].reverseTwinsChanged()); + } + } + GridLayout { +-- +GitLab + diff --git a/kde-frameworks/kirigami/kirigami-5.77.0-r1.ebuild b/kde-frameworks/kirigami/kirigami-5.77.0-r1.ebuild new file mode 100644 index 000000000000..bbe9de249552 --- /dev/null +++ b/kde-frameworks/kirigami/kirigami-5.77.0-r1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_EXAMPLES="true" +ECM_QTHELP="false" +ECM_TEST="true" +KDE_ORG_NAME="${PN}2" +QTMIN=5.15.1 +inherit ecm kde.org + +DESCRIPTION="Lightweight user interface framework for mobile and convergent applications" +HOMEPAGE="https://techbase.kde.org/Kirigami" +EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}" + +LICENSE="LGPL-2+" +KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" +IUSE="" + +# requires package to already be installed +RESTRICT+=" test" + +BDEPEND=" + >=dev-qt/linguist-tools-${QTMIN}:5 +" +DEPEND=" + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 +" +RDEPEND="${DEPEND} + >=dev-qt/qtgraphicaleffects-${QTMIN}:5 +" + +PATCHES=( + # KDE-Bugs #428461, #431419 + "${FILESDIR}/${P}-no-reverseTwinsChanged-destr-FormLayout.patch" +) + +src_configure() { + local mycmakeargs=( + -DBUILD_EXAMPLES=$(usex examples) + ) + + ecm_src_configure +} diff --git a/kde-frameworks/kirigami/kirigami-5.78.0.ebuild b/kde-frameworks/kirigami/kirigami-5.78.0-r1.ebuild index cf073175ace8..e44584cc323e 100644 --- a/kde-frameworks/kirigami/kirigami-5.78.0.ebuild +++ b/kde-frameworks/kirigami/kirigami-5.78.0-r1.ebuild @@ -18,6 +18,9 @@ LICENSE="LGPL-2+" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="" +# requires package to already be installed +RESTRICT+=" test" + BDEPEND=" >=dev-qt/linguist-tools-${QTMIN}:5 " @@ -34,8 +37,10 @@ RDEPEND="${DEPEND} >=dev-qt/qtgraphicaleffects-${QTMIN}:5 " -# requires package to already be installed -RESTRICT+=" test" +PATCHES=( + # KDE-Bugs #428461, #431419 + "${FILESDIR}/${PN}-5.77.0-no-reverseTwinsChanged-destr-FormLayout.patch" +) src_configure() { local mycmakeargs=( diff --git a/kde-frameworks/purpose/purpose-5.77.0.ebuild b/kde-frameworks/purpose/purpose-5.77.0-r1.ebuild index 2a38cdbeb63c..b00835aa55bf 100644 --- a/kde-frameworks/purpose/purpose-5.77.0.ebuild +++ b/kde-frameworks/purpose/purpose-5.77.0-r1.ebuild @@ -42,7 +42,9 @@ RESTRICT+=" test" src_prepare() { ecm_src_prepare - cmake_run_in src/plugins cmake_comment_add_subdirectory bluetooth + + use bluetooth || + cmake_run_in src/plugins cmake_comment_add_subdirectory bluetooth } src_configure() { diff --git a/kde-frameworks/purpose/purpose-5.78.0.ebuild b/kde-frameworks/purpose/purpose-5.78.0-r1.ebuild index c03ada7bf4cc..1911a132479c 100644 --- a/kde-frameworks/purpose/purpose-5.78.0.ebuild +++ b/kde-frameworks/purpose/purpose-5.78.0-r1.ebuild @@ -42,7 +42,9 @@ RESTRICT+=" test" src_prepare() { ecm_src_prepare - cmake_run_in src/plugins cmake_comment_add_subdirectory bluetooth + + use bluetooth || + cmake_run_in src/plugins cmake_comment_add_subdirectory bluetooth } src_configure() { diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest index f04e8a1a33c3..de59ba710be7 100644 --- a/kde-frameworks/syntax-highlighting/Manifest +++ b/kde-frameworks/syntax-highlighting/Manifest @@ -1,3 +1,4 @@ DIST syntax-highlighting-5.77.0-bash-zsh-fixes.patch.xz 91824 BLAKE2B 4d201e62aecc7126f11d52ef2d68c308e61f7e167312270baf093eab379a7d95efaa38fec604701ad0fc15e8e050191a00a4075dac488c957fabe4dc4994065f SHA512 598eb3ed82f2bd072750730e6f9492d821a63cc2ebb4877e83aa482597a6cfb50ac721945f5c176c45d75de970dfba3c79f0e048db9076d7451743e672512c97 +DIST syntax-highlighting-5.77.0-bash-zsh-fixes.tar.xz 95008 BLAKE2B 9fe2a2121687070f176633334ddb853f4d34ab6a5dbdff69f081d8a79785dfb1b989feb564f6a7304a6c008e4a79df8091e3e89b3afe6c5f8e6b1ead676f7bfe SHA512 e2ea8caeb75f8cf2b98060f44d39db4019cdca9b318dc7d34b538fb98659a8f98b0771a89ddaf57d35f9a33e9643dabf4eb16ce218538f1680df4e306640bdfc DIST syntax-highlighting-5.77.0.tar.xz 2145120 BLAKE2B de91836509fd6264fe0b79f1a7153c4d581913870ec207bd4d69ce24c5d00d92e49ebc70d147715a732626805cf68045be6490ff6ae7e199454c53a4c82ec2dd SHA512 057e9be24608cd856ee8aea355ddc63da9a11d50c388ae303e1f34cdf3a7ac99c592de51e0f04fa2254246ad796ced5029117b22ca71420b6089139d827a31b9 DIST syntax-highlighting-5.78.0.tar.xz 2201352 BLAKE2B 6cd72e85d43d5061a490da6ff13f16c6e3ad2decd4efc65b8a5ec82f1815102bab0a546cd929a8ce82bccc163a809efb8cc5c82ecba98a410d0debef16b47884 SHA512 e9d47f69a14a890a4c5c0e9c33cce51fa6fef93d5c50b565b4d6e2d1978cddd8ffb4239534ddb02decf75190ec3b5446ca387901cda9f27f59088b6853c76843 diff --git a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-fix.patch b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-fix.patch deleted file mode 100644 index 2ec92edb9c8f..000000000000 --- a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-fix.patch +++ /dev/null @@ -1,122 +0,0 @@ -From ba9b3c5e0ed2fb33b9a896ec910590410978befe Mon Sep 17 00:00:00 2001 -From: Jonathan Poelen <jonathan.poelen@gmail.com> -Date: Mon, 11 Jan 2021 01:29:01 +0100 -Subject: [PATCH] Bash: fix #5: $ at the end of a double quoted string - ---- - autotests/folding/highlight.sh.fold | 1 + - autotests/html/highlight.sh.dark.html | 1 + - autotests/html/highlight.sh.html | 1 + - autotests/input/highlight.sh | 1 + - autotests/reference/highlight.sh.ref | 1 + - data/syntax/bash.xml | 5 +++-- - data/syntax/zsh.xml | 3 +-- - 7 files changed, 9 insertions(+), 4 deletions(-) - -diff --git a/autotests/folding/highlight.sh.fold b/autotests/folding/highlight.sh.fold -index 652fef8f..d7a6b210 100644 ---- a/autotests/folding/highlight.sh.fold -+++ b/autotests/folding/highlight.sh.fold -@@ -16,6 +16,7 @@ echo 'single quoted string' - echo "double quoted string" - echo $'string with esc\apes\x0din it' - echo $"string meant to be translated" -+echo "$" - - - # comments: -diff --git a/autotests/html/highlight.sh.dark.html b/autotests/html/highlight.sh.dark.html -index d1d4fb8a..8cbd0929 100644 ---- a/autotests/html/highlight.sh.dark.html -+++ b/autotests/html/highlight.sh.dark.html -@@ -22,6 +22,7 @@ - <span style="color:#7f8c8d;">echo</span> <span style="color:#f44f4f;">"double quoted string"</span> - <span style="color:#7f8c8d;">echo</span> <span style="color:#f44f4f;">$'string with esc</span><span style="color:#2980b9;">\a</span><span style="color:#f44f4f;">pes</span><span style="color:#2980b9;">\x0d</span><span style="color:#f44f4f;">in it'</span> - <span style="color:#7f8c8d;">echo</span> <span style="color:#f44f4f;">$"</span><span style="color:#f44f4f;">string meant to be translated"</span> -+<span style="color:#7f8c8d;">echo</span> <span style="color:#f44f4f;">"$"</span> - - - <span style="color:#7a7c7d;"># comments:</span> -diff --git a/autotests/html/highlight.sh.html b/autotests/html/highlight.sh.html -index 5d687d86..d176b1cb 100644 ---- a/autotests/html/highlight.sh.html -+++ b/autotests/html/highlight.sh.html -@@ -22,6 +22,7 @@ - <span style="color:#644a9b;font-weight:bold;">echo</span> <span style="color:#bf0303;">"double quoted string"</span> - <span style="color:#644a9b;font-weight:bold;">echo</span> <span style="color:#bf0303;">$'string with esc</span><span style="color:#0057ae;">\a</span><span style="color:#bf0303;">pes</span><span style="color:#0057ae;">\x0d</span><span style="color:#bf0303;">in it'</span> - <span style="color:#644a9b;font-weight:bold;">echo</span> <span style="color:#bf0303;">$"</span><span style="color:#bf0303;">string meant to be translated"</span> -+<span style="color:#644a9b;font-weight:bold;">echo</span> <span style="color:#bf0303;">"$"</span> - - - <span style="color:#898887;"># comments:</span> -diff --git a/autotests/input/highlight.sh b/autotests/input/highlight.sh -index 177e104f..5c2ae7b1 100644 ---- a/autotests/input/highlight.sh -+++ b/autotests/input/highlight.sh -@@ -16,6 +16,7 @@ echo 'single quoted string' - echo "double quoted string" - echo $'string with esc\apes\x0din it' - echo $"string meant to be translated" -+echo "$" - - - # comments: -diff --git a/autotests/reference/highlight.sh.ref b/autotests/reference/highlight.sh.ref -index 181c36af..edaf18ab 100644 ---- a/autotests/reference/highlight.sh.ref -+++ b/autotests/reference/highlight.sh.ref -@@ -16,6 +16,7 @@ - <Builtin>echo</Builtin><Normal Text> </Normal Text><String DoubleQ>"double quoted string"</String DoubleQ><br/> - <Builtin>echo</Builtin><Normal Text> </Normal Text><String SingleQ>$'string with esc</String SingleQ><String Escape>\a</String Escape><String SingleQ>pes</String SingleQ><String Escape>\x0d</String Escape><String SingleQ>in it'</String SingleQ><br/> - <Builtin>echo</Builtin><Normal Text> </Normal Text><String Transl.>$"</String Transl.><String DoubleQ>string meant to be translated"</String DoubleQ><br/> -+<Builtin>echo</Builtin><Normal Text> </Normal Text><String DoubleQ>"$"</String DoubleQ><br/> - <Normal Text></Normal Text><br/> - <Normal Text></Normal Text><br/> - <Comment># comments:</Comment><br/> -diff --git a/data/syntax/bash.xml b/data/syntax/bash.xml -index 3171247b..3b804f90 100644 ---- a/data/syntax/bash.xml -+++ b/data/syntax/bash.xml -@@ -30,7 +30,7 @@ - <!ENTITY heredocq "(?|"([^"]+)"|'([^']+)'|\\(.[^&wordseps;&substseps;]*))"> - ]> - --<language name="Bash" version="20" kateversion="5.62" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL"> -+<language name="Bash" version="21" kateversion="5.62" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD" 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) -@@ -943,7 +943,8 @@ - <DetectChar attribute="Backquote" context="RegularBackq" char="`"/> - </context> - <context attribute="String DoubleQ" lineEndContext="#stay" name="StringDQDispatchVariables"> -- <IncludeRules context="DispatchVariables"/> -+ <IncludeRules context="DispatchSubstVariables"/> -+ <IncludeRules context="DispatchVarnameVariables"/> - <DetectChar attribute="String DoubleQ" context="#pop" char="$"/> - </context> - <context attribute="String DoubleQ" lineEndContext="#pop" name="StringDQEscape"> -diff --git a/data/syntax/zsh.xml b/data/syntax/zsh.xml -index ada258c8..5aa83290 100644 ---- a/data/syntax/zsh.xml -+++ b/data/syntax/zsh.xml -@@ -55,7 +55,7 @@ - <!ENTITY int "(?:[0-9]++(_++[0-9]++)*+)"> - <!ENTITY exp "(?:[eE][-+]?∫)"> - ]> --<language name="Zsh" version="12" kateversion="5.62" section="Scripts" extensions="*.sh;*.zsh;.zshrc;.zprofile;.zlogin;.zlogout;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Jonathan Poelen (jonathan.poelen@gmail.com)" license="MIT"> -+<language name="Zsh" version="13" kateversion="5.62" section="Scripts" extensions="*.sh;*.zsh;.zshrc;.zprofile;.zlogin;.zlogout;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Jonathan Poelen (jonathan.poelen@gmail.com)" license="MIT"> - - <highlighting> - <list name="keywords"> -@@ -893,7 +893,6 @@ - </context> - <context attribute="String DoubleQ" lineEndContext="#stay" name="StringDQDispatchVariables"> - <IncludeRules context="DispatchSubstVariables"/> -- <Detect2Chars attribute="String SingleQ" context="#pop!StringEsc" char="$" char1="'"/> - <IncludeRules context="DispatchVarNameVariables"/> - <DetectChar attribute="String DoubleQ" context="#pop" char="$"/> - </context> --- -GitLab - diff --git a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-version.patch b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-version.patch deleted file mode 100644 index 2a7f2684bfb8..000000000000 --- a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-version.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 70b56cf8b3d1a85e15d1e09aa8490e5183967de0 Mon Sep 17 00:00:00 2001 -From: Christoph Cullmann <cullmann@kde.org> -Date: Wed, 30 Dec 2020 17:35:48 +0100 -Subject: [PATCH] increment version - ---- - data/syntax/bash.xml | 2 +- - data/syntax/zsh.xml | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/data/syntax/bash.xml b/data/syntax/bash.xml -index 676b630d..3171247b 100644 ---- a/data/syntax/bash.xml -+++ b/data/syntax/bash.xml -@@ -30,7 +30,7 @@ - <!ENTITY heredocq "(?|"([^"]+)"|'([^']+)'|\\(.[^&wordseps;&substseps;]*))"> - ]> - --<language name="Bash" version="19" kateversion="5.62" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL"> -+<language name="Bash" version="20" kateversion="5.62" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD" 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) -diff --git a/data/syntax/zsh.xml b/data/syntax/zsh.xml -index 120b345e..ada258c8 100644 ---- a/data/syntax/zsh.xml -+++ b/data/syntax/zsh.xml -@@ -55,7 +55,7 @@ - <!ENTITY int "(?:[0-9]++(_++[0-9]++)*+)"> - <!ENTITY exp "(?:[eE][-+]?∫)"> - ]> --<language name="Zsh" version="11" kateversion="5.62" section="Scripts" extensions="*.sh;*.zsh;.zshrc;.zprofile;.zlogin;.zlogout;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Jonathan Poelen (jonathan.poelen@gmail.com)" license="MIT"> -+<language name="Zsh" version="12" kateversion="5.62" section="Scripts" extensions="*.sh;*.zsh;.zshrc;.zprofile;.zlogin;.zlogout;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Jonathan Poelen (jonathan.poelen@gmail.com)" license="MIT"> - - <highlighting> - <list name="keywords"> --- -2.30.0 - diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.78.0-r1.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0-r3.ebuild index 4dabf263ae74..5528791bfb1b 100644 --- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.78.0-r1.ebuild +++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0-r3.ebuild @@ -8,8 +8,10 @@ QTMIN=5.15.1 inherit ecm kde.org DESCRIPTION="Framework for syntax highlighting" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-bash-zsh-fixes.tar.xz" + LICENSE="MIT" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" IUSE="nls" BDEPEND=" @@ -23,9 +25,7 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}"/${PN}-5.77.0-bash-zsh-fix.patch -) +PATCHES=( "${WORKDIR}"/${P}-bash-zsh-fixes ) src_install() { ecm_src_install diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0-r2.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.78.0-r2.ebuild index 3d8083137a2b..95a0b82859d9 100644 --- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0-r2.ebuild +++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.78.0-r2.ebuild @@ -8,7 +8,7 @@ QTMIN=5.15.1 inherit ecm kde.org DESCRIPTION="Framework for syntax highlighting" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-bash-zsh-fixes.patch.xz" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-5.77.0-bash-zsh-fixes.tar.xz" LICENSE="MIT" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" @@ -26,9 +26,9 @@ DEPEND=" RDEPEND="${DEPEND}" PATCHES=( - "${WORKDIR}"/${P}-bash-zsh-fixes.patch - "${FILESDIR}"/${PN}-5.77.0-bash-zsh-version.patch - "${FILESDIR}"/${PN}-5.77.0-bash-zsh-fix.patch + "${WORKDIR}/${PN}-5.77.0-bash-zsh-fixes"/0010-Bash-fix-5-at-the-end-of-a-double-quoted-string.patch + "${WORKDIR}/${PN}-5.77.0-bash-zsh-fixes"/0011-Bash-fix-in-xy-and-more-Parameter-Expansion-Operator.patch + "${WORKDIR}/${PN}-5.77.0-bash-zsh-fixes"/0012-Bash-Zsh-fix-cmd-in-a-case.patch ) src_install() { |