Merge ~unity7maintainers/ubuntu/+source/nux:ubuntu/devel into ubuntu/+source/nux:ubuntu/devel

[Tomasz Jeruzalski]

imported pcre2 migration from the gentoo team

Changes from this branch migrate nux package from libpcre3 to libpcre2. Source code patch originated from Gentoo team.

This merge proposal supersedes https://code.launchpad.net/~unity7maintainers/ubuntu/+source/nux/+git/nux/+merge/495677

[Rahammetoela Toekiman (fuseteam)]

it currently fails to build, but i am having trouble figuring out why: https://launchpadlibrarian.net/830926741/buildlog.txt.gz

[Athos Ribeiro (athos)]

Thanks, Rahammetoela. Can you point us to the gentoo change from where this is being pulled from?

Also, this should be a patch under debian/patches. This should help you getting started: https://documentation.ubuntu.com/project/contributors/patching/work-with-debian-patches/

[Rahammetoela Toekiman (fuseteam)]

> Thanks, Rahammetoela. Can you point us to the gentoo change from where this is
> being pulled from?

I actually got it as a patch file from them via telegram

> Also, this should be a patch under debian/patches. This should help you
> getting started:
> https://documentation.ubuntu.com/project/contributors/patching/work-with-
> debian-patches/

is there particular reason why it should be under debian/patches?

[Skia (skia)]

debian/patches is the only place where the Debian build system will look for patches to apply before building, that's why your patch needs to go there. The link provided by @athos explains many things about how to work with patches.
I'm unsubscribing ~ubuntu-sponsors, feel free to resubscribed once you have performed the necessary changes and it's ready for review again.

review: Needs Fixing

[Tomasz Jeruzalski (tomekdev)]

I think that the repository is messed up and pristine-tar branch has been altered or something other went wrong. I couldn't run git-build-recipe from any branch I tested.

When I forked the project into my account, manually committed changes to pristine-tar branch using pristine-tar commit NEWEST_TARBALL.orig.tar.gz and pushing to my account and then I was able to run the build.

I might be wrong because I'm new to this but this all I know so far.

[Tomasz Jeruzalski (tomekdev)]

After performing changes I mentioned above and providing changes from this merge request as a patch debian/ directory I was able to successfully build all nux packages with patch from this merge request.

Here is my repository: https://code.launchpad.net/~tomekdev/ubuntu/+source/nux/+git/nux

The branch is applied/ubuntu/devel.

[Rahammetoela Toekiman (fuseteam)]

thanks for looking into that @tomekdev feel free to make a new merge proposal against https://code.launchpad.net/~git-ubuntu-import/ubuntu/+source/nux/+git/nux/+ref/ubuntu/devel to supersede this one you can tag ~ubuntu-sponsors as reviewer or work on the same branch from unity7maintainers now that you are a member

[Skia (skia)]

Left a couple of inline-comments. That generally looks wayyy better :-)

review: Needs Fixing

[Tomasz Jeruzalski (tomekdev)]

I have updated the patch and changelog following your comments. The only thing I'm not sure is the "Origin" tag, because original author sent the patch over telegram. I wasn't sure how to fill this tag so I put there a link to his github repository with his work over Unity.

[Skia (skia)]

Oh, I see. Then in that case you at least need to fill the Author field with the information of the original author.
Also, in terms of `git-ubuntu` workflow: your latest commit isn't quite right, because it contains two very different things (changelog and patch update). It would be best to squash each of those changes into their original commits, so that the history becomes relevant.

I've tried to fix all those locally and do the upload, but unfortunately the build is currently failing on resolute-proposed due to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1122650, which would be fixed in Ubuntu by 2130151.
Please subscribe to the Ubuntu bug and ping here again once it's seeing progress, and then I'll upload.

[Rahammetoela Toekiman (fuseteam)]

I have now subscribed the unity7maintainers to bug 2130151 thanks for the heads up Skia

[Tomasz Jeruzalski (tomekdev)]

THank you @skia for your review. I have updated the branch as you suggested and I hope it is good now. I am sorry if I did not do everything correctly but I am new to contributing here.

[Athos Ribeiro (athos)]

This looks much better now. Thanks!

I added a couple nitpicks inline, but those are just nitpicks!

[Tomasz Jeruzalski (tomekdev)]

Thank you very much for your review. I left answers to your comments and I hope we will be able to figure out how to handle this situation.

Unmerged commits

faaf734... by Tomasz Jeruzalski on 2026-01-28

debian/control: Replace dependency libpcre3-dev with libpcre2-dev

3616219... by Tomasz Jeruzalski on 2026-01-28

debian/changelog: Update changelog.

e572e60... by Tomasz Jeruzalski on 2026-01-28

debian/patches: Add patch for migrating nux from libpcre3 to libpcre2

