chore: Update meld to 3.22.2-1

NEWS

@@ -1,4 +1,69 @@
 
+2024-03-24 meld 3.22.2
+======================
+
+  Fixes:
+
+   * Fix incorrect DLL paths in Windows build (Kai Willadsen)
+   * Remove upstream deprecated 32-bit Windows build (Kai Willadsen)
+
+   * Issues fixed: #824
+
+  Translations:
+
+   * Daniel Rusek (cs)
+
+
+2024-02-18 meld 3.22.1
+======================
+
+  Fixes:
+
+   * Work around layout sizing issue (Kai Willadsen)
+   * Fix broken search context (t-gergely)
+   * Fix issues with pane contents swapping missing warnings and incorrectly
+     handling blank or version-controlled panes (Helly Guo)
+   * Fix go-to-line accelerator conflict with previous-conflict (Kai Willadsen)
+   * Fix unintended requirement on Adwaita cursors (Kai Willadsen)
+   * Fix incorrect cut/copy/paste sensitivity on pane change (Kai Willadsen)
+   * Fix multi-row selection in folder and version control view (Kai Willadsen)
+   * Fix missing pull/push version control icons (Kai Willadsen)
+   * Refresh highlighting theme when dark theme preference changes (Kai
+     Willadsen)
+   * Remove filter and conflict buttons from new comparison tab (Kai Willadsen)
+   * Fix scroll not working in file action gutter (Kai Willadsen)
+   * Fix line number rendering when changing font sizes (Kai Willadsen)
+   * Fix overview map not redrawing on text wrap toggle (Kai Willadsen)
+   * Set minimum width for notebook labels (Kai Willadsen)
+   * Improve notebook label ellipsization (Kai Willadsen)
+   * Fix Meson byte-compilation support with DESTDIR (Kai Willadsen)
+
+   * Issues fixed: #709, #713, #715, #724, #726, #729, #733, #736, #767, #769,
+                   #780, #785, #787, #795, #796, #796, #797, #798
+
+  Translations:
+
+   * Anders Jonsson (sv)
+   * Asier Sarasua Garmendia (eu)
+   * Balázs Úr (hu)
+   * Daniel Rusek (cs)
+   * Ekaterine Papava (ka)
+   * Emin Tufan Çetin (tr)
+   * Enrico Nicoletto (pt_BR)
+   * Fran Dieguez (gl)
+   * Hugo Carvalho (pt)
+   * Jiri Grönroos (fi)
+   * Jürgen Benvenuti (de)
+   * Kukuh Syafaat (id)
+   * Martin (sl)
+   * Philipp Kiemle (de)
+   * Piotr Drąg (pl)
+   * Rafael Fontenelle (pt_BR)
+   * Sergej A (ru)
+   * Yuri Chornoivan (uk)
+   * Мирослав Николић (sr)
+
+
 2022-09-04 meld 3.22.0
 ======================
 

bin/meld

@@ -107,7 +107,7 @@ elif frozen:
     meld.conf.frozen()
 
 # TODO: Possibly move to elib.intl
-import gettext  # noqa: E402, I100
+import gettext  # noqa: E402, I001
 locale_domain = meld.conf.__package__
 locale_dir = meld.conf.LOCALEDIR
 
@@ -256,8 +256,7 @@ def check_requirements():
 
 
 def setup_resources():
-    from gi.repository import Gio
-    from gi.repository import GtkSource
+    from gi.repository import Gio, GtkSource
 
     resource_filename = meld.conf.APPLICATION_ID + ".gresource"
     resource_file = os.path.join(meld.conf.DATADIR, resource_filename)

data/org.gnome.MeldDevel.json

