commit gradio for openSUSE:Factory
Hello community, here is the log from the commit of package gradio for openSUSE:Factory checked in at 2020-01-30 22:37:01 Comparing /work/SRC/openSUSE:Factory/gradio (Old) and /work/SRC/openSUSE:Factory/.gradio.new.26092 (New) Package is "gradio" Thu Jan 30 22:37:01 2020 rev:10 rq:768566 version:7.3 Changes: --- /work/SRC/openSUSE:Factory/gradio/gradio.changes2019-09-13 15:03:13.841283364 +0200 +++ /work/SRC/openSUSE:Factory/.gradio.new.26092/gradio.changes 2020-01-30 22:37:07.896572712 +0100 @@ -1,0 +2,5 @@ +Wed Jan 29 23:46:13 UTC 2020 - Bjørn Lie + +- No longer recommend -lang: supplements are in use. + +--- Other differences: -- ++ gradio.spec ++ --- /var/tmp/diff_new_pack.iimpWm/_old 2020-01-30 22:37:09.188573332 +0100 +++ /var/tmp/diff_new_pack.iimpWm/_new 2020-01-30 22:37:09.192573335 +0100 @@ -41,7 +41,6 @@ BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(vapigen) >= 0.16 -Recommends: %{name}-lang %description Gradio is a native GTK application. It lets you browse, search and find radio
commit gradio for openSUSE:Factory
Hello community, here is the log from the commit of package gradio for openSUSE:Factory checked in at 2019-09-13 15:01:01 Comparing /work/SRC/openSUSE:Factory/gradio (Old) and /work/SRC/openSUSE:Factory/.gradio.new.7948 (New) Package is "gradio" Fri Sep 13 15:01:01 2019 rev:9 rq:730369 version:7.3 Changes: --- /work/SRC/openSUSE:Factory/gradio/gradio.changes2018-12-28 12:35:33.455953594 +0100 +++ /work/SRC/openSUSE:Factory/.gradio.new.7948/gradio.changes 2019-09-13 15:03:13.841283364 +0200 @@ -1,0 +2,14 @@ +Thu Sep 12 06:42:53 UTC 2019 - mvet...@suse.com + +- Update to 7.3: + * This will probably be the last version of Gradio. +It includes updated translations and small minor improvements. +The successor of Gradio will be Shortwave. + * Update de.haeckerfelix.gradio.json + * The Appdata files now go to /usr/share/metainfo + * Fix animation in app menu + * Fix menubutton because glade destroyed it + * Fix vala warnings + * Update translations + +--- Old: v7.2.tar.gz New: v7.3.tar.gz Other differences: -- ++ gradio.spec ++ --- /var/tmp/diff_new_pack.45raj5/_old 2019-09-13 15:03:15.013283116 +0200 +++ /var/tmp/diff_new_pack.45raj5/_new 2019-09-13 15:03:15.013283116 +0200 @@ -1,7 +1,7 @@ # # spec file for package gradio # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,17 +12,17 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: gradio -Version:7.2 +Version:7.3 Release:0 Summary:GTK3 app for finding and listening to internet radio stations License:GPL-3.0-or-later Group: Productivity/Multimedia/Sound/Players -Url:https://github.com/haecker-felix/gradio +URL:https://github.com/haecker-felix/gradio Source: https://github.com/haecker-felix/gradio/archive/v%{version}.tar.gz BuildRequires: fdupes BuildRequires: gcc-c++ @@ -55,11 +55,11 @@ %setup -q -n Gradio-%{version} %build -%{meson} -%{meson_build} +%meson +%meson_build %install -%{meson_install} +%meson_install %fdupes %{buildroot}%{_prefix} %find_lang %{name} @@ -68,7 +68,7 @@ %license LICENSE.md %doc README.md %{_bindir}/gradio -%{_datadir}/appdata/de.haeckerfelix.gradio.appdata.xml +%{_datadir}/metainfo/de.haeckerfelix.gradio.appdata.xml %{_datadir}/applications/de.haeckerfelix.gradio.desktop %{_datadir}/icons/hicolor/*/apps/de.haeckerfelix.gradio.png %{_datadir}/icons/hicolor/scalable/apps/de.haeckerfelix.gradio.svg ++ v7.2.tar.gz -> v7.3.tar.gz ++ 2511 lines of diff (skipped)
commit gradio for openSUSE:Factory
Hello community, here is the log from the commit of package gradio for openSUSE:Factory checked in at 2018-12-28 12:35:28 Comparing /work/SRC/openSUSE:Factory/gradio (Old) and /work/SRC/openSUSE:Factory/.gradio.new.28833 (New) Package is "gradio" Fri Dec 28 12:35:28 2018 rev:8 rq:661515 version:7.2 Changes: --- /work/SRC/openSUSE:Factory/gradio/gradio.changes2018-01-22 16:22:19.347258639 +0100 +++ /work/SRC/openSUSE:Factory/.gradio.new.28833/gradio.changes 2018-12-28 12:35:33.455953594 +0100 @@ -1,0 +2,9 @@ +Tue Dec 25 21:05:31 UTC 2018 - bjorn@gmail.com + +- Update to version 7.2: + * Minor user interface improvements. + * Use GtkFileChooserNative for importing / exporting library. + * Removed AppMenu. + * Updated translations. + +--- Old: v7.1.tar.gz New: v7.2.tar.gz Other differences: -- ++ gradio.spec ++ --- /var/tmp/diff_new_pack.upUZLj/_old 2018-12-28 12:35:34.099953143 +0100 +++ /var/tmp/diff_new_pack.upUZLj/_new 2018-12-28 12:35:34.103953141 +0100 @@ -12,15 +12,15 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: gradio -Version:7.1 +Version:7.2 Release:0 Summary:GTK3 app for finding and listening to internet radio stations -License:GPL-3.0+ +License:GPL-3.0-or-later Group: Productivity/Multimedia/Sound/Players Url:https://github.com/haecker-felix/gradio Source: https://github.com/haecker-felix/gradio/archive/v%{version}.tar.gz @@ -52,7 +52,7 @@ %lang_package %prep -%setup -q +%setup -q -n Gradio-%{version} %build %{meson} ++ v7.1.tar.gz -> v7.2.tar.gz ++ 6392 lines of diff (skipped)
commit gradio for openSUSE:Factory
Hello community, here is the log from the commit of package gradio for openSUSE:Factory checked in at 2018-01-22 16:20:52 Comparing /work/SRC/openSUSE:Factory/gradio (Old) and /work/SRC/openSUSE:Factory/.gradio.new (New) Package is "gradio" Mon Jan 22 16:20:52 2018 rev:7 rq:568106 version:7.1 Changes: --- /work/SRC/openSUSE:Factory/gradio/gradio.changes2018-01-13 21:44:33.834699405 +0100 +++ /work/SRC/openSUSE:Factory/.gradio.new/gradio.changes 2018-01-22 16:22:19.347258639 +0100 @@ -1,0 +2,13 @@ +Mon Jan 22 09:30:35 UTC 2018 - mvet...@suse.com + +- Update to version 7.1: + * Simplified filter options + * Optionally display technical information + * Filter by tags + * Tags can be edited + * Updated translations + * Some design tweaks + * Show detailed export status (m3u) + * Access to radio-browser.info database + +--- Old: v7.0.tar.gz New: v7.1.tar.gz Other differences: -- ++ gradio.spec ++ --- /var/tmp/diff_new_pack.PLG1p0/_old 2018-01-22 16:22:20.315213367 +0100 +++ /var/tmp/diff_new_pack.PLG1p0/_new 2018-01-22 16:22:20.319213180 +0100 @@ -1,7 +1,7 @@ # # spec file for package gradio # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: gradio -Version:7.0 +Version:7.1 Release:0 Summary:GTK3 app for finding and listening to internet radio stations License:GPL-3.0+ ++ v7.0.tar.gz -> v7.1.tar.gz ++ 10665 lines of diff (skipped)
commit gradio for openSUSE:Factory
Hello community, here is the log from the commit of package gradio for openSUSE:Factory checked in at 2018-01-13 21:44:27 Comparing /work/SRC/openSUSE:Factory/gradio (Old) and /work/SRC/openSUSE:Factory/.gradio.new (New) Package is "gradio" Sat Jan 13 21:44:27 2018 rev:6 rq:557686 version:7.0 Changes: --- /work/SRC/openSUSE:Factory/gradio/gradio.changes2017-09-26 21:17:40.682934358 +0200 +++ /work/SRC/openSUSE:Factory/.gradio.new/gradio.changes 2018-01-13 21:44:33.834699405 +0100 @@ -1,0 +2,17 @@ +Sat Dec 16 15:56:13 UTC 2017 - mvet...@suse.com + +- Update to version 7.0: + * The "Discover" section is back + * Merged "Add" and "Search" page + * New unified library view + * Library can now be exported as M3U playlist + * New first launch experience + * Connection to the database is now encrypted + * Collections can now be renamed + * Stations can now be removed from collections + * Redesigned selection toolbar + * Redesigned application menu + * Redesigned collections popover + * Some performance and memory usage improvements + +--- Old: v6.0.2.tar.gz New: v7.0.tar.gz Other differences: -- ++ gradio.spec ++ --- /var/tmp/diff_new_pack.po2noc/_old 2018-01-13 21:44:34.49948 +0100 +++ /var/tmp/diff_new_pack.po2noc/_new 2018-01-13 21:44:34.470669761 +0100 @@ -17,7 +17,7 @@ Name: gradio -Version:6.0.2 +Version:7.0 Release:0 Summary:GTK3 app for finding and listening to internet radio stations License:GPL-3.0+ @@ -65,7 +65,7 @@ %find_lang %{name} %files -%license LICENSE +%license LICENSE.md %doc README.md %{_bindir}/gradio %{_datadir}/appdata/de.haeckerfelix.gradio.appdata.xml ++ v6.0.2.tar.gz -> v7.0.tar.gz ++ 19542 lines of diff (skipped)
commit gradio for openSUSE:Factory
Hello community, here is the log from the commit of package gradio for openSUSE:Factory checked in at 2017-09-26 21:16:33 Comparing /work/SRC/openSUSE:Factory/gradio (Old) and /work/SRC/openSUSE:Factory/.gradio.new (New) Package is "gradio" Tue Sep 26 21:16:33 2017 rev:5 rq:528754 version:6.0.2 Changes: --- /work/SRC/openSUSE:Factory/gradio/gradio.changes2017-09-20 17:11:19.353112994 +0200 +++ /work/SRC/openSUSE:Factory/.gradio.new/gradio.changes 2017-09-26 21:17:40.682934358 +0200 @@ -1,0 +2,8 @@ +Tue Sep 26 08:31:01 UTC 2017 - mvet...@suse.com + +- Update to version 6.0.2: + * Add GNOME Shell search provider + * Bugfix #213[2] cannot play m3u8 stations + * Bugfix #214[3] application is not translated + +--- Old: v6.0.1.tar.gz New: v6.0.2.tar.gz Other differences: -- ++ gradio.spec ++ --- /var/tmp/diff_new_pack.U1ICy5/_old 2017-09-26 21:17:41.398833710 +0200 +++ /var/tmp/diff_new_pack.U1ICy5/_new 2017-09-26 21:17:41.402833147 +0200 @@ -17,7 +17,7 @@ Name: gradio -Version:6.0.1 +Version:6.0.2 Release:0 Summary:GTK3 app for finding and listening to internet radio stations License:GPL-3.0+ @@ -74,6 +74,9 @@ %{_datadir}/icons/hicolor/scalable/apps/de.haeckerfelix.gradio.svg %{_datadir}/icons/hicolor/symbolic/apps/de.haeckerfelix.gradio-symbolic.svg %{_datadir}/glib-2.0/schemas/de.haeckerfelix.gradio.gschema.xml +%{_datadir}/dbus-1/services/de.haeckerfelix.gradio.service +%dir %{_datadir}/gnome-shell/ +%{_datadir}/gnome-shell/search-providers/ %files lang -f %{name}.lang ++ v6.0.1.tar.gz -> v6.0.2.tar.gz ++ 3506 lines of diff (skipped)
commit gradio for openSUSE:Factory
Hello community, here is the log from the commit of package gradio for openSUSE:Factory checked in at 2017-09-20 17:11:18 Comparing /work/SRC/openSUSE:Factory/gradio (Old) and /work/SRC/openSUSE:Factory/.gradio.new (New) Package is "gradio" Wed Sep 20 17:11:18 2017 rev:4 rq:527251 version:6.0.1 Changes: --- /work/SRC/openSUSE:Factory/gradio/gradio.changes2017-09-12 19:55:08.641193733 +0200 +++ /work/SRC/openSUSE:Factory/.gradio.new/gradio.changes 2017-09-20 17:11:19.353112994 +0200 @@ -1,0 +2,10 @@ +Mon Sep 18 13:35:32 UTC 2017 - mvet...@suse.com + +- Update to versoin 6.0.1: + * New keyboard shortcuts + * New translations + * bugfix #208[1] Duplicated appmenu on non GNOME desktops + * bugfix #209[2] No title is displayed if it contains an & sign +- Remove gradio-add-missed-translation.patch + +--- Old: gradio-add-missed-translation.patch v6.0.tar.gz New: v6.0.1.tar.gz Other differences: -- ++ gradio.spec ++ --- /var/tmp/diff_new_pack.bdLzM2/_old 2017-09-20 17:11:20.284981815 +0200 +++ /var/tmp/diff_new_pack.bdLzM2/_new 2017-09-20 17:11:20.288981252 +0200 @@ -17,14 +17,13 @@ Name: gradio -Version:6.0 +Version:6.0.1 Release:0 Summary:GTK3 app for finding and listening to internet radio stations License:GPL-3.0+ Group: Productivity/Multimedia/Sound/Players Url:https://github.com/haecker-felix/gradio Source: https://github.com/haecker-felix/gradio/archive/v%{version}.tar.gz -Patch0: gradio-add-missed-translation.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme @@ -54,7 +53,6 @@ %prep %setup -q -%patch0 -p1 %build %{meson} ++ v6.0.tar.gz -> v6.0.1.tar.gz ++ 4575 lines of diff (skipped)
commit gradio for openSUSE:Factory
Hello community, here is the log from the commit of package gradio for openSUSE:Factory checked in at 2017-09-12 19:54:38 Comparing /work/SRC/openSUSE:Factory/gradio (Old) and /work/SRC/openSUSE:Factory/.gradio.new (New) Package is "gradio" Tue Sep 12 19:54:38 2017 rev:3 rq:523040 version:6.0 Changes: --- /work/SRC/openSUSE:Factory/gradio/gradio.changes2017-02-16 16:49:58.292049451 +0100 +++ /work/SRC/openSUSE:Factory/.gradio.new/gradio.changes 2017-09-12 19:55:08.641193733 +0200 @@ -1,0 +2,8 @@ +Sun Sep 10 20:32:59 UTC 2017 - zai...@opensuse.org + +- Update to version 6.0 +- Switch to meson build system following upstream port. +- Add gradio-add-missed-translation.patch: Add translation already + in place in tarball, but missing in LINGUAS file. + +--- Old: v5.0.tar.gz New: gradio-add-missed-translation.patch v6.0.tar.gz Other differences: -- ++ gradio.spec ++ --- /var/tmp/diff_new_pack.uRUveH/_old 2017-09-12 19:55:09.437081825 +0200 +++ /var/tmp/diff_new_pack.uRUveH/_new 2017-09-12 19:55:09.437081825 +0200 @@ -17,19 +17,19 @@ Name: gradio -Version:5.0 +Version:6.0 Release:0 Summary:GTK3 app for finding and listening to internet radio stations License:GPL-3.0+ Group: Productivity/Multimedia/Sound/Players Url:https://github.com/haecker-felix/gradio Source: https://github.com/haecker-felix/gradio/archive/v%{version}.tar.gz -BuildRequires: autoconf -BuildRequires: automake +Patch0: gradio-add-missed-translation.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme -BuildRequires: intltool +BuildRequires: meson +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: vala BuildRequires: pkgconfig(gio-2.0) @@ -37,12 +37,12 @@ BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gstreamer-pbutils-1.0) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.14 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.22 BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libsoup-2.4) +BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(vapigen) >= 0.16 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%glib2_gsettings_schema_requires +Recommends: %{name}-lang %description Gradio is a native GTK application. It lets you browse, search and find radio @@ -50,38 +50,33 @@ an internet radio stream URL. The application uses the Community Radio Browser website for its database backend. +%lang_package + %prep %setup -q +%patch0 -p1 %build -./autogen.sh -%configure -make %{?_smp_mflags} +%{meson} +%{meson_build} %install -%make_install +%{meson_install} %fdupes %{buildroot}%{_prefix} - -%post -%glib2_gsettings_schema_post -%desktop_database_post -%icon_theme_cache_post - -%postun -%glib2_gsettings_schema_postun -%desktop_database_postun -%icon_theme_cache_postun +%find_lang %{name} %files -%defattr(-,root,root) -%doc README.md COPYING +%license LICENSE +%doc README.md %{_bindir}/gradio +%{_datadir}/appdata/de.haeckerfelix.gradio.appdata.xml %{_datadir}/applications/de.haeckerfelix.gradio.desktop -%{_datadir}/gradio/ %{_datadir}/icons/hicolor/*/apps/de.haeckerfelix.gradio.png -%{_datadir}/icons/hicolor/scalable/categories/*.svg +%{_datadir}/icons/hicolor/scalable/apps/de.haeckerfelix.gradio.svg %{_datadir}/icons/hicolor/symbolic/apps/de.haeckerfelix.gradio-symbolic.svg -%{_datadir}/glib-2.0/schemas/de.haecker-felix.gradio.gschema.xml +%{_datadir}/glib-2.0/schemas/de.haeckerfelix.gradio.gschema.xml + +%files lang -f %{name}.lang %changelog ++ gradio-add-missed-translation.patch ++ --- gradio-6.0-orig/po/LINGUAS 2017-09-10 17:40:20.0 +0200 +++ gradio-6.0/po/LINGUAS 2017-09-10 22:42:27.301407078 +0200 @@ -1,2 +1,3 @@ de hr +nb ++ v5.0.tar.gz -> v6.0.tar.gz ++ 39553 lines of diff (skipped)
commit gradio for openSUSE:Factory
Hello community, here is the log from the commit of package gradio for openSUSE:Factory checked in at 2017-02-16 16:49:57 Comparing /work/SRC/openSUSE:Factory/gradio (Old) and /work/SRC/openSUSE:Factory/.gradio.new (New) Package is "gradio" Changes: --- /work/SRC/openSUSE:Factory/gradio/gradio.changes2017-01-25 23:16:57.468482819 +0100 +++ /work/SRC/openSUSE:Factory/.gradio.new/gradio.changes 2017-02-16 16:49:58.292049451 +0100 @@ -1,0 +2,5 @@ +Sun Feb 5 07:21:47 UTC 2017 - mailaen...@opensuse.org + +- update to version 5.0 + +--- Old: v4.0.1.tar.gz New: v5.0.tar.gz Other differences: -- ++ gradio.spec ++ --- /var/tmp/diff_new_pack.IfjJHj/_old 2017-02-16 16:49:58.636000614 +0100 +++ /var/tmp/diff_new_pack.IfjJHj/_new 2017-02-16 16:49:58.636000614 +0100 @@ -1,7 +1,7 @@ # # spec file for package gradio # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,31 +17,31 @@ Name: gradio -Version:4.0.1 +Version:5.0 Release:0 Summary:GTK3 app for finding and listening to internet radio stations License:GPL-3.0+ Group: Productivity/Multimedia/Sound/Players Url:https://github.com/haecker-felix/gradio Source: https://github.com/haecker-felix/gradio/archive/v%{version}.tar.gz -BuildRequires: cmake +BuildRequires: autoconf +BuildRequires: automake BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: hicolor-icon-theme BuildRequires: intltool BuildRequires: update-desktop-files BuildRequires: vala -BuildRequires: gcc-c++ -BuildRequires: hicolor-icon-theme -BuildRequires: pkgconfig(gtk+-3.0) >= 3.18 -BuildRequires: pkgconfig(vapigen) >= 0.16 -BuildRequires: pkgconfig(libsoup-2.4) +BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gstreamer-1.0) +BuildRequires: pkgconfig(gstreamer-pbutils-1.0) +BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) +BuildRequires: pkgconfig(gtk+-3.0) >= 3.14 BuildRequires: pkgconfig(json-glib-1.0) -BuildRequires: pkgconfig(gio-2.0) -BuildRequires: pkgconfig(gee-0.8) -BuildRequires: fdupes +BuildRequires: pkgconfig(libsoup-2.4) +BuildRequires: pkgconfig(vapigen) >= 0.16 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Recommends: %{name}-lang %glib2_gsettings_schema_requires %description @@ -50,21 +50,17 @@ an internet radio stream URL. The application uses the Community Radio Browser website for its database backend. -%lang_package - %prep %setup -q %build -%cmake +./autogen.sh +%configure make %{?_smp_mflags} %install -%cmake_install -# AudioVideo due to https://bugzilla.opensuse.org/show_bug.cgi?id=990956 -%suse_update_desktop_file -r gradio GNOME GTK AudioVideo Audio Player +%make_install -%find_lang %{name} %fdupes %{buildroot}%{_prefix} %post @@ -79,17 +75,13 @@ %files %defattr(-,root,root) -%doc README.md debian/copyright +%doc README.md COPYING %{_bindir}/gradio -%{_datadir}/applications/gradio.desktop +%{_datadir}/applications/de.haeckerfelix.gradio.desktop %{_datadir}/gradio/ -%{_datadir}/gradio/style/ -%dir %{_datadir}/icons/hicolor/14x14/ -%dir %{_datadir}/icons/hicolor/14x14/apps -%{_datadir}/icons/hicolor/*/apps/gradio.png -%{_datadir}/pixmaps/gradio.svg +%{_datadir}/icons/hicolor/*/apps/de.haeckerfelix.gradio.png +%{_datadir}/icons/hicolor/scalable/categories/*.svg +%{_datadir}/icons/hicolor/symbolic/apps/de.haeckerfelix.gradio-symbolic.svg %{_datadir}/glib-2.0/schemas/de.haecker-felix.gradio.gschema.xml -%files lang -f %{name}.lang - %changelog ++ v4.0.1.tar.gz -> v5.0.tar.gz ++ 20133 lines of diff (skipped)