Replace ImageMagick with GraphicsMagick

QubesOS/qubes-issues#5009
QubesOS · Nov 30, 2022 · 66ae1d6 · 66ae1d6
1 parent 93f269e
commit 66ae1d6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/qubes/tests/integ/mime.py b/qubes/tests/integ/mime.py
@@ -185,7 +185,7 @@ def prepare_txt(self, filename):
 
     def prepare_pdf(self, filename):
         self.prepare_txt("/tmp/source.txt")
-        cmd = "convert text:/tmp/source.txt {}".format(filename)
+        cmd = "gm convert text:/tmp/source.txt {}".format(filename)
         try:
             self.loop.run_until_complete(
                 self.source_vm.run_for_stdio(cmd))
@@ -218,25 +218,25 @@ def prepare_pptx(self, filename):
 
     def prepare_png(self, filename):
         self.prepare_txt("/tmp/source.txt")
-        cmd = "convert text:/tmp/source.txt {}".format(filename)
+        cmd = "gm convert text:/tmp/source.txt {}".format(filename)
         try:
             self.loop.run_until_complete(
                 self.source_vm.run_for_stdio(cmd))
         except subprocess.CalledProcessError as e:
             if e.returncode == 127:
-                self.skipTest("convert not installed".format(cmd))
+                self.skipTest("GraphicsMagick not installed".format(cmd))
             self.skipTest("Failed to run '{}': {}".format(cmd,
                 e.stderr.decode()))
 
     def prepare_jpg(self, filename):
         self.prepare_txt("/tmp/source.txt")
-        cmd = "convert text:/tmp/source.txt {}".format(filename)
+        cmd = "gm convert text:/tmp/source.txt {}".format(filename)
         try:
             self.loop.run_until_complete(
                 self.source_vm.run_for_stdio(cmd))
         except subprocess.CalledProcessError as e:
             if e.returncode == 127:
-                self.skipTest("convert not installed".format(cmd))
+                self.skipTest("GraphicsMagick not installed".format(cmd))
             self.skipTest("Failed to run '{}': {}".format(cmd,
                 e.stderr.decode()))
 

diff --git a/qubes/tests/integ/vm_qrexec_gui.py b/qubes/tests/integ/vm_qrexec_gui.py
@@ -809,10 +809,10 @@ async def _test_300_bug_1028_gui_memory_pinning(self):
         # choose pnm format, as it doesn't have any useless metadata - easy
         # to compare
         vm_image, _ = await self.testvm1.run_for_stdio(
-            'import -window {} rgba:-'.format(vm_winid))
+            'gm import -window {} rgba:-'.format(vm_winid))
 
         dom0_image = await asyncio.get_event_loop().run_in_executor(None,
-            subprocess.check_output, ['import', '-window', winid, 'rgba:-'])
+            subprocess.check_output, ['gm', 'import', '-window', winid, 'rgba:-'])
 
         if vm_image != dom0_image:
             self.fail("Dom0 window doesn't match VM window content")

diff --git a/rpm_spec/core-dom0.spec.in b/rpm_spec/core-dom0.spec.in
@@ -43,7 +43,7 @@ AutoReq:	no
 
 BuildArch: noarch
 
-BuildRequires:  ImageMagick
+BuildRequires:  GraphicsMagick
 BuildRequires:	systemd-units
 BuildRequires:  systemd
 BuildRequires:  python3-devel