From e0b8daa86ca08c8f38f3b1e3428011e1d36effcb Mon Sep 17 00:00:00 2001
From: spotrh <spot@fedoraproject.org>
Date: Sep 20 2022 19:32:26 +0000
Subject: use pcre2 and gmime30


---

diff --git a/gambas-3.17.3-force-pcre2.patch b/gambas-3.17.3-force-pcre2.patch
new file mode 100644
index 0000000..7c4c56f
--- /dev/null
+++ b/gambas-3.17.3-force-pcre2.patch
@@ -0,0 +1,60 @@
+diff -up gambas-3.17.3/gb.pcre/configure.ac.just-pcre2 gambas-3.17.3/gb.pcre/configure.ac
+--- gambas-3.17.3/gb.pcre/configure.ac.just-pcre2	2022-09-20 14:20:07.418837160 -0400
++++ gambas-3.17.3/gb.pcre/configure.ac	2022-09-20 14:21:12.326309588 -0400
+@@ -11,22 +11,6 @@ GB_COMPONENT_PKG_CONFIG(
+   pcre, PCRE, gb.pcre, [src],
+   libpcre2-8)
+ 
+-if test "$have_pcre" != "yes"; then
+-
+-  GB_COMPONENT_PKG_CONFIG_AGAIN(
+-    pcre, PCRE, gb.pcre, [src],
+-    libpcre, [trying with pcre])
+-  gb_use_pcre2=0
+-
+-else
+-
+-  AC_DEFINE_UNQUOTED(PCRE2, 1, libpcre2 is used)
+-  gb_use_pcre2=1
+-
+-fi
+-
+-AM_CONDITIONAL(USE_PCRE2, test "$gb_use_pcre2" = 1)
+-
+ AC_OUTPUT( \
+ Makefile \
+ src/Makefile \
+diff -up gambas-3.17.3/gb.pcre/src/main.c.just-pcre2 gambas-3.17.3/gb.pcre/src/main.c
+--- gambas-3.17.3/gb.pcre/src/main.c.just-pcre2	2022-09-20 14:23:27.914296475 -0400
++++ gambas-3.17.3/gb.pcre/src/main.c	2022-09-20 14:23:37.395365484 -0400
+@@ -29,7 +29,7 @@
+ #include <stdarg.h>
+ #include <string.h>
+ 
+-#include "regexp.h"
++#include "regexp2.h"
+ 
+ #include "main.h"
+ 
+diff -up gambas-3.17.3/gb.pcre/src/Makefile.am.just-pcre2 gambas-3.17.3/gb.pcre/src/Makefile.am
+--- gambas-3.17.3/gb.pcre/src/Makefile.am.just-pcre2	2022-09-20 14:21:58.953648970 -0400
++++ gambas-3.17.3/gb.pcre/src/Makefile.am	2022-09-20 14:22:10.542733323 -0400
+@@ -9,16 +9,6 @@ gb_pcre_la_CPPFLAGS = @PCRE_INC@
+ 
+ gb_pcre_la_SOURCES = \
+  main.h main.c \
+- gb.pcre.h
+- 
+-if USE_PCRE2
+-
+-gb_pcre_la_SOURCES += regexp2.h regexp2.c
+-
+-else
+-
+-gb_pcre_la_SOURCES += regexp.h regexp.c
+- 
+-endif
+-
++ gb.pcre.h \
++ regexp2.h regexp2.c
+ 
diff --git a/gambas3.spec b/gambas3.spec
index 5ac3e3b..ba6dd13 100644
--- a/gambas3.spec
+++ b/gambas3.spec
@@ -40,7 +40,7 @@ BuildRequires:	cairo-devel, qt4-devel, dbus-devel, libXcursor-devel
 BuildRequires:	SDL_ttf-devel, sqlite2-devel, glew-devel
 BuildRequires:	imlib2-devel, qt-webkit-devel, gsl-devel
 BuildRequires:	libtool, ncurses-devel, libX11-devel
-BuildRequires:  gmime-devel, libgnome-keyring-devel
+BuildRequires:  gmime30-devel, libgnome-keyring-devel
 BuildRequires:	qt5-qtsvg-devel, qt5-qtbase-devel, qt5-qtx11extras-devel, qt5-qtwebkit-devel
 %ifnarch ppc64le s390x
 BuildRequires:	qt5-qtwebengine-devel
@@ -64,6 +64,7 @@ BuildRequires: make
 Patch1:		%{name}-3.12.2-nolintl.patch
 Patch2:		%{name}-3.12.2-noliconv.patch
 Patch5:		%{name}-3.14.1-gst1.patch
+Patch6:		gambas-3.17.3-force-pcre2.patch
 
 %description
 Gambas3 is a free development environment based on a Basic interpreter
@@ -1017,6 +1018,7 @@ Requires:	%{name}-gb-xml = %{version}-%{release}
 %patch1 -p1 -b .nolintl
 %patch2 -p1 -b .noliconv
 %patch5 -p1 -b .gst1
+%patch6 -p1 -b .force-pcre2
 for i in `find . |grep acinclude.m4`; do
 	sed -i 's|$AM_CFLAGS -O3|$AM_CFLAGS|g' $i
 	sed -i 's|$AM_CXXFLAGS -Os -fno-omit-frame-pointer|$AM_CXXFLAGS|g' $i
@@ -1763,7 +1765,8 @@ install -m 0644 -p main/mime/application-x-gambas3.xml %{buildroot}%{_datadir}/m
 
 %changelog
 * Tue Sep 20 2022 Tom Callaway <spot@fedoraproject.org> - 3.17.3-4
-- use pcre2 (already supported, just needed to switch BR)
+- use pcre2
+- use gmime30
 
 * Tue Aug 23 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.17.3-3
 - Rebuild for gsl-2.7.1