@@ -54,7 +54,8 @@
       "sources": [
         {
           "type": "git",
-          "url": "https://gitlab.gnome.org/GNOME/meld.git"
+          "url": "https://gitlab.gnome.org/GNOME/meld.git",
+          "branch": "main"
         }
       ],
       "config-opts": [

data/org.gnome.meld.appdata.xml.in.in

@@ -52,6 +52,30 @@
   <translation type="gettext">meld</translation>
   <content_rating type="oars-1.1" />
   <releases>
+    <release date="2024-03-24" version="3.22.2">
+      <description>
+        <p>
+          This is a stable release in the 3.22 series.
+        </p>
+        <ul>
+          <li>Fixed Windows build</li>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+    </release>
+    <release date="2024-02-18" version="3.22.1">
+      <description>
+        <p>
+          This is a stable release in the 3.22 series. Fixes include:
+        </p>
+        <ul>
+          <li>Fixed several layout and sizing issues</li>
+          <li>Improved consistency of swap-panes action</li>
+          <li>Fixed menu item sensitivity in several cases</li>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+    </release>
     <release date="2022-09-04" version="3.22.0">
       <description>
         <p>

debian/changelog

@@ -1,3 +1,23 @@
+meld (3.22.2-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Jeremy Bícha <[email protected]>  Mon, 01 Apr 2024 12:09:55 -0400
+
+meld (3.22.1-2) unstable; urgency=medium
+
+  * Replace Depends: libgtk-3-0 with gir1.2-gtk-3.0 (Closes: #1067193)
+
+ -- Jeremy Bícha <[email protected]>  Tue, 19 Mar 2024 16:52:04 -0400
+
+meld (3.22.1-1) unstable; urgency=medium
+
+  * New upstream release
+  * Stop using debian/control.in and dh-sequence-gnome
+  * Update standards version to 4.6.2, no changes needed
+
+ -- Jeremy Bícha <[email protected]>  Mon, 19 Feb 2024 16:32:18 -0500
+
 meld (3.22.0-2) unstable; urgency=medium
 
   [ Debian Janitor ]

debian/control

@@ -1,14 +1,9 @@
-# This file is autogenerated. DO NOT EDIT!
-#
-# Modifications should be made to debian/control.in instead.
-# This file is regenerated automatically in the clean target.
 Source: meld
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <[email protected]>
-Uploaders: Emilio Pozuelo Monfort <[email protected]>, Jeremy Bicha <[email protected]>
+Uploaders: Emilio Pozuelo Monfort <[email protected]>, Jeremy Bícha <[email protected]>
 Build-Depends: debhelper-compat (= 13),
-               dh-sequence-gnome,
                dh-sequence-python3,
                libgtk-3-dev,
                libgtksourceview-4-dev,
@@ -19,7 +14,7 @@ Build-Depends: debhelper-compat (= 13),
                intltool,
                itstool,
                libxml2-utils
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Vcs-Browser: https://salsa.debian.org/gnome-team/meld
 Vcs-Git: https://salsa.debian.org/gnome-team/meld.git
@@ -29,7 +24,7 @@ Package: meld
 Architecture: all
 Depends: ${python3:Depends},
          ${misc:Depends},
-         libgtk-3-0 (>= 3.20),
+         gir1.2-gtk-3.0,
          python3-gi (>= 3.20),
          python3-gi-cairo,
          gir1.2-gtksource-4,

debian/gbp.conf

@@ -1,6 +1,6 @@
 [DEFAULT]
 pristine-tar = True
-debian-branch = debian/master
+debian-branch = debian/latest
 upstream-branch = upstream/latest
 
 [buildpackage]

dev-requirements.txt

@@ -1,8 +1,3 @@
-flake8==5.0.4
-flake8-isort==4.2.0
-mccabe==0.7.0
-pep8-naming==0.13.1
-pre-commit==2.20.0
-pycodestyle==2.9.1
-pyflakes==2.5.0
+ruff~=0.1.8
+pre-commit~=3.6.0
 pytest==7.1.2

maint

@@ -428,7 +428,7 @@ def dist():
     call_with_output(cmd, echo_stdout=False)
 
     click.echo('Creating distribution...')
-    cmd = ['ninja', '-C', build_dir, 'dist']
+    cmd = ['meson', 'dist', '-C', build_dir]
     call_with_output(cmd, echo_stdout=False)
 
     if not os.path.exists(dist_archive_path):

meld/accelerators.py

@@ -28,7 +28,7 @@
     'win.new-tab': '<Primary>N',
     'win.stop': 'Escape',
     # File comparison actions
-    'view.file-previous-conflict': '<Primary>I',
+    'view.file-previous-conflict': '<Primary>J',
     'view.file-next-conflict': '<Primary>K',
     'view.file-push-left': '<Alt>Left',
     'view.file-push-right': '<Alt>Right',

meld/actiongutter.py

@@ -178,7 +178,8 @@ def do_realize(self):
             Gdk.EventMask.LEAVE_NOTIFY_MASK |
             Gdk.EventMask.POINTER_MOTION_MASK |
             Gdk.EventMask.BUTTON_PRESS_MASK |
-            Gdk.EventMask.BUTTON_RELEASE_MASK
+            Gdk.EventMask.BUTTON_RELEASE_MASK |
+            Gdk.EventMask.SCROLL_MASK
         )
         self.connect('notify::action-mode', lambda *args: self.queue_draw())
 

meld/build_helpers.py

@@ -41,11 +41,6 @@
             'install paths may be incorrect', file=sys.stderr)
 
 windows_build = os.name == 'nt'
-if windows_build:
-    import cx_Freeze
-    command_base = cx_Freeze
-else:
-    command_base = distutils
 
 
 def has_help(self):
@@ -64,7 +59,7 @@ def has_data(self):
     return "build_data" in self.distribution.cmdclass
 
 
-command_base.command.build.Build.sub_commands.extend([
+distutils.command.build.build.sub_commands.extend([
     ("build_i18n", has_i18n),
     ("build_icons", has_icons),
     ("build_help", has_help),

meld/chunkmap.py

@@ -15,7 +15,7 @@
 
 import collections
 import logging
-from typing import List, Mapping, Tuple
+from typing import Any, List, Mapping, Tuple
 
 import cairo
 from gi.repository import Gdk, GObject, Gtk
@@ -283,6 +283,15 @@ class TextViewChunkMap(ChunkMap):
         ),
     )
 
+    def do_realize(self):
+
+        def force_redraw(*args: Any) -> None:
+            self._cached_map = None
+            self.queue_draw()
+
+        self.textview.connect("notify::wrap-mode", force_redraw)
+        return ChunkMap.do_realize(self)
+
     def get_height_scale(self):
         adjustments = [
             self.props.adjustment,

meld/conf.py.in

@@ -4,7 +4,7 @@ import sys
 from pathlib import Path
 
 __package__ = "meld"
-__version__ = "3.22.0"
+__version__ = "3.22.2"
 
 APPLICATION_NAME = 'Meld'
 APPLICATION_ID = 'org.gnome.Meld'
@@ -43,6 +43,7 @@ def frozen():
     global DATADIR, LOCALEDIR, DATADIR_IS_UNINSTALLED
 
     melddir = os.path.dirname(sys.executable)
+    os.add_dll_directory(os.path.join(melddir, "lib"))
 
     DATADIR = os.path.join(melddir, "share", "meld")
     LOCALEDIR = os.path.join(melddir, "share", "mo")

meld/diffgrid.py

@@ -278,9 +278,10 @@ def realize(self, widget):
                            Gdk.EventMask.ENTER_NOTIFY_MASK |
                            Gdk.EventMask.LEAVE_NOTIFY_MASK |
                            Gdk.EventMask.POINTER_MOTION_MASK)
-        attr.cursor = Gdk.Cursor.new_for_display(widget.get_display(),
-                                                 Gdk.CursorType.
-                                                 SB_H_DOUBLE_ARROW)
+        attr.cursor = Gdk.Cursor.new_from_name(
+            widget.get_display(),
+            "col-resize",
+        )
         attr_mask = (Gdk.WindowAttributesType.X |
                      Gdk.WindowAttributesType.Y |
                      Gdk.WindowAttributesType.CURSOR)

meld/dirdiff.py

@@ -1401,11 +1401,11 @@ def on_treeview_cursor_changed(self, view):
 
     @Gtk.Template.Callback()
     def on_treeview_popup_menu(self, treeview):
-        tree.TreeviewCommon.on_treeview_popup_menu(self, treeview)
+        return tree.TreeviewCommon.on_treeview_popup_menu(self, treeview)
 
     @Gtk.Template.Callback()
     def on_treeview_button_press_event(self, treeview, event):
-        tree.TreeviewCommon.on_treeview_button_press_event(
+        return tree.TreeviewCommon.on_treeview_button_press_event(
             self, treeview, event)
 
     @with_focused_pane

meld/filediff.py

@@ -740,6 +740,9 @@ def on_current_diff_changed(self, *args):
         self.set_action_enabled('previous-pane', pane > 0)
         self.set_action_enabled('next-pane', pane < self.num_panes - 1)
         self.set_action_enabled('swap-2-panes', self.num_panes == 2)
+
+        self.update_text_actions_sensitivity()
+
         # FIXME: don't queue_draw() on everything... just on what changed
         self.queue_draw()
 
@@ -1122,7 +1125,7 @@ def on_textview_drag_data_received(
     @Gtk.Template.Callback()
     def on_textview_focus_in_event(self, view, event):
         self.focus_pane = view
-        self.findbar.textview = view
+        self.findbar.set_text_view(self.focus_pane)
         self.on_cursor_position_changed(view.get_buffer(), None, True)
         self._set_save_action_sensitivity()
         self._set_merge_action_sensitivity()
@@ -2557,9 +2560,33 @@ def clear_sync_points(self, *args):
         self.refresh_comparison()
 
     def action_swap(self, *args):
-        buffer0 = self.textbuffer[0]
-        buffer1 = self.textbuffer[1]
-        self.set_files([buffer1.data.gfile, buffer0.data.gfile])
+        buffers = self.textbuffer[:self.num_panes]
+        gfiles = [buf.data.gfile for buf in buffers]
+
+        have_unnamed_files = any(gfile is None for gfile in gfiles)
+        have_modified_files = any(buf.get_modified() for buf in buffers)
+
+        if have_unnamed_files or have_modified_files:
+            misc.error_dialog(
+                primary=_("Can't swap unsaved files"),
+                secondary=_(
+                    "Files must be saved to disk before swapping panes."
+                )
+            )
+            return
+
+        if self.meta.get("tablabel", None):
+            misc.error_dialog(
+                primary=_("Can't swap version control comparisons"),
+                secondary=_(
+                    "Swapping panes is not supported in version control mode."
+                )
+            )
+            return
+
+        self.set_labels([self.filelabel[1].props.label,
+                        self.filelabel[0].props.label])
+        self.set_files([gfiles[1], gfiles[0]])
 
 
 FileDiff.set_css_name('meld-file-diff')