diff -Nru dasher-5.0.0~beta~repack2/debian/changelog dasher-5.0.0~beta~repack2/debian/changelog
--- dasher-5.0.0~beta~repack2/debian/changelog	2020-12-28 19:29:37.000000000 +0000
+++ dasher-5.0.0~beta~repack2/debian/changelog	2021-04-09 02:31:03.000000000 +0000
@@ -1,3 +1,10 @@
+dasher (5.0.0~beta~repack2-2ubuntu1) hirsute; urgency=medium
+
+  * d/p/glib-2.67.3: Cherrypick upstream commit to fix FTBFS with glib >=
+    2.67.3 by removing glib header inclusion from extern "C" block.
+
+ -- Logan Rosen <logan@ubuntu.com>  Thu, 08 Apr 2021 22:31:03 -0400
+
 dasher (5.0.0~beta~repack2-2) unstable; urgency=medium
 
   [ Debian Janitor ]
diff -Nru dasher-5.0.0~beta~repack2/debian/control dasher-5.0.0~beta~repack2/debian/control
--- dasher-5.0.0~beta~repack2/debian/control	2020-07-31 20:44:11.000000000 +0000
+++ dasher-5.0.0~beta~repack2/debian/control	2021-04-09 02:31:03.000000000 +0000
@@ -1,7 +1,8 @@
 Source: dasher
 Section: x11
 Priority: optional
-Maintainer: Debian Accessibility Team <pkg-a11y-devel@alioth-lists.debian.net>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Accessibility Team <pkg-a11y-devel@alioth-lists.debian.net>
 Uploaders: Thibaut Paumard <thibaut@debian.org>, Samuel Thibault <sthibault@debian.org>
 Vcs-Git: https://salsa.debian.org/a11y-team/dasher.git
 Vcs-Browser: https://salsa.debian.org/a11y-team/dasher
diff -Nru dasher-5.0.0~beta~repack2/debian/patches/glib-2.67.3 dasher-5.0.0~beta~repack2/debian/patches/glib-2.67.3
--- dasher-5.0.0~beta~repack2/debian/patches/glib-2.67.3	1970-01-01 00:00:00.000000000 +0000
+++ dasher-5.0.0~beta~repack2/debian/patches/glib-2.67.3	2021-04-09 02:31:00.000000000 +0000
@@ -0,0 +1,45 @@
+From 5eed251f9bb0bae10e2efe177e1054346c7347d1 Mon Sep 17 00:00:00 2001
+From: Yanko Kaneti <yaneti@declera.com>
+Date: Thu, 25 Mar 2021 16:37:44 +0200
+Subject: [PATCH] Remove extern "C" warpper around atspi/glib headers inclusion
+
+Recently glib headers started using C++ features when compled in C++
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1715/commits
+
+This leads to errors like:
+..
+In file included from /usr/include/glib-2.0/glib/gatomic.h:31,
+                 from /usr/include/glib-2.0/glib/gthread.h:32,
+                 from /usr/include/glib-2.0/glib/gasyncqueue.h:32,
+                 from /usr/include/glib-2.0/glib.h:32,
+                 from /usr/include/at-spi-2.0/atspi/atspi.h:27,
+                 from dasher_editor_external_atspi.cpp:5:
+/usr/include/c++/11/type_traits:56:3: error: template with C linkage
+   56 |   template<typename _Tp, _Tp __v>
+      |   ^~~~~~~~
+dasher_editor_external_atspi.cpp:4:1: note: 'extern "C"' linkage started here
+    4 | extern "C" {
+      | ^~~~~~~~~~
+..
+
+Since for a while now glib headers are supposed to be safe to include in
+C++ code without extern "C" just remove it.
+---
+ Src/Gtk2/dasher_editor_external_atspi.cpp | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/Src/Gtk2/dasher_editor_external_atspi.cpp b/Src/Gtk2/dasher_editor_external_atspi.cpp
+index 76f637ac..6492c479 100644
+--- a/Src/Gtk2/dasher_editor_external_atspi.cpp
++++ b/Src/Gtk2/dasher_editor_external_atspi.cpp
+@@ -1,9 +1,7 @@
+ #include <X11/keysym.h>
+ #include <string.h>
+ 
+-extern "C" {
+-  #include <atspi/atspi.h>
+-}
++#include <atspi/atspi.h>
+ 
+ #include "dasher_editor_external.h"
+ #include "dasher_editor_private.h"
diff -Nru dasher-5.0.0~beta~repack2/debian/patches/series dasher-5.0.0~beta~repack2/debian/patches/series
--- dasher-5.0.0~beta~repack2/debian/patches/series	2020-12-26 23:19:10.000000000 +0000
+++ dasher-5.0.0~beta~repack2/debian/patches/series	2021-04-09 02:31:00.000000000 +0000
@@ -5,3 +5,4 @@
 drop
 yelp
 intltool-update
+glib-2.67.3