Bug#904309: tilda: diff for NMU version 1.4.1-2.1
Sebastian Geiger: > Hi Niels, > > Thanks for the upload. It looks good to me. I think you can push that to the > repository. > > Best Regards > Mit freundlichen Grüßen > Dipl. Ing. Sebastian Geiger > > [...] Hi Sebastian, Thanks for your feedback. Just to confirm, when you wrote "push that to the repository", did you mean push changes to the git repo on salsa (master branch) or remove the delay of the upload to the archive (or both)? Thanks, ~Niels
Bug#904309: tilda: diff for NMU version 1.4.1-2.1
Hi Niels,
Thanks for the upload. It looks good to me. I think you can push that to the
repository.
Best Regards
Mit freundlichen Grüßen
Dipl. Ing. Sebastian Geiger
> On 11. May 2019, at 15:04, Niels Thykier wrote:
>
> Control: tags 904309 + patch
> Control: tags 904309 + pending
>
>
> Dear maintainer,
>
> I've prepared an NMU for tilda (versioned as 1.4.1-2.1) and
> uploaded it to DELAYED/7. Please feel free to tell me if I
> should delay it longer.
>
> Regards.
>
> diff -Nru tilda-1.4.1/debian/changelog tilda-1.4.1/debian/changelog
> --- tilda-1.4.1/debian/changelog2018-02-18 20:08:42.0 +
> +++ tilda-1.4.1/debian/changelog2019-05-11 13:04:23.0 +
> @@ -1,3 +1,15 @@
> +tilda (1.4.1-2.1) unstable; urgency=medium
> +
> + * Non-maintainer upload.
> + * Import patch from upstream to set ensure tilda is run
> +under the X11 backend. This prevents crashes when the
> +window manager uses Wayland by default.
> +(Closes: #904309)
> + * Ret Rules-Requires-Root to no as tilda does not need
> +(fake)root for building the debs.
> +
> + -- Niels Thykier Sat, 11 May 2019 13:04:23 +
> +
> tilda (1.4.1-2) unstable; urgency=medium
>
> [ Sebastian Geiger ]
> diff -Nru tilda-1.4.1/debian/control tilda-1.4.1/debian/control
> --- tilda-1.4.1/debian/control2018-02-18 19:46:04.0 +
> +++ tilda-1.4.1/debian/control2019-05-11 11:30:38.0 +
> @@ -5,6 +5,7 @@
> Build-Depends: debhelper (>= 11), autopoint, pkg-config, libgtk-3-dev,
> libvte-2.91-dev, libconfuse-dev
> Standards-Version: 4.1.3
> Homepage: http://github.com/lanoxx/tilda
> +Rules-Requires-Root: no
> Vcs-Git: https://salsa.debian.org/debian/tilda.git
> Vcs-Browser: https://salsa.debian.org/debian/tilda
>
> diff -Nru tilda-1.4.1/debian/patches/02_set_supported_backend_to_X11.patch
> tilda-1.4.1/debian/patches/02_set_supported_backend_to_X11.patch
> --- tilda-1.4.1/debian/patches/02_set_supported_backend_to_X11.patch
> 1970-01-01 00:00:00.0 +
> +++ tilda-1.4.1/debian/patches/02_set_supported_backend_to_X11.patch
> 2019-05-11 11:29:06.0 +
> @@ -0,0 +1,25 @@
> +From 606b655d8d811f880d610dead7d6943a33199deb Mon Sep 17 00:00:00 2001
> +From: Roman Hoellen
> +Date: Mon, 30 Apr 2018 09:18:49 +0200
> +Subject: [PATCH] Set supported backend to X11
> +Upstream-Commit:
> https://github.com/lanoxx/tilda/commit/606b655d8d811f880d610dead7d6943a33199deb.patch
> +Forwarded: Not-needed
> +
> +---
> + src/tilda.c | 3 +++
> + 1 file changed, 3 insertions(+)
> +
> +diff --git a/src/tilda.c b/src/tilda.c
> +index 8aa69828..92ce46c4 100644
> +--- a/src/tilda.c
> b/src/tilda.c
> +@@ -686,6 +686,9 @@ int main (int argc, char *argv[])
> + g_log_set_default_handler (tilda_log_handler, NULL);
> + #endif
> +
> ++/* Set supported backend to X11 */
> ++gdk_set_allowed_backends ("x11");
> ++
> + tilda_window tw;
> + /* NULL set the tw pointers so we can get a clean exit on
> initialization failure */
> + memset(, 0, sizeof(tilda_window));
> diff -Nru tilda-1.4.1/debian/patches/series tilda-1.4.1/debian/patches/series
> --- tilda-1.4.1/debian/patches/series2018-02-18 19:48:15.0 +
> +++ tilda-1.4.1/debian/patches/series2019-05-11 11:30:38.0 +
> @@ -1 +1,2 @@
> 01_install_metadata_in_new_location.patch
> +02_set_supported_backend_to_X11.patch
Bug#904309: tilda: diff for NMU version 1.4.1-2.1
Control: tags 904309 + patch
Control: tags 904309 + pending
Dear maintainer,
I've prepared an NMU for tilda (versioned as 1.4.1-2.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru tilda-1.4.1/debian/changelog tilda-1.4.1/debian/changelog
--- tilda-1.4.1/debian/changelog2018-02-18 20:08:42.0 +
+++ tilda-1.4.1/debian/changelog2019-05-11 13:04:23.0 +
@@ -1,3 +1,15 @@
+tilda (1.4.1-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Import patch from upstream to set ensure tilda is run
+under the X11 backend. This prevents crashes when the
+window manager uses Wayland by default.
+(Closes: #904309)
+ * Ret Rules-Requires-Root to no as tilda does not need
+(fake)root for building the debs.
+
+ -- Niels Thykier Sat, 11 May 2019 13:04:23 +
+
tilda (1.4.1-2) unstable; urgency=medium
[ Sebastian Geiger ]
diff -Nru tilda-1.4.1/debian/control tilda-1.4.1/debian/control
--- tilda-1.4.1/debian/control 2018-02-18 19:46:04.0 +
+++ tilda-1.4.1/debian/control 2019-05-11 11:30:38.0 +
@@ -5,6 +5,7 @@
Build-Depends: debhelper (>= 11), autopoint, pkg-config, libgtk-3-dev,
libvte-2.91-dev, libconfuse-dev
Standards-Version: 4.1.3
Homepage: http://github.com/lanoxx/tilda
+Rules-Requires-Root: no
Vcs-Git: https://salsa.debian.org/debian/tilda.git
Vcs-Browser: https://salsa.debian.org/debian/tilda
diff -Nru tilda-1.4.1/debian/patches/02_set_supported_backend_to_X11.patch
tilda-1.4.1/debian/patches/02_set_supported_backend_to_X11.patch
--- tilda-1.4.1/debian/patches/02_set_supported_backend_to_X11.patch
1970-01-01 00:00:00.0 +
+++ tilda-1.4.1/debian/patches/02_set_supported_backend_to_X11.patch
2019-05-11 11:29:06.0 +
@@ -0,0 +1,25 @@
+From 606b655d8d811f880d610dead7d6943a33199deb Mon Sep 17 00:00:00 2001
+From: Roman Hoellen
+Date: Mon, 30 Apr 2018 09:18:49 +0200
+Subject: [PATCH] Set supported backend to X11
+Upstream-Commit:
https://github.com/lanoxx/tilda/commit/606b655d8d811f880d610dead7d6943a33199deb.patch
+Forwarded: Not-needed
+
+---
+ src/tilda.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/tilda.c b/src/tilda.c
+index 8aa69828..92ce46c4 100644
+--- a/src/tilda.c
b/src/tilda.c
+@@ -686,6 +686,9 @@ int main (int argc, char *argv[])
+ g_log_set_default_handler (tilda_log_handler, NULL);
+ #endif
+
++/* Set supported backend to X11 */
++gdk_set_allowed_backends ("x11");
++
+ tilda_window tw;
+ /* NULL set the tw pointers so we can get a clean exit on initialization
failure */
+ memset(, 0, sizeof(tilda_window));
diff -Nru tilda-1.4.1/debian/patches/series tilda-1.4.1/debian/patches/series
--- tilda-1.4.1/debian/patches/series 2018-02-18 19:48:15.0 +
+++ tilda-1.4.1/debian/patches/series 2019-05-11 11:30:38.0 +
@@ -1 +1,2 @@
01_install_metadata_in_new_location.patch
+02_set_supported_backend_to_X11.patch
