Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package meld for openSUSE:Factory checked in at 2021-04-12 12:36:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/meld (Old) and /work/SRC/openSUSE:Factory/.meld.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "meld" Mon Apr 12 12:36:17 2021 rev:72 rq:881082 version:3.21.0 Changes: -------- --- /work/SRC/openSUSE:Factory/meld/meld.changes 2021-02-15 23:22:05.607914957 +0100 +++ /work/SRC/openSUSE:Factory/.meld.new.2401/meld.changes 2021-04-12 12:39:16.077502033 +0200 @@ -1,0 +2,43 @@ +Mon Feb 15 03:21:00 UTC 2021 - dims...@opensuse.org + +- Update to version 3.21.0: + + Move to a modern GTK headerbar-based design. + + Make file comparison change navigation more intuitive by + changing how it decides where to scroll from. + + Completely refreshed Meld application icon. + + File comparison now has overscroll at the bottom of file + comparisons, making it easier to see end-of-file differences + and improving scroll syncing. + + Text wrapping, whitespace, line numbers and line highlight can + now all be toggled from the file comparison status bar. + + Features: + - Add support for CVS in version control comparisons. + - Copy selected file paths in folder comparison. + - Improve dark theme detection so custom Meld highlighting + better matches the user's theme. + + Fixes: + - Fix file comparison closing after file save (Vasily Galkin) + - Fix file comparison handling of certain line breaks (Kai Willadsen) + + Internal changes: + - Add Meson build system support. + - Move from GtkUIManager to GAction-based actions + - Move all UI-file-constructed widgets from custom Python + wrapper classes to using real GtkWidget templates. + - Move to new GtkSourceView 4 API. + - Modernised Python GObject API usage, including signal and + property usage. + - Support Python 3.8. + + Updated translations. +- Switch to meson buildsystem: + + Add meson BuildRequires. + + Use %meson/%meson_build/%meson_install instead of + python3 setup.py calls. + + Drop hicolor-icon-theme, intltool, libxml2-tools and python3 + BuildRequires. + + Add pkgconfig(glib-2.0), pkgconfig(gtk+-3.0), + pkgconfig(gtksourceview-4), pkgconfig(py3cairo), + pkgconfig(pygobject-3.0) and pkgconfig(python3) BuildRequires. +- Remove legacy post/postun scriptlets. +- Drop meld-nodocs.patch: no longer needed after the port to meson. + +------------------------------------------------------------------- Old: ---- meld-3.20.3.tar.xz meld-nodocs.patch New: ---- meld-3.21.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meld.spec ++++++ --- /var/tmp/diff_new_pack.Z7UDu8/_old 2021-04-12 12:39:16.589502628 +0200 +++ /var/tmp/diff_new_pack.Z7UDu8/_new 2021-04-12 12:39:16.589502628 +0200 @@ -17,28 +17,27 @@ Name: meld -Version: 3.20.3 +Version: 3.21.0 Release: 0 Summary: Visual diff and merge tool License: GPL-2.0-or-later Group: Development/Tools/Other URL: http://meldmerge.org/ -Source0: https://download.gnome.org/sources/meld/3.20/%{name}-%{version}.tar.xz - -# PATCH-FIX-OPENSUSE meld-nodocs.patch dims...@opensuse.org -- We do not want COPYING and NEWS installed like this -Patch0: meld-nodocs.patch +Source0: https://download.gnome.org/sources/meld/3.21/%{name}-%{version}.tar.xz BuildRequires: fdupes # Needed for typelib() Requires BuildRequires: gobject-introspection-devel -# Needed for highcolor macros -BuildRequires: hicolor-icon-theme -BuildRequires: intltool BuildRequires: itstool -BuildRequires: libxml2-tools -BuildRequires: python3 >= 3.3 +BuildRequires: meson >= 0.47.0 BuildRequires: translation-update-upstream BuildRequires: update-desktop-files +BuildRequires: pkgconfig(glib-2.0) >= 2.48 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.20 +BuildRequires: pkgconfig(gtksourceview-4) >= 4.0.0 +BuildRequires: pkgconfig(py3cairo) >= 1.15.0 +BuildRequires: pkgconfig(pygobject-3.0) >= 3.30 +BuildRequires: pkgconfig(python3) >= 3.6 # needed for VCS diffs Requires: patch Requires: python3-cairo @@ -73,52 +72,33 @@ %prep %autosetup -p1 +sed -i "s|/usr/bin/env python3|%{_bindir}/python3|g" bin/meld translation-update-upstream %build -python3 setup.py build +%meson +%meson_build %install -python3 setup.py \ - --no-update-icon-cache \ - --no-compile-schemas \ - install --root %{buildroot} --prefix %{_prefix} +%meson_install %find_lang %{name} %{?no_lang_C} -%suse_update_desktop_file org.gnome.meld IDE +%suse_update_desktop_file org.gnome.Meld IDE %fdupes %{buildroot}%{_datadir} -%if 0%{?suse_version} < 1330 -%post -%desktop_database_post -%glib2_gsettings_schema_post -%icon_theme_cache_post -%icon_theme_cache_post HighContrast -%mime_database_post - -%postun -%desktop_database_postun -%glib2_gsettings_schema_postun -%icon_theme_cache_postun -%icon_theme_cache_postun HighContrast -%mime_database_postun -%endif - %files %license COPYING %doc NEWS %{_bindir}/%{name} %{_datadir}/%{name}/ %dir %{_datadir}/metainfo/ -%{_datadir}/metainfo/org.gnome.meld.appdata.xml -%{_datadir}/applications/org.gnome.meld.desktop +%{_datadir}/metainfo/org.gnome.Meld.appdata.xml +%{_datadir}/applications/org.gnome.Meld.desktop %{_datadir}/glib-2.0/schemas/org.gnome.meld.gschema.xml %doc %{_datadir}/help/C/meld/ %{_datadir}/icons/hicolor/*/*/* -%{_datadir}/icons/HighContrast/ -%{_datadir}/mime/packages/org.gnome.meld.xml +%{_datadir}/mime/packages/org.gnome.Meld.xml %{_mandir}/man1/meld.1%{?ext_man} %{python3_sitelib}/meld/ -%{python3_sitelib}/meld*egg-info* %files lang -f %{name}.lang ++++++ meld-3.20.3.tar.xz -> meld-3.21.0.tar.xz ++++++ ++++ 103520 lines of diff (skipped)
