Control: tags -1 + patch
Please find attached a patch, basically only build-tested (I also ran
it but I find it difficult to test specifically the affected code).
Description: Port to PCRE2.
Bug-Debian:
https://bugs.debian.org/1000093
Author: Yavor Doganov <
yavor@gnu.org>
Forwarded: no
Last-Update: 2024-01-09
---
--- mysql-workbench-8.0.32+dfsg.orig/CMakeLists.txt
+++ mysql-workbench-8.0.32+dfsg/CMakeLists.txt
@@ -119,7 +119,7 @@
endif(UNIX)
-pkg_check_modules(PCRE REQUIRED libpcre libpcrecpp)
+pkg_check_modules(PCRE REQUIRED libpcre2-8)
pkg_check_modules(CAIRO REQUIRED cairo>=1.5.12)
pkg_check_modules(UUID REQUIRED uuid)
pkg_check_modules(LIBZIP REQUIRED libzip)
--- mysql-workbench-8.0.32+dfsg.orig/library/grt/src/grtpp_shell.cpp
+++ mysql-workbench-8.0.32+dfsg/library/grt/src/grtpp_shell.cpp
@@ -21,7 +21,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <pcre.h>
+#define PCRE2_CODE_UNIT_WIDTH 8
+#include <pcre2.h>
#include "grtpp_shell.h"
using namespace grt;
@@ -30,28 +31,34 @@
char *get_value_from_text_ex_opt(const char *txt, int txt_length, const char *regexpr, unsigned int substring_nr,
int options_for_exec) {
- pcre *pcre_exp;
- const char *error_str;
- int erroffset;
- int o_vector[O_VECTOR_COUNT