[Debian-on-mobile-maintainers] [Git][DebianOnMobile-team/phosh][debian/master] 2 commits: d/patches: Don't use deprecated G_REGEX_JAVASCRIPT_COMPAT

[Arnaud Ferraris (@a-wai)]

Arnaud Ferraris pushed to branch debian/master at Debian On Mobile / phosh


Commits:
f5288fa7 by Evangelos Ribeiro Tzaras at 2022-09-23T09:20:32+02:00
d/patches: Don't use deprecated G_REGEX_JAVASCRIPT_COMPAT

This turned into a no-op in latest glib

>From glib NEWS:

* Replace PCRE1 with PCRE2: This is a major change to drop the libpcre1
  dependency and use libpcre2 instead, while preserving the behaviour and API of
  GRegex. G_REGEX_OPTIMIZE and G_REGEX_JAVASCRIPT_COMPAT are now deprecated
  and became a no-op, while other flags are adapted accordingly to the new API
  (work by Aleksei Rybalkin, Philipp Withnall) (!2529, #1085)

- - - - -
c45d40fa by Evangelos Ribeiro Tzaras at 2022-09-23T09:22:11+02:00
d/changelog: prepare release 0.21.0-2

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/0001-util-Don-t-use-G_REGEX_JAVASCRIPT_COMPAT.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+phosh (0.21.0-2) UNRELEASED; urgency=medium
+
+  * Recommend phosh-plugins
+  * d/patches: Don't use deprecated G_REGEX_JAVASCRIPT_COMPAT
+
+ -- Evangelos Ribeiro Tzaras <devrtz-debian at fortysixandtwo.eu>  Fri, 23 Sep 2022 09:21:34 +0200
+
 phosh (0.21.0-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/0001-util-Don-t-use-G_REGEX_JAVASCRIPT_COMPAT.patch
=====================================
@@ -0,0 +1,50 @@
+From: Fiona Klute <fiona.klute at gmx.de>
+Date: Mon, 19 Sep 2022 21:18:37 +0200
+Subject: util: Don't use G_REGEX_JAVASCRIPT_COMPAT
+
+G_REGEX_JAVASCRIPT_COMPAT is unsupported as of glib 2.74 and
+not needed for the regex at hand.
+
+G_REGEX_DEFAULT is the preferable default but not available before
+glib 2.73.2, so there's a fallback to 0 for earlier versions.
+
+Closes: https://gitlab.gnome.org/World/Phosh/phosh/-/issues/840
+Part-of: <https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1148>
+---
+ src/util.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/util.c b/src/util.c
+index 746e5e7..f2a55e5 100644
+--- a/src/util.c
++++ b/src/util.c
+@@ -19,6 +19,11 @@
+ #include <fcntl.h>
+ 
+ 
++#if !GLIB_CHECK_VERSION(2, 73, 2)
++#define G_REGEX_DEFAULT 0
++#endif
++
++
+ static gboolean have_gnome_software = -1;
+ 
+ 
+@@ -401,7 +406,7 @@ phosh_util_escape_markup (const char *markup, gboolean allow_markup)
+     /* Escape &whatever; */
+     /* Support &, ", ', < and >, escape all other occurrences of '&'. */
+     amp_re = g_regex_new ("&(?!amp;|quot;|apos;|lt;|gt;)",
+-                          G_REGEX_JAVASCRIPT_COMPAT,
++                          G_REGEX_DEFAULT,
+                           0,
+                           &err);
+     if (!amp_re) {
+@@ -426,7 +431,7 @@ phosh_util_escape_markup (const char *markup, gboolean allow_markup)
+      * https://specifications.freedesktop.org/notification-spec/latest/ar01s04.html
+      */
+     elem_re = g_regex_new ("<(?!/?[biu]>)",
+-                           G_REGEX_JAVASCRIPT_COMPAT,
++                           G_REGEX_DEFAULT,
+                            0,
+                            &err);
+     if (!elem_re) {


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+0001-util-Don-t-use-G_REGEX_JAVASCRIPT_COMPAT.patch



View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/phosh/-/compare/890dd2efb27645cf4a51840eb4ce4a159cec1e30...c45d40fade896bc09adaec4eb4eae77dc6749851

-- 
View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/phosh/-/compare/890dd2efb27645cf4a51840eb4ce4a159cec1e30...c45d40fade896bc09adaec4eb4eae77dc6749851
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-on-mobile-maintainers/attachments/20220923/42f9a5a4/attachment-0001.htm>