diff --git a/debian/changelog b/debian/changelog
index 0e1b9d7..7e53d46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nux (4.0.8+18.10.20180623-0ubuntu12) resolute; urgency=medium
+
+  * debian/patches: Add patch for migrating from libpcre3 to libpcre2 (LP: #2103918)
+
+ -- Tomasz Jeruzalski <[e-mail]>  Wed, 28 Jan 2026 19:03:12 +0000
+
 nux (4.0.8+18.10.20180623-0ubuntu11) questing; urgency=medium
 
   * d/control: use the non deprecated libgdk-pixbuf-2.0-dev (lp: #2118581)
diff --git a/debian/control b/debian/control
index 3e9bf14..28ef202 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Build-Depends: debhelper (>= 9),
                libsigc++-2.0-dev,
                libpango1.0-dev,
                libx11-dev,
-               libpcre3-dev,
+               libpcre2-dev,
                libpci-dev,
                libxinerama-dev,
                libgeis-dev (>= 2.2.10),
@@ -85,7 +85,7 @@ Depends: libnux-4.0-0 (= ${binary:Version}),
          libgles2-mesa-dev [armel armhf],
          libgeis-dev (>= 2.2.10),
          libsigc++-2.0-dev,
-         libpcre3-dev,
+         libpcre2-dev,
          libx11-dev,
          libxext-dev,
          libxinerama-dev,
diff --git a/debian/patches/migrate-to-libpcre2.patch b/debian/patches/migrate-to-libpcre2.patch
new file mode 100644
index 0000000..2e15d28
--- /dev/null
+++ b/debian/patches/migrate-to-libpcre2.patch
@@ -0,0 +1,130 @@
+Description: Migrate nux to libpcre2
+ Migrate to libpcre2 because libpcre3 is unmaintained.
+Author: Tomasz Jeruzalski<[e-mail]> and c4pp4 from Gentoo team
+Forwarded: no
+Last-Update: 2026-01-28
+Origin: https://github.com/c4pp4/gentoo-unity7
+---
+--- a/Nux/Validator.cpp
++++ b/Nux/Validator.cpp
+@@ -27,12 +27,19 @@
+ {
+ 
+   Validator::Validator()
++#if !defined(NUX_OS_WINDOWS)
++    : _regexp(nullptr)
++#endif
+   {
+   }
+ 
+   Validator::~Validator()
+   {
+ 
++#if !defined(NUX_OS_WINDOWS)
++    if (_regexp)
++      pcre2_code_free(_regexp);
++#endif
+   }
+ 
+   bool Validator::InitRegExp()
+@@ -41,18 +48,23 @@
+     regex_ = _regexp_str.c_str();
+     return true;
+ #else
+-    const char *error;
+-    int   erroffset;
+-    _regexp = pcre_compile(
+-      _regexp_str.c_str(),    /* the pattern */
+-      PCRE_MULTILINE,
+-      &error,         /* for error message */
+-      &erroffset,     /* for error offset */
+-      0);             /* use default character tables */
++    int        errorcode;
++    PCRE2_SIZE erroroffset;
++    _regexp = pcre2_compile(
++      reinterpret_cast<PCRE2_SPTR>(_regexp_str.c_str()),  /* pattern */
++      PCRE2_ZERO_TERMINATED,                              /* pattern length */
++      PCRE2_MULTILINE,                                    /* option bits */
++      &errorcode,                                         /* error code */
++      &erroroffset,                                       /* error offset */
++      nullptr);                                           /* compile context */
+ 
+     if (!_regexp)
+     {
+-      nuxDebugMsg("[IntegerValidator::IntegerValidator] Invalid regular expression: %s", _regexp_str.c_str());
++      PCRE2_UCHAR buffer[256];
++      pcre2_get_error_message(errorcode, buffer, sizeof(buffer));
++      nuxDebugMsg("[Validator::InitRegExp] Invalid regular expression '%s' "
++                  "at offset %d: %s",
++                  _regexp_str.c_str(), (int)erroroffset, buffer);
+       return false;
+     }    
+     return true;
+@@ -72,20 +84,24 @@
+     }
+     return Validator::Acceptable;
+ #else
+-    if (_regexp == 0)
++    if (!_regexp || !str)
+       return Validator::Invalid;
+ 
+-    int out_vector [10];
+-    unsigned int offset = 0;
+-    int len = (int) strlen(str);
+-
+-    // See the "PCRE DISCUSSION OF STACK USAGE" and why it maybe necessary to limit the stack usage.
+-    pcre_extra extra;
+-    extra.flags = PCRE_EXTRA_MATCH_LIMIT_RECURSION;
+-    extra.match_limit_recursion = 2000; 
++    pcre2_match_data *match_data =
++        pcre2_match_data_create_from_pattern(_regexp, nullptr);
++
++    int rc = pcre2_match(
++        _regexp,                                   /* compiled pattern */
++        reinterpret_cast<PCRE2_SPTR>(str),         /* subject string */
++        strlen(str),                               /* length of subject */
++        0,                                         /* start offset */
++        0,                                         /* match options */
++        match_data,                                /* match data block */
++        nullptr);                                  /* match context */
++
++    pcre2_match_data_free(match_data);
+ 
+-    int rc = pcre_exec(_regexp, &extra, str, len, offset, 0, out_vector, 10);
+-    if (rc <= -1)
++    if (rc < 0)
+     {
+       return Validator::Invalid;
+     }
+--- a/Nux/Validator.h
++++ b/Nux/Validator.h
+@@ -26,7 +26,8 @@
+ #if defined(NUX_OS_WINDOWS)
+   #include <regex>
+ #else
+-  #include <pcre.h>
++  #define PCRE2_CODE_UNIT_WIDTH 8
++  #include <pcre2.h>
+ #endif
+ 
+ namespace nux
+@@ -57,7 +58,7 @@
+ #if defined(NUX_OS_WINDOWS)
+     std::regex regex_;
+ #else
+-    pcre *_regexp;
++    pcre2_code *_regexp;
+ #endif
+   };
+ }
+--- a/configure.ac
++++ b/configure.ac
+@@ -196,7 +196,7 @@
+                   sigc++-2.0
+                   pango
+                   pangocairo
+-                  libpcre
++                  libpcre2-8
+                   )
+ AC_SUBST(NUX_CFLAGS)
+ AC_SUBST(NUX_LIBS)
diff --git a/debian/patches/series b/debian/patches/series
index 8f1d184..4b67934 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+migrate-to-libpcre2.patch
 no-Werror.patch
 add-shared_ptr-include.patch
 drop-std.patch