Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dasher for openSUSE:Factory checked in at 2022-02-15 23:57:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dasher (Old) and /work/SRC/openSUSE:Factory/.dasher.new.1956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dasher" Tue Feb 15 23:57:39 2022 rev:53 rq:954710 version:5.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/dasher/dasher.changes 2021-11-11 21:39:35.121027078 +0100 +++ /work/SRC/openSUSE:Factory/.dasher.new.1956/dasher.changes 2022-02-15 23:58:05.168346027 +0100 @@ -1,0 +2,39 @@ +Sat Feb 12 15:03:57 UTC 2022 - [email protected] + +- Update to version 5.0.0: + + Gtk2/FileUtils: Include sys/stat.h + + Preparation for 5.0 beta release. + + Win32 -- turned on whole program optimization and unused code + removal + + Removed obsolete targets from Win32 projects. + + Generalised pre set notifications for parameters and reworked + alphabet history. + + Tweaks to control boxes. + + Cleanup. No more WinCE code. + + Removed obsolate PocketPC projects. + + Cleanup in Common project. + + Turn draw mouse position on by default. + + DasherInterface->Done was not really stopping dasher. + + Errors in training file should not stop dasher. + + Removed ugly messages about speed changes. + + Countless changes and fixes. + + Port away from gconf2. + + Updated translations +- Start fresh with gitcheckout from new upstream. +- Drop patches and source files no longer needed: + + pre_checkin.sh + + locale-map.txt + + dasher.spec.in, + + dasher-linkX11.patch + + dasher-gcc6.patch + + dasher-data-lang.sh +- Add upstream build/bug fix patches: + + dasher-5.0.0-sys-stat.patch + + gnome-doc-utils-depr.patch + + 0001-Remove-extern-C-warpper-around-atspi-glib-headers-in.patch +- BuildRequires/Requires/Recommends/Suggests were dropped and + replaced with more modern variants. +- Sub-packages dasher-data-recommended and dasher-data-extra were + both dropped and Obsoleted and Provided via main package. + +------------------------------------------------------------------- Old: ---- dasher-4.11.tar.bz2 dasher-data-lang.sh dasher-gcc6.patch dasher-linkX11.patch dasher.spec.in locale-map.txt pre_checkin.sh New: ---- 0001-Remove-extern-C-warpper-around-atspi-glib-headers-in.patch _service _servicedata dasher-5.0.0-sys-stat.patch dasher-5.0.0.obscpio dasher.obsinfo gnome-doc-utils-depr.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dasher.spec ++++++ --- /var/tmp/diff_new_pack.SYUlF6/_old 2022-02-15 23:58:05.652347364 +0100 +++ /var/tmp/diff_new_pack.SYUlF6/_new 2022-02-15 23:58:05.656347375 +0100 @@ -1,7 +1,7 @@ # # spec file for package dasher # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,131 +17,84 @@ Name: dasher -Version: 4.11 +Version: 5.0.0 Release: 0 Summary: Zooming Predictive Text Entry System License: GPL-2.0-or-later Group: System/GUI/GNOME -URL: http://www.inference.phy.cam.ac.uk/dasher/ -Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/4.5/%{name}-%{version}.tar.bz2 -Source1: dasher-data-lang.sh -Source2: locale-map.txt -# PATCH-FIX-UPSTREAM dasher-linkX11.patch bgo#657306 [email protected] -- Remove unneded code requiring to link against libX11. -Patch0: dasher-linkX11.patch -# PATCH-FIX-UPSTREAM dasher-gcc6.patch boo#985108 [email protected] -- Fix build with gcc 6 (bool can't be used as return value for functions returning string) -Patch1: dasher-gcc6.patch -BuildRequires: cairo-devel +URL: https://dasher.acecentre.net/ +Source: %{name}-%{version}.tar.xz + +# PATCH-FIX-UPSTREAM dasher-5.0.0-sys-stat.patch +Patch: dasher-5.0.0-sys-stat.patch +# PATCH-FIX-UPSTREAM gnome-doc-utils-depr.patch +Patch2: gnome-doc-utils-depr.patch +# PATCH-FIX-UPSTREAM 0001-Remove-extern-C-warpper-around-atspi-glib-headers-in.patch +Patch3: 0001-Remove-extern-C-warpper-around-atspi-glib-headers-in.patch + +BuildRequires: c++_compiler +BuildRequires: c_compiler BuildRequires: fdupes -BuildRequires: gcc-c++ -BuildRequires: gconf2-devel -BuildRequires: gnome-doc-utils-devel -BuildRequires: gtk2-devel +BuildRequires: gettext +BuildRequires: gnome-common BuildRequires: intltool BuildRequires: libexpat-devel +BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: update-desktop-files +BuildRequires: yelp-tools +BuildRequires: pkgconfig(atspi-2) >= 2.11 +BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(glib-2.0) >= 2.6 +BuildRequires: pkgconfig(gsettings-desktop-schemas) +BuildRequires: pkgconfig(gthread-2.0) +BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(xtst) -Recommends: %{name}-data-recommended -Suggests: %{name}-data-extras -%{gconf_schemas_prereq} - -%description -Dasher is a zooming predictive text entry system, designed for -situations where keyboard input is impractical (for instance: -accessibility or PDAs). It is usable with greatly limited amounts of -physical input while still allowing high rates of text entry. - -%package data-recommended -Summary: Zooming Predictive Text Entry System -- Data files for common languages -Group: System/GUI/GNOME -Requires: %{name} = %{version} -Provides: locale(%{name}:de;ru;it;pl;es;pt;fr;nl) -BuildArch: noarch - -%description data-recommended -Dasher is a zooming predictive text entry system, designed for -situations where keyboard input is impractical (for instance: -accessibility or PDAs). It is usable with greatly limited amounts of -physical input while still allowing high rates of text entry. -This package contains data files to use dasher with common languages. - -%package data-extras -Summary: Zooming Predictive Text Entry System -- Data files for additional languages -Group: System/GUI/GNOME -Requires: %{name} = %{version} -Provides: locale(%{name}:ada;af;ak;am;ar;as;az;be;bg;bn;br;bs;ca;chr;co;cs;cy;da;dv;ee;el;eo;et;eu;fa;fi;fo;gaa;gd;gez;gl;gu;ha;haw;he;hi;hr;hu;hy;id;ig;is;ja;ka;kk;kn;ko;ku;ky;la;lb;lo;lt;lv;mk;ml;mn;mr;ms;mt;my;ne;no;nr;nso;oc;om;or;pa;ps;rm;rn;ro;sa;se;si;sk;sl;so;sq;sr;ss;st;sv;sw;ta;te;tg;th;ti;tk;tl;tn;tr;ts;uk;ur;uz;ve;vi;xh;yo;zh;zu) -BuildArch: noarch +Obsoletes: %{name}-data-recommended < 0.5.0 +Provides: %{name}-data-recommended = %{version} +Obsoletes: %{name}-data-extras < 0.5.0 +Provides: %{name}-data-extras = %{version} -%description data-extras +%description Dasher is a zooming predictive text entry system, designed for situations where keyboard input is impractical (for instance: accessibility or PDAs). It is usable with greatly limited amounts of physical input while still allowing high rates of text entry. -This package contains data files to use dasher with additional languages. - %lang_package %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -cp %{SOURCE2} . +%autosetup -p1 +echo "5.0.0" > .tarball-version +rm m4/glib-gettext.m4 +NOCONFIGURE=1 ./autogen.sh %build -%configure --with-pic \ - --with-gnome \ - --disable-scrollkeeper \ - --disable-a11y -make %{?_smp_mflags} +%configure \ + --with-pic \ + %{nil} +%make_build %install %make_install -%if 0%{?suse_version} <= 1120 -rm %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* -%endif %suse_update_desktop_file -G "Text Entry Tool" %{name} GNOME %find_lang %{name} %{?no_lang_C} -%find_gconf_schemas -sh %{SOURCE1} %{buildroot} "%{_datadir}" %{name}-data-recommended.lst %{name}-data-extras.lst %{name}-excluded.lst -%fdupes %{buildroot} - -%pre -f %{name}.schemas_pre +%fdupes %{buildroot}%{_prefix} -%post -%desktop_database_post -%icon_theme_cache_post - -%posttrans -f %{name}.schemas_posttrans - -%preun -f %{name}.schemas_preun - -%postun -%desktop_database_postun -%icon_theme_cache_postun - -%files -f %{name}.schemas_list -f %{name}-excluded.lst +%files %license COPYING %doc AUTHORS ChangeLog MAINTAINERS NEWS README -%dir %{_datadir}/gnome/ -%dir %{_datadir}/gnome/help/ -%dir %{_datadir}/gnome/help/%{name}/ -%doc %{_datadir}/gnome/help/%{name}/C/ -%dir %{_datadir}/omf/ -%dir %{_datadir}/omf/%{name}/ -%doc %{_datadir}/omf/%{name}/%{name}-C.omf -%{_bindir}/* -%{_datadir}/applications/*.desktop -%{_datadir}/dasher -%{_datadir}/icons/hicolor/48x48/apps/dasher.png -%{_datadir}/icons/hicolor/scalable/apps/dasher.svg +%{_bindir}/%{name} +%{_datadir}/applications/%{name}.desktop +%{_datadir}/%{name} +%{_datadir}/help/C/%{name} +%{_datadir}/icons/hicolor/48x48/apps/%{name}.png +%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_mandir}/man?/*%{ext_man} -%files data-recommended -f %{name}-data-recommended.lst - -%files data-extras -f %{name}-data-extras.lst - %files lang -f %{name}.lang %changelog ++++++ 0001-Remove-extern-C-warpper-around-atspi-glib-headers-in.patch ++++++ >From 5eed251f9bb0bae10e2efe177e1054346c7347d1 Mon Sep 17 00:00:00 2001 From: Yanko Kaneti <[email protected]> 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" -- 2.31.0 ++++++ _service ++++++ <?xml version="1.0"?> <services> <service name="obs_scm" mode="disabled" > <param name="scm">git</param> <param name="url">https://github.com/dasher-project/dasher.git</param> <param name="revision">refs/tags/DASHER_5_0_0_beta</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">DASHER_(\d+)_(\d+)_(\d+)_beta</param> <param name="versionrewrite-replacement">\1.\2.\3</param> <param name="changesgenerate">enable</param> </service> <service name="tar" mode="buildtime"/> <service name="recompress" mode="buildtime"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled" /> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/dasher-project/dasher.git</param> <param name="changesrevision">01f1409fabd4b89bbf7101234c24e2f1cff77519</param></service></servicedata> (No newline at EOF) ++++++ dasher-5.0.0-sys-stat.patch ++++++ diff --git a/Src/Gtk2/FileUtils.cpp b/Src/Gtk2/FileUtils.cpp index d0f07dc..f1733b8 100644 --- a/Src/Gtk2/FileUtils.cpp +++ b/Src/Gtk2/FileUtils.cpp @@ -1,5 +1,6 @@ #include <string> #include <stdio.h> +#include <sys/stat.h> #include "../Common/Globber.h" #include "../DasherCore/AbstractXMLParser.h" ++++++ dasher.obsinfo ++++++ name: dasher version: 5.0.0 mtime: 1460067420 commit: 01f1409fabd4b89bbf7101234c24e2f1cff77519 ++++++ gnome-doc-utils-depr.patch ++++++ ++++ 2683 lines (skipped)
