aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2020-11-19 23:59:20 +0100
committerMarius Bakke <marius@gnu.org>2020-11-20 00:10:11 +0100
commit02b4b10568c248d03268be550146d14d8e19c217 (patch)
treea937fa0552179fd693d5358bf797e3d2440e3b04
parentae52ff1b507d7880d32c15c56e91f1837a328b5c (diff)
downloadguix-02b4b10568c248d03268be550146d14d8e19c217.tar
guix-02b4b10568c248d03268be550146d14d8e19c217.tar.gz
gnu: grim: Remove obsolete patch.
* gnu/packages/patches/grim-revert-output-rotation.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/image.scm (grim)[source](patches): Remove.
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/image.scm3
-rw-r--r--gnu/packages/patches/grim-revert-output-rotation.patch27
3 files changed, 1 insertions, 30 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index cf85fa737e..42a0e09e47 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1105,7 +1105,6 @@ dist_patch_DATA = \
%D%/packages/patches/gpsbabel-qstring.patch \
%D%/packages/patches/grantlee-merge-theme-dirs.patch \
%D%/packages/patches/grep-timing-sensitive-test.patch \
- %D%/packages/patches/grim-revert-output-rotation.patch \
%D%/packages/patches/grocsvs-dont-use-admiral.patch \
%D%/packages/patches/gromacs-tinyxml2.patch \
%D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 5044a527ce..2027441bf5 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -1913,8 +1913,7 @@ identical visual appearance.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0fjmjq0ws9rlblkcqxxw2lv7zvvyi618jqzlnz5z9zb477jwdfib"))
- (patches (search-patches "grim-revert-output-rotation.patch"))))
+ (base32 "0fjmjq0ws9rlblkcqxxw2lv7zvvyi618jqzlnz5z9zb477jwdfib"))))
(build-system meson-build-system)
(native-inputs `(("pkg-config" ,pkg-config)
("scdoc" ,scdoc)))
diff --git a/gnu/packages/patches/grim-revert-output-rotation.patch b/gnu/packages/patches/grim-revert-output-rotation.patch
deleted file mode 100644
index cbf0a86502..0000000000
--- a/gnu/packages/patches/grim-revert-output-rotation.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 80b17ceaff90b81b28b44004d2aca4cc40f365be Mon Sep 17 00:00:00 2001
-From: Tobias Geerinckx-Rice <me@tobias.gr>
-Date: Fri, 2 Oct 2020 00:07:30 +0200
-Subject: [PATCH] Revert "Correct interpretation of output rotation"
-
-This reverts commit 8f9d60885ce2f9bd66cd93d3378dcb6866d4588a.
-It is incompatible with the current Sway version (1.4) in Guix.
----
- render.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/render.c b/render.c
-index 8f31e7e..a6b0b12 100644
---- a/render.c
-+++ b/render.c
-@@ -104,7 +104,7 @@ cairo_surface_t *render(struct grim_state *state, struct grim_box *geometry,
- cairo_matrix_translate(&matrix,
- (double)output->geometry.width / 2,
- (double)output->geometry.height / 2);
-- cairo_matrix_rotate(&matrix, get_output_rotation(output->transform));
-+ cairo_matrix_rotate(&matrix, -get_output_rotation(output->transform));
- cairo_matrix_scale(&matrix,
- (double)raw_output_width / output_width * output_flipped_x,
- (double)raw_output_height / output_height * output_flipped_y);
---
-2.28.0
-