From a822380b3baf4529433295cc64a06565e2532f22 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Sun, 4 Jun 2023 22:04:41 +0200 Subject: [PATCH] vala-language-server: update to 0.48.7 --- .../patches/glib-2.74-regex.patch | 46 ------------------- srcpkgs/vala-language-server/template | 4 +- 2 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 srcpkgs/vala-language-server/patches/glib-2.74-regex.patch diff --git a/srcpkgs/vala-language-server/patches/glib-2.74-regex.patch b/srcpkgs/vala-language-server/patches/glib-2.74-regex.patch deleted file mode 100644 index 53511585ca5..00000000000 --- a/srcpkgs/vala-language-server/patches/glib-2.74-regex.patch +++ /dev/null @@ -1,46 +0,0 @@ -From b6193265d68b90755d57938c2ba1895841cf4b36 Mon Sep 17 00:00:00 2001 -From: Princeton Ferro -Date: Sat, 24 Sep 2022 18:07:27 -0400 -Subject: [PATCH] fix regex for links in comments (#268) - -Closes #263 ---- - src/documentation/doccomment.vala | 2 +- - src/documentation/girdocumentation.vala | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/documentation/doccomment.vala b/src/documentation/doccomment.vala -index 53bc2520..613cccaf 100644 ---- a/src/documentation/doccomment.vala -+++ b/src/documentation/doccomment.vala -@@ -129,7 +129,7 @@ class Vls.DocComment { - body = /{{{(\w+)?(.*?)}}}/s.replace (body, body.length, 0, "```\\1\\2```"); - - // images and links -- body = /(\[\[|{{)([~:\/\\\w-.]+)(\|(.*?))?(\]\]|}})/ -+ body = /(\[\[|{{)([~:\/\\\w\-.]+)(\|(.*?))?(\]\]|}})/ - .replace_eval (body, body.length, 0, 0, (match_info, result) => { - string type = match_info.fetch (1) ?? ""; - string href = match_info.fetch (2) ?? ""; -diff --git a/src/documentation/girdocumentation.vala b/src/documentation/girdocumentation.vala -index 93e0aaeb..36e8b7d7 100644 ---- a/src/documentation/girdocumentation.vala -+++ b/src/documentation/girdocumentation.vala -@@ -356,7 +356,7 @@ class Vls.GirDocumentation { - if (gtkdoc_dir != null) { - // substitute image URLs - // substitute relative paths in GIR comments for absolute paths to GTK-Doc resources -- comment_data = /!\[(.*?)\]\(([~:\/\\\w-.]+)\)/ -+ comment_data = /!\[(.*?)\]\(([~:\/\\\w\-.]+)\)/ - .replace_eval (comment_data, comment_data.length, 0, 0, (match_info, result) => { - string link_label = match_info.fetch (1) ?? ""; - string link_href = match_info.fetch (2) ?? ""; -@@ -386,7 +386,7 @@ class Vls.GirDocumentation { - }); - - // now, substitute references to sections -- comment_data = /\[(.*?)\]\[([\w-\s]+)\]/ -+ comment_data = /\[(.*?)\]\[([\w\-\s]+)\]/ - .replace_eval (comment_data, comment_data.length, 0, 0, (match_info, result) => { - string link_label = match_info.fetch (1) ?? ""; - string section = match_info.fetch (2) ?? ""; diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template index aa5eeec286c..2b79b3652de 100644 --- a/srcpkgs/vala-language-server/template +++ b/srcpkgs/vala-language-server/template @@ -1,6 +1,6 @@ # Template file for 'vala-language-server' pkgname=vala-language-server -version=0.48.5 +version=0.48.7 revision=1 build_style=meson hostmakedepends="gettext pkg-config vala" @@ -10,4 +10,4 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://github.com/benwaffle/vala-language-server" distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz" -checksum=c2ace01705c21ee79db281e61035dba00c4d9780e3227921ec7167ba49eb42b7 +checksum=6e848334accd27566843d56db15bedcf7529dc68e416d23d3b4e9fc522019c68