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 2021-04-09 02:31:03.000000000 +0000 +++ dasher-5.0.0~beta~repack2/debian/changelog 2021-09-04 18:02:25.000000000 +0000 @@ -1,9 +1,9 @@ -dasher (5.0.0~beta~repack2-2ubuntu1) hirsute; urgency=medium +dasher (5.0.0~beta~repack2-3) unstable; 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. + * control: Set Rules-Requires-Root to no. + * patches/atspi_cpp: Fix build with newer atspi/atspi.h. - -- Logan Rosen Thu, 08 Apr 2021 22:31:03 -0400 + -- Samuel Thibault Sat, 04 Sep 2021 20:02:25 +0200 dasher (5.0.0~beta~repack2-2) unstable; urgency=medium 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 2021-04-09 02:31:03.000000000 +0000 +++ dasher-5.0.0~beta~repack2/debian/control 2021-07-10 09:57:53.000000000 +0000 @@ -1,8 +1,7 @@ Source: dasher Section: x11 Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Accessibility Team +Maintainer: Debian Accessibility Team Uploaders: Thibaut Paumard , Samuel Thibault Vcs-Git: https://salsa.debian.org/a11y-team/dasher.git Vcs-Browser: https://salsa.debian.org/a11y-team/dasher @@ -18,6 +17,7 @@ libspeechd-dev, yelp-tools, docbook-xml +Rules-Requires-Root: no Standards-Version: 4.5.0 Homepage: http://www.inference.phy.cam.ac.uk/dasher/ @@ -48,7 +48,7 @@ Package: dasher-data Architecture: all -Multi-arch: foreign +Multi-Arch: foreign Depends: ${misc:Depends} Recommends: dasher Description: Data files for dasher diff -Nru dasher-5.0.0~beta~repack2/debian/patches/atspi_cpp dasher-5.0.0~beta~repack2/debian/patches/atspi_cpp --- dasher-5.0.0~beta~repack2/debian/patches/atspi_cpp 1970-01-01 00:00:00.000000000 +0000 +++ dasher-5.0.0~beta~repack2/debian/patches/atspi_cpp 2021-09-04 18:02:13.000000000 +0000 @@ -0,0 +1,19 @@ +atspi/atspi.h can be included in c++ code fine nowadays + +--- + Src/Gtk2/dasher_editor_external_atspi.cpp | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +--- a/Src/Gtk2/dasher_editor_external_atspi.cpp ++++ b/Src/Gtk2/dasher_editor_external_atspi.cpp +@@ -1,9 +1,7 @@ + #include + #include + +-extern "C" { +- #include +-} ++#include + + #include "dasher_editor_external.h" + #include "dasher_editor_private.h" 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 2021-04-09 02:31:00.000000000 +0000 +++ dasher-5.0.0~beta~repack2/debian/patches/glib-2.67.3 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -From 5eed251f9bb0bae10e2efe177e1054346c7347d1 Mon Sep 17 00:00:00 2001 -From: Yanko Kaneti -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 - | ^~~~~~~~ -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 - #include - --extern "C" { -- #include --} -+#include - - #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 2021-04-09 02:31:00.000000000 +0000 +++ dasher-5.0.0~beta~repack2/debian/patches/series 2021-09-04 18:01:27.000000000 +0000 @@ -5,4 +5,4 @@ drop yelp intltool-update -glib-2.67.3 +atspi_cpp diff -Nru dasher-5.0.0~beta~repack2/debian/salsa-ci.yml dasher-5.0.0~beta~repack2/debian/salsa-ci.yml --- dasher-5.0.0~beta~repack2/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ dasher-5.0.0~beta~repack2/debian/salsa-ci.yml 2020-12-30 13:37:42.000000000 +0000 @@ -0,0 +1,6 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml + +# vim: ts=2 sw=2 et sts=2 ft=yaml