summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--qt6/qt6webengine/HISTORY1
-rwxr-xr-xqt6/qt6webengine/PRE_BUILD3
-rw-r--r--qt6/qt6webengine/patches/0001-find-recent-re2.patch33
3 files changed, 37 insertions, 0 deletions
diff --git a/qt6/qt6webengine/HISTORY b/qt6/qt6webengine/HISTORY
index a8bedd1482..5d913010d8 100644
--- a/qt6/qt6webengine/HISTORY
+++ b/qt6/qt6webengine/HISTORY
@@ -1,6 +1,7 @@
2021-10-26 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 6.2.1
* BUILD: limit number of jobs
+ * PRE_BUILD patches/*: detect recent re2
2021-09-30 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 6.2.0
diff --git a/qt6/qt6webengine/PRE_BUILD b/qt6/qt6webengine/PRE_BUILD
new file mode 100755
index 0000000000..4604ffcd89
--- /dev/null
+++ b/qt6/qt6webengine/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches
diff --git a/qt6/qt6webengine/patches/0001-find-recent-re2.patch b/qt6/qt6webengine/patches/0001-find-recent-re2.patch
new file mode 100644
index 0000000000..a3b35fe3b1
--- /dev/null
+++ b/qt6/qt6webengine/patches/0001-find-recent-re2.patch
@@ -0,0 +1,33 @@
+From 4a5ca518ade0b84d74f6b6144a5aba7d790a2dae Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve@sourcemage.org>
+Date: Fri, 4 Jun 2021 15:14:03 +0200
+Subject: [PATCH] find recent re2
+
+---
+ configure.cmake | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.cmake b/configure.cmake
+index 37215abb..92a2652c 100644
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -12,6 +12,7 @@ else()
+ find_package(BISON)
+ find_package(FLEX)
+ find_package(PkgConfig)
++ find_package(re2)
+ find_package(Snappy)
+ find_package(Nodejs 10.19)
+ endif()
+@@ -56,7 +57,7 @@ endif()
+ qt_config_compile_test(re2
+ LABEL "re2"
+ LIBRARIES
+- PkgConfig::RE2
++ re2::re2
+ CODE
+ "
+ #include \"re2/filtered_re2.h\"
+--
+2.33.1
+