commit meld for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package meld for openSUSE:Factory checked in at 2022-09-08 14:23:12 Comparing /work/SRC/openSUSE:Factory/meld (Old) and /work/SRC/openSUSE:Factory/.meld.new.2083 (New) Package is "meld" Thu Sep 8 14:23:12 2022 rev:80 rq:1001768 version:3.22.0 Changes: --- /work/SRC/openSUSE:Factory/meld/meld.changes2022-08-27 11:50:28.341892347 +0200 +++ /work/SRC/openSUSE:Factory/.meld.new.2083/meld.changes 2022-09-08 14:23:49.322692193 +0200 @@ -1,0 +2,10 @@ +Wed Sep 7 07:12:59 UTC 2022 - Bj??rn Lie + +- Update to version 3.22.0: + + Fix text filter changes on existing comparisons + + Build fixes + + Documentation updates + + Updated translations. +- Drop meld-3.21.3-fix-executable-permission.patch: Fixed upstream. + +--- Old: meld-3.21.3-fix-executable-permission.patch meld-3.21.3.tar.xz New: meld-3.22.0.tar.xz Other differences: -- ++ meld.spec ++ --- /var/tmp/diff_new_pack.MS8qce/_old 2022-09-08 14:23:50.014693790 +0200 +++ /var/tmp/diff_new_pack.MS8qce/_new 2022-09-08 14:23:50.018693799 +0200 @@ -17,15 +17,13 @@ Name: meld -Version:3.21.3 +Version:3.22.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.21/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM meld-3.21.3-fix-executable-permission.patch -- Fix missing executable permission -Patch0: meld-3.21.3-fix-executable-permission.patch +Source0: https://download.gnome.org/sources/meld/3.22/%{name}-%{version}.tar.xz BuildRequires: appstream-glib BuildRequires: desktop-file-utils ++ meld-3.21.3.tar.xz -> meld-3.22.0.tar.xz ++ 3686 lines of diff (skipped)
commit meld for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package meld for openSUSE:Factory checked in at 2022-08-27 11:50:27 Comparing /work/SRC/openSUSE:Factory/meld (Old) and /work/SRC/openSUSE:Factory/.meld.new.2083 (New) Package is "meld" Sat Aug 27 11:50:27 2022 rev:79 rq:999500 version:3.21.3 Changes: --- /work/SRC/openSUSE:Factory/meld/meld.changes2022-08-23 14:27:15.163306149 +0200 +++ /work/SRC/openSUSE:Factory/.meld.new.2083/meld.changes 2022-08-27 11:50:28.341892347 +0200 @@ -1,0 +2,8 @@ +Thu Aug 25 20:03:43 UTC 2022 - Antoine Belvire + +- Add meld-3.21.3-fix-executable-permission.patch: Restore + executable permission of application. +- Don't strip env from shebang line in %prep: It's performed via + meson since 3.21.3. + +--- New: meld-3.21.3-fix-executable-permission.patch Other differences: -- ++ meld.spec ++ --- /var/tmp/diff_new_pack.moJkMx/_old 2022-08-27 11:50:28.909893567 +0200 +++ /var/tmp/diff_new_pack.moJkMx/_new 2022-08-27 11:50:28.913893576 +0200 @@ -24,6 +24,8 @@ Group: Development/Tools/Other URL:http://meldmerge.org/ Source0: https://download.gnome.org/sources/meld/3.21/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM meld-3.21.3-fix-executable-permission.patch -- Fix missing executable permission +Patch0: meld-3.21.3-fix-executable-permission.patch BuildRequires: appstream-glib BuildRequires: desktop-file-utils @@ -70,7 +72,6 @@ %prep %autosetup -p1 -sed -i "s|/usr/bin/env python3|%{_bindir}/python3|g" bin/meld %build %meson ++ meld-3.21.3-fix-executable-permission.patch ++ >From 710972cf25b5b677f862e781b7e058ef828c3cd4 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Fri, 19 Aug 2022 07:41:25 +1000 Subject: [PATCH] Fix shebang normalisation to maintain script mode --- meson_shebang_normalisation.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meson_shebang_normalisation.py b/meson_shebang_normalisation.py index 4cf18754..e126d8fb 100755 --- a/meson_shebang_normalisation.py +++ b/meson_shebang_normalisation.py @@ -15,6 +15,9 @@ def main(): lines[0] = "".join(lines[0].split("env ")) out_path.write_text("".join(lines)) +stat = in_path.stat() +out_path.chmod(stat.st_mode) + if __name__ == "__main__": main() -- GitLab
commit meld for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package meld for openSUSE:Factory checked in at 2022-08-23 14:26:40 Comparing /work/SRC/openSUSE:Factory/meld (Old) and /work/SRC/openSUSE:Factory/.meld.new.2083 (New) Package is "meld" Tue Aug 23 14:26:40 2022 rev:78 rq:998621 version:3.21.3 Changes: --- /work/SRC/openSUSE:Factory/meld/meld.changes2022-06-20 15:39:14.215031607 +0200 +++ /work/SRC/openSUSE:Factory/.meld.new.2083/meld.changes 2022-08-23 14:27:15.163306149 +0200 @@ -1,0 +2,17 @@ +Sun Aug 14 10:28:14 UTC 2022 - Michael Str??der + +- Update to version 3.21.3: + + Features: +- Add shortcut for open externally action. +- Add improved tooltips for tab labels. + + Fixes: +- Move horizontal-icon menu section to regular menu items. +- Fix chunk navigation actions sometimes not working after + chunk push/pull actions. +- Show more parent context in path label display. +- Update meson build to strip env from shebang line. +- Fix left-click chunk actions under certain window managers. +- Fix version control showing console windows on Windows. +- Fix path label display for very long filenames. + +--- Old: meld-3.21.2.tar.xz New: meld-3.21.3.tar.xz Other differences: -- ++ meld.spec ++ --- /var/tmp/diff_new_pack.PsUGPU/_old 2022-08-23 14:27:15.699307328 +0200 +++ /var/tmp/diff_new_pack.PsUGPU/_new 2022-08-23 14:27:15.703307337 +0200 @@ -17,7 +17,7 @@ Name: meld -Version:3.21.2 +Version:3.21.3 Release:0 Summary:Visual diff and merge tool License:GPL-2.0-or-later ++ meld-3.21.2.tar.xz -> meld-3.21.3.tar.xz ++ 5477 lines of diff (skipped)
commit meld for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package meld for openSUSE:Factory checked in at 2022-06-20 15:38:23 Comparing /work/SRC/openSUSE:Factory/meld (Old) and /work/SRC/openSUSE:Factory/.meld.new.1548 (New) Package is "meld" Mon Jun 20 15:38:23 2022 rev:77 rq:983860 version:3.21.2 Changes: --- /work/SRC/openSUSE:Factory/meld/meld.changes2022-02-04 21:52:09.651248941 +0100 +++ /work/SRC/openSUSE:Factory/.meld.new.1548/meld.changes 2022-06-20 15:39:14.215031607 +0200 @@ -1,0 +2,40 @@ +Sat Jun 18 06:54:15 UTC 2022 - Michael Str??der + +- removed obsolete cc7746c141d976a4779cf868774fae1fe7627a6d.patch +- Update to version 3.21.2 + * Features: +- Folder comparison now supports compare differently-named files across + panes, by marking files for comparison (Helly Guo) +- Synchronization points are now significantly easier to use and more + robust, and have new user documentation (Roberto Vidal) +- Added option to ignore Unicode normalisation form differences when + comparing paths (Dan B) +- The files or folders being compared can now be swapped in two pane mode, + using the new View -> Swap left and right panes menu item (Helly Guo) +- Folder comparisons now show a "(scanning...)" indication in tree view + rows as an additional visual cue that the comparison is still running + (Kai Willadsen) +- Folder comparisons have a new optional ISO-format time column (Kai + Willadsen) + * Fixes: +- Update icon usage to support stock icon removal from new Adwaita versions + (Jan Tojnar) +- Build fix for Meson 0.61.0 (Silvio Fricke) +- The new pathlabel widgets now support user-provided custom labels (Kai + Willadsen) +- Fix file selectors in folder comparisons to always open in the current + folder (Kai Willadsen) +- Using a custom save path (i.e., the --output flag) now sets a buffer as + modified, so that unchanged merges can be saved (Kai Willadsen) +- Comparing new or deleted rows in folder comparison now opens a two-pane + file comparisons for consistency (Kai Willadsen) +- Destructive dialog actions now have appropriate styling (Kai Willadsen) +- Invalid user settings for folder comparison columns are now handled more + gracefully (Kai Willadsen) +- The nightly flatpak build now includes Git to make version control + comparisons somewhat functional (Kai Willadsen) +- Issues fixed: #11, #85, #188, #319, #381, #475, #492, #581, #620, #638, + #645, #660, #662, #672 + * Improvements to translations + +--- Old: cc7746c141d976a4779cf868774fae1fe7627a6d.patch meld-3.21.1.tar.xz New: meld-3.21.2.tar.xz Other differences: -- ++ meld.spec ++ --- /var/tmp/diff_new_pack.q6qrtH/_old 2022-06-20 15:39:14.687032297 +0200 +++ /var/tmp/diff_new_pack.q6qrtH/_new 2022-06-20 15:39:14.691032303 +0200 @@ -17,15 +17,13 @@ Name: meld -Version:3.21.1 +Version:3.21.2 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.21/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM cc7746c141d976a4779cf868774fae1fe7627a6d.patch -- Fix build with meson 0.61 and newer -Patch0: https://gitlab.gnome.org/GNOME/meld/-/commit/cc7746c141d976a4779cf868774fae1fe7627a6d.patch BuildRequires: appstream-glib BuildRequires: desktop-file-utils ++ meld-3.21.1.tar.xz -> meld-3.21.2.tar.xz ++ 41684 lines of diff (skipped)
commit meld for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package meld for openSUSE:Factory checked in at 2022-01-08 23:23:34 Comparing /work/SRC/openSUSE:Factory/meld (Old) and /work/SRC/openSUSE:Factory/.meld.new.1892 (New) Package is "meld" Sat Jan 8 23:23:34 2022 rev:75 rq:944777 version:3.21.1 Changes: --- /work/SRC/openSUSE:Factory/meld/meld.changes2021-09-20 23:36:20.419409822 +0200 +++ /work/SRC/openSUSE:Factory/.meld.new.1892/meld.changes 2022-01-08 23:24:08.278257050 +0100 @@ -1,0 +2,28 @@ +Fri Jan 7 15:06:27 UTC 2022 - Dominique Leuenberger + +- Update to version 3.21.1: + + UI changes: +- A new custom per-pane location display widget replaces the + standard GTK+ file chooser button and our existing + placeholder path display, including actions for opening + containing folder and copying file paths. +- Version control comparison has had its action bar modernised + in line with file and folder comparison. + + Features: +- The find bar now remembers the previous search across panes. +- We show a warning to the user if they're trying to compare a + file or folder to itself. +- Meld no longer uses custom file chooser dialogs, improving + portability and flatpak behaviour. +- Two pane comparisons now allow Alt+Right/Left to work in + either pane. +- Certain header bar actions (e.g., conflict navigation, + filters) are now only shown in their appropriate comparison + types. +- The application title no longer includes the per-comparison + label. +- Add a preference for GTK's dark theme support. +- Retain clipboard contents after exiting Meld. + + Updated translations. + +--- Old: meld-3.21.0.tar.xz New: meld-3.21.1.tar.xz Other differences: -- ++ meld.spec ++ --- /var/tmp/diff_new_pack.qEB5hO/_old 2022-01-08 23:24:08.938257589 +0100 +++ /var/tmp/diff_new_pack.qEB5hO/_new 2022-01-08 23:24:08.942257593 +0100 @@ -1,7 +1,7 @@ # # spec file for package meld # -# 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,7 +17,7 @@ Name: meld -Version:3.21.0 +Version:3.21.1 Release:0 Summary:Visual diff and merge tool License:GPL-2.0-or-later @@ -29,7 +29,7 @@ # Needed for typelib() Requires BuildRequires: gobject-introspection-devel BuildRequires: itstool -BuildRequires: meson >= 0.47.0 +BuildRequires: meson >= 0.49.0 BuildRequires: update-desktop-files BuildRequires: pkgconfig(glib-2.0) >= 2.48 BuildRequires: pkgconfig(gtk+-3.0) >= 3.20 ++ meld-3.21.0.tar.xz -> meld-3.21.1.tar.xz ++ 75522 lines of diff (skipped)
commit meld for openSUSE:Factory
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-09-20 23:33:33 Comparing /work/SRC/openSUSE:Factory/meld (Old) and /work/SRC/openSUSE:Factory/.meld.new.1899 (New) Package is "meld" Mon Sep 20 23:33:33 2021 rev:74 rq:920294 version:3.21.0 Changes: --- /work/SRC/openSUSE:Factory/meld/meld.changes2021-04-17 23:25:29.173647337 +0200 +++ /work/SRC/openSUSE:Factory/.meld.new.1899/meld.changes 2021-09-20 23:36:20.419409822 +0200 @@ -1,0 +2,6 @@ +Thu Sep 16 02:03:26 UTC 2021 - Stanislav Brabec + +- Remove obsolete translation-update-upstream support + (jsc#SLE-21105). + +--- Other differences: -- ++ meld.spec ++ --- /var/tmp/diff_new_pack.8wnmCZ/_old 2021-09-20 23:36:20.843410346 +0200 +++ /var/tmp/diff_new_pack.8wnmCZ/_new 2021-09-20 23:36:20.843410346 +0200 @@ -30,7 +30,6 @@ BuildRequires: gobject-introspection-devel BuildRequires: itstool 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 @@ -76,7 +75,6 @@ %prep %autosetup -p1 sed -i "s|/usr/bin/env python3|%{_bindir}/python3|g" bin/meld -translation-update-upstream %build %meson
commit meld for openSUSE:Factory
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-17 23:25:20 Comparing /work/SRC/openSUSE:Factory/meld (Old) and /work/SRC/openSUSE:Factory/.meld.new.12324 (New) Package is "meld" Sat Apr 17 23:25:20 2021 rev:73 rq:886364 version:3.21.0 Changes: --- /work/SRC/openSUSE:Factory/meld/meld.changes2021-04-12 12:39:16.077502033 +0200 +++ /work/SRC/openSUSE:Factory/.meld.new.12324/meld.changes 2021-04-17 23:25:29.173647337 +0200 @@ -1,0 +2,8 @@ +Fri Apr 16 07:14:07 UTC 2021 - Dominique Leuenberger + +- Add typelib(GtkSource) = 4 requires: The code obscures a lot of + logic, instead of requiring GtkSource 4, they require GtkSource + (any version) and then runtime complain if it's not 4. + (boo#1184842). + +--- Other differences: -- ++ meld.spec ++ --- /var/tmp/diff_new_pack.8HAxJr/_old 2021-04-17 23:25:29.509647909 +0200 +++ /var/tmp/diff_new_pack.8HAxJr/_new 2021-04-17 23:25:29.513647917 +0200 @@ -42,6 +42,9 @@ Requires: patch Requires: python3-cairo Requires: python3-gobject-Gdk +# the code obscures a lot of logic, instead of requiring GtkSource 4.0, they require +# GtkSource (any version) and then runtime complain if it's not 4.0 :( (boo#1184842) +Requires: typelib(GtkSource) = 4 # Suggest various vcs that meld can handle Suggests: bzr Suggests: cvs
commit meld for openSUSE:Factory
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.changes2021-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
commit meld for openSUSE:Factory
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-02-15 23:20:25 Comparing /work/SRC/openSUSE:Factory/meld (Old) and /work/SRC/openSUSE:Factory/.meld.new.28504 (New) Package is "meld" Mon Feb 15 23:20:25 2021 rev:71 rq:872497 version:3.20.3 Changes: --- /work/SRC/openSUSE:Factory/meld/meld.changes2020-02-18 13:29:16.684687658 +0100 +++ /work/SRC/openSUSE:Factory/.meld.new.28504/meld.changes 2021-02-15 23:22:05.607914957 +0100 @@ -1,0 +2,14 @@ +Sat Feb 13 16:40:38 UTC 2021 - Bj??rn Lie + +- Update to version 3.20.3: + + Fix folder comparison sensitivity breaking when cancelling a +scan. + + Fix Subversion comparsion on Python 3.9. + + Retain clipboard contents after exiting Meld. + + Fix wrapping in notification bars. + + Fix border width in our file selection dialog. + + Fix occasional traceback when closing comparisons. + + Update links to reflect move to Discourse. + + Updated translations. + +--- Old: meld-3.20.2.tar.xz New: meld-3.20.3.tar.xz Other differences: -- ++ meld.spec ++ --- /var/tmp/diff_new_pack.HrFKr3/_old 2021-02-15 23:22:06.103915699 +0100 +++ /var/tmp/diff_new_pack.HrFKr3/_new 2021-02-15 23:22:06.107915704 +0100 @@ -1,7 +1,7 @@ # # spec file for package meld # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # 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: meld -Version:3.20.2 +Version:3.20.3 Release:0 Summary:Visual diff and merge tool License:GPL-2.0-or-later ++ meld-3.20.2.tar.xz -> meld-3.20.3.tar.xz ++ 12397 lines of diff (skipped)