From 3560f7bf0dc4992d87f1c6540894526ff634180e Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 28 May 2025 01:47:06 -0400 Subject: [PATCH] Fix button images in toolmanager This was reported upstream in https://github.com/matplotlib/matplotlib/issues/30116. --- 0001-matplotlibrc-path-search-fix.patch | 82 ++++++++++++++++++- ...sion-to-2.13.1-and-update-tolerances.patch | 2 +- ...Unpin-meson-python-build-requirement.patch | 2 +- ...windows-implementation-on-32-bit-x86.patch | 2 +- ...-TST-Fix-minor-issues-in-interactive.patch | 2 +- 5 files changed, 83 insertions(+), 7 deletions(-) diff --git a/0001-matplotlibrc-path-search-fix.patch b/0001-matplotlibrc-path-search-fix.patch index 41137d0..ed66ee1 100644 --- a/0001-matplotlibrc-path-search-fix.patch +++ b/0001-matplotlibrc-path-search-fix.patch @@ -1,12 +1,13 @@ -From 37007fd04ff67cf7c766aa6cd4fa9e564841cb17 Mon Sep 17 00:00:00 2001 +From 328ead1baac601b50f5c6af943ab67d8e189b12b Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 27 Sep 2017 19:35:59 -0400 Subject: [PATCH 1/5] matplotlibrc path search fix Signed-off-by: Elliott Sales de Andrade --- - lib/matplotlib/__init__.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) + lib/matplotlib/__init__.py | 5 ++++- + lib/matplotlib/backend_tools.py | 16 ++++++++-------- + 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py index 5f964e0b34..f82d92466a 100644 @@ -38,6 +39,81 @@ index 5f964e0b34..f82d92466a 100644 yield os.path.join(get_data_path(), 'matplotlibrc') for fname in gen_candidates(): +diff --git a/lib/matplotlib/backend_tools.py b/lib/matplotlib/backend_tools.py +index 87ed794022..9d80539114 100644 +--- a/lib/matplotlib/backend_tools.py ++++ b/lib/matplotlib/backend_tools.py +@@ -596,7 +596,7 @@ class ToolHome(ViewsPositionsBase): + """Restore the original view limits.""" + + description = 'Reset original view' +- image = 'mpl-data/images/home' ++ image = '/usr/share/matplotlib/mpl-data/images/home' + default_keymap = property(lambda self: mpl.rcParams['keymap.home']) + _on_trigger = 'home' + +@@ -605,7 +605,7 @@ class ToolBack(ViewsPositionsBase): + """Move back up the view limits stack.""" + + description = 'Back to previous view' +- image = 'mpl-data/images/back' ++ image = '/usr/share/matplotlib/mpl-data/images/back' + default_keymap = property(lambda self: mpl.rcParams['keymap.back']) + _on_trigger = 'back' + +@@ -614,7 +614,7 @@ class ToolForward(ViewsPositionsBase): + """Move forward in the view lim stack.""" + + description = 'Forward to next view' +- image = 'mpl-data/images/forward' ++ image = '/usr/share/matplotlib/mpl-data/images/forward' + default_keymap = property(lambda self: mpl.rcParams['keymap.forward']) + _on_trigger = 'forward' + +@@ -623,14 +623,14 @@ class ConfigureSubplotsBase(ToolBase): + """Base tool for the configuration of subplots.""" + + description = 'Configure subplots' +- image = 'mpl-data/images/subplots' ++ image = '/usr/share/matplotlib/mpl-data/images/subplots' + + + class SaveFigureBase(ToolBase): + """Base tool for figure saving.""" + + description = 'Save the figure' +- image = 'mpl-data/images/filesave' ++ image = '/usr/share/matplotlib/mpl-data/images/filesave' + default_keymap = property(lambda self: mpl.rcParams['keymap.save']) + + +@@ -705,7 +705,7 @@ class ToolZoom(ZoomPanBase): + """A Tool for zooming using a rectangle selector.""" + + description = 'Zoom to rectangle' +- image = 'mpl-data/images/zoom_to_rect' ++ image = '/usr/share/matplotlib/mpl-data/images/zoom_to_rect' + default_keymap = property(lambda self: mpl.rcParams['keymap.zoom']) + cursor = cursors.SELECT_REGION + radio_group = 'default' +@@ -827,7 +827,7 @@ class ToolPan(ZoomPanBase): + + default_keymap = property(lambda self: mpl.rcParams['keymap.pan']) + description = 'Pan axes with left mouse, zoom with right' +- image = 'mpl-data/images/move' ++ image = '/usr/share/matplotlib/mpl-data/images/move' + cursor = cursors.MOVE + radio_group = 'default' + +@@ -891,7 +891,7 @@ class ToolPan(ZoomPanBase): + class ToolHelpBase(ToolBase): + description = 'Print tool list, shortcuts and description' + default_keymap = property(lambda self: mpl.rcParams['keymap.help']) +- image = 'mpl-data/images/help' ++ image = '/usr/share/matplotlib/mpl-data/images/help' + + @staticmethod + def format_shortcut(key_sequence): -- 2.49.0 diff --git a/0002-Set-FreeType-version-to-2.13.1-and-update-tolerances.patch b/0002-Set-FreeType-version-to-2.13.1-and-update-tolerances.patch index d6fb22c..a2cdb95 100644 --- a/0002-Set-FreeType-version-to-2.13.1-and-update-tolerances.patch +++ b/0002-Set-FreeType-version-to-2.13.1-and-update-tolerances.patch @@ -1,4 +1,4 @@ -From 944d5021f46735045a69af1e57ff0bb0c43e7fbb Mon Sep 17 00:00:00 2001 +From f7d501f5218fa12b798565444858a863d3e961fe Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 14 Feb 2020 06:05:42 -0500 Subject: [PATCH 2/5] Set FreeType version to 2.13.1 and update tolerances diff --git a/0003-Unpin-meson-python-build-requirement.patch b/0003-Unpin-meson-python-build-requirement.patch index 00aea30..a9f11b4 100644 --- a/0003-Unpin-meson-python-build-requirement.patch +++ b/0003-Unpin-meson-python-build-requirement.patch @@ -1,4 +1,4 @@ -From 814405dd99896a362bdd18b42e591d6594e59dcf Mon Sep 17 00:00:00 2001 +From 8c289927fca2e3548598978652d0e106362c5ded Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 13 Dec 2024 02:03:33 -0500 Subject: [PATCH 3/5] Unpin meson-python build requirement diff --git a/0004-Use-old-stride_windows-implementation-on-32-bit-x86.patch b/0004-Use-old-stride_windows-implementation-on-32-bit-x86.patch index 6d8f420..bffc695 100644 --- a/0004-Use-old-stride_windows-implementation-on-32-bit-x86.patch +++ b/0004-Use-old-stride_windows-implementation-on-32-bit-x86.patch @@ -1,4 +1,4 @@ -From 97f398b19278f450ffdcecf8443489ec981321a4 Mon Sep 17 00:00:00 2001 +From 6b54c0931a086eeb3a215fde5246d5b533deda16 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 22 Aug 2022 18:43:28 -0400 Subject: [PATCH 4/5] Use old stride_windows implementation on 32-bit x86 diff --git a/0005-Partially-revert-TST-Fix-minor-issues-in-interactive.patch b/0005-Partially-revert-TST-Fix-minor-issues-in-interactive.patch index 08756e6..3b75623 100644 --- a/0005-Partially-revert-TST-Fix-minor-issues-in-interactive.patch +++ b/0005-Partially-revert-TST-Fix-minor-issues-in-interactive.patch @@ -1,4 +1,4 @@ -From 236b1b8164088b2b9ac85b5d83e9d6cf41269935 Mon Sep 17 00:00:00 2001 +From 73d86611157319b87fa9b30c696ea9c48a3580c7 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 12 Nov 2024 01:05:25 -0500 Subject: [PATCH 5/5] Partially revert "TST: Fix minor issues in interactive