diff --git a/.ci_support/migrations/libthrift0150.yaml b/.ci_support/migrations/libthrift0150.yaml deleted file mode 100644 index ad7bd744..00000000 --- a/.ci_support/migrations/libthrift0150.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libthrift: -- 0.15.0 -migrator_ts: 1631491093.6389954 diff --git a/recipe/0001-cmake-Install-python-wrapper-exe-for-scripts-on-Wind.patch b/recipe/0001-cmake-Install-python-wrapper-exe-for-scripts-on-Wind.patch index 0c8a4909..f7f19841 100644 --- a/recipe/0001-cmake-Install-python-wrapper-exe-for-scripts-on-Wind.patch +++ b/recipe/0001-cmake-Install-python-wrapper-exe-for-scripts-on-Wind.patch @@ -58,5 +58,5 @@ index 8149cb5cb..c20360bd0 100644 OUTPUT ${pyexefile} DEPENDS ${pyfile} COMMAND ${PYTHON_EXECUTABLE} -c -- -2.30.2 +2.32.0 diff --git a/recipe/0002-cmake-Don-t-generate-.pyc-and-.pyo-files.patch b/recipe/0002-cmake-Don-t-generate-.pyc-and-.pyo-files.patch index fd44946c..67289089 100644 --- a/recipe/0002-cmake-Don-t-generate-.pyc-and-.pyo-files.patch +++ b/recipe/0002-cmake-Don-t-generate-.pyc-and-.pyo-files.patch @@ -45,5 +45,5 @@ index c20360bd0..ad0e41dd3 100644 endfunction(GR_PYTHON_INSTALL) -- -2.30.2 +2.32.0 diff --git a/recipe/0003-Use-an-ImageSurface-rather-than-UI-back-end.patch b/recipe/0003-Use-an-ImageSurface-rather-than-UI-back-end.patch index 49dd9460..9b5a2670 100644 --- a/recipe/0003-Use-an-ImageSurface-rather-than-UI-back-end.patch +++ b/recipe/0003-Use-an-ImageSurface-rather-than-UI-back-end.patch @@ -91,5 +91,5 @@ index 316ecbdd0..63d79f69b 100644 class DummyCoreConnection(object): -- -2.30.2 +2.32.0 diff --git a/recipe/0004-cmake-Pass-extra-arguments-to-GR_PYTHON_INSTALL-to-i.patch b/recipe/0004-cmake-Pass-extra-arguments-to-GR_PYTHON_INSTALL-to-i.patch index 140c5682..07a30473 100644 --- a/recipe/0004-cmake-Pass-extra-arguments-to-GR_PYTHON_INSTALL-to-i.patch +++ b/recipe/0004-cmake-Pass-extra-arguments-to-GR_PYTHON_INSTALL-to-i.patch @@ -41,5 +41,5 @@ index ad0e41dd3..1397aac7e 100644 endforeach(pyfile) -- -2.30.2 +2.32.0 diff --git a/recipe/0005-grc-Remove-global_blocks_path-preference-and-use-pre.patch b/recipe/0005-grc-Remove-global_blocks_path-preference-and-use-pre.patch index 8a2298b6..30409694 100644 --- a/recipe/0005-grc-Remove-global_blocks_path-preference-and-use-pre.patch +++ b/recipe/0005-grc-Remove-global_blocks_path-preference-and-use-pre.patch @@ -156,5 +156,5 @@ index ee354ba54..adc325cb9 100644 self.parser = configparser.ConfigParser() -- -2.30.2 +2.32.0 diff --git a/recipe/0006-cmake-Remove-absolute-paths-and-private-links-from-e.patch b/recipe/0006-cmake-Remove-absolute-paths-and-private-links-from-e.patch index d6067ed5..7a56ca2c 100644 --- a/recipe/0006-cmake-Remove-absolute-paths-and-private-links-from-e.patch +++ b/recipe/0006-cmake-Remove-absolute-paths-and-private-links-from-e.patch @@ -238,5 +238,5 @@ index 843eea36f..8ea2d0606 100644 # Setup doxygen option ######################################################################## -- -2.30.2 +2.32.0 diff --git a/recipe/0007-grc-Add-DPI-scale-factor-for-GRC-drawing-area-widget.patch b/recipe/0007-grc-Add-DPI-scale-factor-for-GRC-drawing-area-widget.patch new file mode 100644 index 00000000..48ec4cc0 --- /dev/null +++ b/recipe/0007-grc-Add-DPI-scale-factor-for-GRC-drawing-area-widget.patch @@ -0,0 +1,33 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ryan Volz +Date: Wed, 22 Sep 2021 16:23:43 -0400 +Subject: [PATCH] grc: Add DPI scale factor for GRC drawing area widget. + +This fixes scaling graphical glitches (e.g. drawing area occupies 1/4 of +the window) and crashes on high DPI displays. + +Signed-off-by: Ryan Volz +--- + grc/gui/DrawingArea.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/grc/gui/DrawingArea.py b/grc/gui/DrawingArea.py +index 637a3e3e6..a5cc32b3d 100644 +--- a/grc/gui/DrawingArea.py ++++ b/grc/gui/DrawingArea.py +@@ -154,7 +154,11 @@ class DrawingArea(Gtk.DrawingArea): + + def _update_size(self): + w, h = self._flow_graph.get_extents()[2:] +- self.set_size_request(w * self.zoom_factor + 100, h * self.zoom_factor + 100) ++ scale_factor = self.get_scale_factor() ++ self.set_size_request( ++ w * scale_factor * self.zoom_factor + 100, ++ h * scale_factor * self.zoom_factor + 100, ++ ) + + def _auto_scroll(self, event): + x, y = event.x, event.y +-- +2.32.0 + diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 07e2055c..c5950685 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,9 +14,10 @@ source: - 0004-cmake-Pass-extra-arguments-to-GR_PYTHON_INSTALL-to-i.patch - 0005-grc-Remove-global_blocks_path-preference-and-use-pre.patch - 0006-cmake-Remove-absolute-paths-and-private-links-from-e.patch + - 0007-grc-Add-DPI-scale-factor-for-GRC-drawing-area-widget.patch build: - number: 5 + number: 6 requirements: build: