diff -Nru vte2.91-0.52.2/debian/changelog vte2.91-0.52.2/debian/changelog --- vte2.91-0.52.2/debian/changelog 2018-05-30 12:19:02.000000000 +0000 +++ vte2.91-0.52.2/debian/changelog 2018-07-16 17:37:09.000000000 +0000 @@ -1,3 +1,10 @@ +vte2.91 (0.52.2-1ubuntu1~18.04.2) bionic; urgency=medium + + * Revert the changes to revert-pcre2.patch in the previous SRU since they + introduced API incompatibilies which aren't OK in an SRU (LP: #1780501). + + -- Iain Lane Mon, 16 Jul 2018 18:37:09 +0100 + vte2.91 (0.52.2-1ubuntu1~18.04.1) bionic; urgency=medium * debian/{gbp.conf,control{,.in}}: Update for bionic. diff -Nru vte2.91-0.52.2/debian/patches/revert-pcre2.patch vte2.91-0.52.2/debian/patches/revert-pcre2.patch --- vte2.91-0.52.2/debian/patches/revert-pcre2.patch 2018-05-30 12:19:02.000000000 +0000 +++ vte2.91-0.52.2/debian/patches/revert-pcre2.patch 2018-07-16 17:37:09.000000000 +0000 @@ -1212,8 +1212,33 @@ } /** -Index: b/src/vteinternal.hh -=================================================================== +@@ -2703,7 +2722,7 @@ + /** + * vte_terminal_feed: + * @terminal: a #VteTerminal +- * @data: (array length=length) (element-type guint8) (allow-none): a string in the terminal's current encoding ++ * @data: (array length=length) (element-type guint8): a string in the terminal's current encoding + * @length: the length of the string, or -1 to use the full length or a nul-terminated string + * + * Interprets @data as if it were data received from a child process. This +@@ -2724,7 +2743,7 @@ + /** + * vte_terminal_feed_child: + * @terminal: a #VteTerminal +- * @text: (array length=length) (element-type gchar) (allow-none): data to send to the child ++ * @text: data to send to the child + * @length: length of @text in bytes, or -1 if @text is NUL-terminated + * + * Sends a block of UTF-8 text to the child as if it were entered by the user +@@ -2744,7 +2763,7 @@ + /** + * vte_terminal_feed_child_binary: + * @terminal: a #VteTerminal +- * @data: (array length=length) (element-type guint8) (allow-none): data to send to the child ++ * @data: data to send to the child + * @length: length of @data + * + * Sends a block of binary data to the child. --- a/src/vteinternal.hh +++ b/src/vteinternal.hh @@ -28,8 +28,16 @@