wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-06 15:13:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

luakit: fix for glib 2.74

Browse source
This commit is contained in:
Michal Vasilek 2022-10-03 23:41:21 +02:00
parent 472c6fbd0f
commit 91517bb7b0
2 changed files with 40 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
srcpkgs/luakit/patches/glib-pcre2.patch Normal file
View file

@ -0,0 +1,39 @@
From 4c69751d3ed6c0623aceee3d77499f1c477136ab Mon Sep 17 00:00:00 2001
From: Tao Nelson <taobert@gmail.com>
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);
}

2
srcpkgs/luakit/template
View file

@ -2,7 +2,7 @@
pkgname=luakit
reverts="2017.08.10_1"
version=2.3.1
revision=1
revision=2
conf_files="/etc/xdg/luakit/*.lua"
hostmakedepends="pkg-config LuaJIT"
makedepends="webkit2gtk-devel lua51-luafilesystem LuaJIT-devel libsoup-devel"