all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
blob 15603cd9ad5f220d3024a0861418595bfc2d99d5 2196 bytes (raw)
name: gnu/packages/patches/gegl-mrg.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
 
From 1cc5a08d7860fa9cbd22a469e2d270533e689f23 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 21 Jul 2020 02:57:39 -0400
Subject: [PATCH] Fix build with mrg.

---
 bin/argvs.c         | 4 ++--
 bin/mrg-gegl.c      | 2 +-
 bin/ui-collection.c | 4 ++--
 bin/ui-core.c       | 4 ++--
 bin/ui-viewer.c     | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bin/argvs.c b/bin/argvs.c
index 254b754a0..300370d5c 100644
--- a/bin/argvs.c
+++ b/bin/argvs.c
@@ -25,8 +25,8 @@
 
 
 #ifdef MRG_PRINTF
-#include <mrg.h>
-#include <mrg-string.h>
+#include <mrg/mrg.h>
+#include <mrg/mrg-string.h>
 extern Mrg *mrg;
 extern MrgList *scrollback;
 extern int use_ui;
diff --git a/bin/mrg-gegl.c b/bin/mrg-gegl.c
index dd0e55686..ffdbb5ee8 100644
--- a/bin/mrg-gegl.c
+++ b/bin/mrg-gegl.c
@@ -36,7 +36,7 @@
 #include <unistd.h>
 #include <dirent.h>
 #include <math.h>
-#include <mrg.h>
+#include <mrg/mrg.h>
 #include <gegl.h>
 #include <gexiv2/gexiv2.h>
 #include <gegl-paramspecs.h>
diff --git a/bin/ui-collection.c b/bin/ui-collection.c
index 671d2dc1f..eee0b0925 100644
--- a/bin/ui-collection.c
+++ b/bin/ui-collection.c
@@ -25,8 +25,8 @@
 #include <unistd.h>
 #include <dirent.h>
 #include <math.h>
-#include <mrg.h>
-#include <mrg-string.h>
+#include <mrg/mrg.h>
+#include <mrg/mrg-string.h>
 #include <gegl.h>
 #include <gexiv2/gexiv2.h>
 #include <gegl-paramspecs.h>
diff --git a/bin/ui-core.c b/bin/ui-core.c
index 16dec03af..6350b4cba 100644
--- a/bin/ui-core.c
+++ b/bin/ui-core.c
@@ -107,8 +107,8 @@ const char *css =
 #include <unistd.h>
 #include <dirent.h>
 #include <math.h>
-#include <mrg.h>
-#include <mrg-string.h>
+#include <mrg/mrg.h>
+#include <mrg/mrg-string.h>
 #include <gegl.h>
 #include <gexiv2/gexiv2.h>
 #include <gegl-paramspecs.h>
diff --git a/bin/ui-viewer.c b/bin/ui-viewer.c
index 4a70a4518..9468a246b 100644
--- a/bin/ui-viewer.c
+++ b/bin/ui-viewer.c
@@ -24,8 +24,8 @@
 #include <unistd.h>
 #include <dirent.h>
 #include <math.h>
-#include <mrg.h>
-#include <mrg-string.h>
+#include <mrg/mrg.h>
+#include <mrg/mrg-string.h>
 #include <gegl.h>
 #include <gexiv2/gexiv2.h>
 #include <gegl-paramspecs.h>
-- 
GitLab


debug log:

solving 15603cd9ad ...
found 15603cd9ad in https://yhetil.org/guix/6c92eb83-361b-7eb3-fd63-8b582b9b41db@disroot.org/

applying [1/1] https://yhetil.org/guix/6c92eb83-361b-7eb3-fd63-8b582b9b41db@disroot.org/
diff --git a/gnu/packages/patches/gegl-mrg.patch b/gnu/packages/patches/gegl-mrg.patch
new file mode 100644
index 0000000000..15603cd9ad

1:25: trailing whitespace.
 
1:26: trailing whitespace.
 
1:93: trailing whitespace.
-- 
Checking patch gnu/packages/patches/gegl-mrg.patch...
1:95: new blank line at EOF.
+
Applied patch gnu/packages/patches/gegl-mrg.patch cleanly.
warning: 4 lines add whitespace errors.

index at:
100644 15603cd9ad5f220d3024a0861418595bfc2d99d5	gnu/packages/patches/gegl-mrg.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.