From 85a96cdea466262ab982f3ccbe5bfc8849f1ba4c Mon Sep 17 00:00:00 2001 From: Mugr Rex Date: Thu, 19 Jan 2023 01:07:00 +0000 Subject: [PATCH] luakit: update to 2.3.3 --- srcpkgs/luakit/patches/glib-pcre2.patch | 39 ------------------------- srcpkgs/luakit/template | 8 ++--- srcpkgs/luakit/update | 1 - 3 files changed, 4 insertions(+), 44 deletions(-) delete mode 100644 srcpkgs/luakit/patches/glib-pcre2.patch delete mode 100644 srcpkgs/luakit/update diff --git a/srcpkgs/luakit/patches/glib-pcre2.patch b/srcpkgs/luakit/patches/glib-pcre2.patch deleted file mode 100644 index f79c38ff5273..000000000000 --- a/srcpkgs/luakit/patches/glib-pcre2.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 4c69751d3ed6c0623aceee3d77499f1c477136ab Mon Sep 17 00:00:00 2001 -From: Tao Nelson -Date: Fri, 23 Sep 2022 19:17:47 +1000 -Subject: [PATCH] Accommodate glib now using pcre2 - ---- - common/clib/regex.c | 2 +- - common/util.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/common/clib/regex.c b/common/clib/regex.c -index c4f42317c..e87156cf8 100644 ---- a/common/clib/regex.c -+++ b/common/clib/regex.c -@@ -59,7 +59,7 @@ luaH_regenerate_regex(lua_State *L, lregex_t *regex) - - GError *error = NULL; - regex->reg = g_regex_new(regex->pattern, -- G_REGEX_DOTALL|G_REGEX_OPTIMIZE|G_REGEX_JAVASCRIPT_COMPAT, 0, &error); -+ G_REGEX_DOTALL|G_REGEX_OPTIMIZE, 0, &error); - if (error) { - lua_pushstring(L, error->message); - g_error_free(error); -diff --git a/common/util.c b/common/util.c -index 4b44d8515..738e1e5cb 100644 ---- a/common/util.c -+++ b/common/util.c -@@ -61,9 +61,9 @@ strip_ansi_escapes(const gchar *in) - static GRegex *reg; - - if (!reg) { -- const gchar *expr = "[\\u001b\\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]"; -+ const gchar *expr = "[\x1b\x9b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]"; - GError *err = NULL; -- reg = g_regex_new(expr, G_REGEX_JAVASCRIPT_COMPAT | G_REGEX_DOTALL | G_REGEX_EXTENDED | G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, &err); -+ reg = g_regex_new(expr, G_REGEX_DOTALL | G_REGEX_EXTENDED | G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, &err); - g_assert_no_error(err); - } - diff --git a/srcpkgs/luakit/template b/srcpkgs/luakit/template index 8f82764e3da8..f852d82ba187 100644 --- a/srcpkgs/luakit/template +++ b/srcpkgs/luakit/template @@ -1,19 +1,19 @@ # Template file for 'luakit' pkgname=luakit reverts="2017.08.10_1" -version=2.3.1 -revision=2 +version=2.3.3 +revision=1 conf_files="/etc/xdg/luakit/*.lua" hostmakedepends="pkg-config LuaJIT" makedepends="webkit2gtk-devel lua51-luafilesystem LuaJIT-devel libsoup-devel" depends="lua51-luafilesystem" short_desc="Fast, small, webkit based browser framework extensible by Lua" -maintainer="Orphaned " +maintainer="Mugr Rex " license="GPL-3.0-or-later" homepage="https://luakit.github.io/" changelog="https://github.com/luakit/luakit/blob/develop/CHANGELOG.md" distfiles="https://github.com/luakit/luakit/archive/${version}.tar.gz" -checksum=138fed1eaccab801fae8c32ff2bec6cbcd864a9f527c5c77ad1de402ce1a130e +checksum=8e6571f11119b31e7a343db7b03f68d823f1fd175fdff4870d40a2afd9e732d5 CFLAGS="-fcommon" diff --git a/srcpkgs/luakit/update b/srcpkgs/luakit/update deleted file mode 100644 index fab90a9fdea2..000000000000 --- a/srcpkgs/luakit/update +++ /dev/null @@ -1 +0,0 @@ -ignore="[12][0-9][0-9][0-9].[01][0-9].[0-3][0-9]"