Skip to content

Commit 2f6b759

Browse files
brunvonlopebrunvonlope
committed
Issue #14461: build/linux: Patch mypaint-brushes module with 'gridmap'
Alex's patch from mypaint/mypaint-brushes#7 Since mypaint project is long time gone, we need to patch ourserves.
1 parent 8834989 commit 2f6b759

File tree

2 files changed

+301
-0
lines changed

2 files changed

+301
-0
lines changed

‎build/linux/flatpak/org.gimp.GIMP-nightly.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,13 @@
448448
"stable-only": true,
449449
"url-template": "https://github.com/mypaint/mypaint-brushes/releases/download/v$version/mypaint-brushes-$version.tar.xz"
450450
}
451+
},
452+
{
453+
"//": "https://gitlab.gnome.org/GNOME/gimp/-/issues/14461",
454+
"type": "patch",
455+
"paths": [
456+
"patches/0001-change-surfacemap-inputs.patch"
457+
]
451458
}
452459
]
453460
},

‎build/linux/flatpak/patches/0001-change-surfacemap-inputs.patch‎

Lines changed: 294 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,294 @@
1+
From ff9d830d78fcec17d87d5259ecfaa254c2a27276 Mon Sep 17 00:00:00 2001
2+
From: cmyk-student <[email protected]>
3+
Date: Sun, 13 Jul 2025 09:40:56 -0400
4+
Subject: [PATCH] Brushes: Change surfacemap inputs to gridmap
5+
6+
brushsettings.json in libmypaint does not
7+
have "surfacemap_x" or "surfacemap_y"
8+
brush inputs, which causes a warning when
9+
trying to load /Dieterle brushes in libmypaint.
10+
"surfacemap" was an older name for these
11+
inputs, which were ultimately renamed to
12+
"gridmap" in libmypaint.
13+
This patch renames them in mypaint-brushes
14+
as well, so that they can load without
15+
warnings.
16+
---
17+
brushes/Dieterle/Blender.myb | 4 ++--
18+
brushes/Dieterle/Dissolver.myb | 4 ++--
19+
brushes/Dieterle/Eraser.myb | 4 ++--
20+
brushes/Dieterle/Fan#1.myb | 4 ++--
21+
brushes/Dieterle/Flat2#1.myb | 4 ++--
22+
brushes/Dieterle/Flight_Feathers.myb | 4 ++--
23+
brushes/Dieterle/Posterizer.myb | 4 ++--
24+
brushes/Dieterle/Round#1.myb | 4 ++--
25+
brushes/Dieterle/Splash.myb | 4 ++--
26+
brushes/Dieterle/Tail_Feathers.myb | 4 ++--
27+
brushes/Dieterle/Tail_Feathers2.myb | 4 ++--
28+
brushes/Dieterle/WateryFlatbrush.myb | 4 ++--
29+
12 files changed, 24 insertions(+), 24 deletions(-)
30+
31+
diff --git a/brushes/Dieterle/Blender.myb b/brushes/Dieterle/Blender.myb
32+
index 138940c..996a742 100644
33+
--- a/brushes/Dieterle/Blender.myb
34+
+++ b/brushes/Dieterle/Blender.myb
35+
@@ -669,7 +669,7 @@
36+
0.0
37+
]
38+
],
39+
- "surfacemap_x": [
40+
+ "gridmap_x": [
41+
[
42+
0.0,
43+
0.0
44+
@@ -679,7 +679,7 @@
45+
0.0
46+
]
47+
],
48+
- "surfacemap_y": [
49+
+ "gridmap_y": [
50+
[
51+
0.0,
52+
0.0
53+
diff --git a/brushes/Dieterle/Dissolver.myb b/brushes/Dieterle/Dissolver.myb
54+
index 9514427..dfea759 100644
55+
--- a/brushes/Dieterle/Dissolver.myb
56+
+++ b/brushes/Dieterle/Dissolver.myb
57+
@@ -665,7 +665,7 @@
58+
0.0
59+
]
60+
],
61+
- "surfacemap_x": [
62+
+ "gridmap_x": [
63+
[
64+
0.0,
65+
0.0
66+
@@ -675,7 +675,7 @@
67+
0.0
68+
]
69+
],
70+
- "surfacemap_y": [
71+
+ "gridmap_y": [
72+
[
73+
0.0,
74+
0.0
75+
diff --git a/brushes/Dieterle/Eraser.myb b/brushes/Dieterle/Eraser.myb
76+
index 6fae185..d9b706f 100644
77+
--- a/brushes/Dieterle/Eraser.myb
78+
+++ b/brushes/Dieterle/Eraser.myb
79+
@@ -665,7 +665,7 @@
80+
0.0
81+
]
82+
],
83+
- "surfacemap_x": [
84+
+ "gridmap_x": [
85+
[
86+
0.0,
87+
0.0
88+
@@ -675,7 +675,7 @@
89+
0.0
90+
]
91+
],
92+
- "surfacemap_y": [
93+
+ "gridmap_y": [
94+
[
95+
0.0,
96+
0.0
97+
diff --git a/brushes/Dieterle/Fan#1.myb b/brushes/Dieterle/Fan#1.myb
98+
index 51c6427..1d1d0a3 100644
99+
--- a/brushes/Dieterle/Fan#1.myb
100+
+++ b/brushes/Dieterle/Fan#1.myb
101+
@@ -822,7 +822,7 @@
102+
0.0
103+
]
104+
],
105+
- "surfacemap_x": [
106+
+ "gridmap_x": [
107+
[
108+
0.0,
109+
0.0
110+
@@ -832,7 +832,7 @@
111+
0.0
112+
]
113+
],
114+
- "surfacemap_y": [
115+
+ "gridmap_y": [
116+
[
117+
0.0,
118+
0.0
119+
diff --git a/brushes/Dieterle/Flat2#1.myb b/brushes/Dieterle/Flat2#1.myb
120+
index 9979afd..b11ec18 100644
121+
--- a/brushes/Dieterle/Flat2#1.myb
122+
+++ b/brushes/Dieterle/Flat2#1.myb
123+
@@ -646,7 +646,7 @@
124+
0.0
125+
]
126+
],
127+
- "surfacemap_x": [
128+
+ "gridmap_x": [
129+
[
130+
0.0,
131+
0.0
132+
@@ -656,7 +656,7 @@
133+
0.0
134+
]
135+
],
136+
- "surfacemap_y": [
137+
+ "gridmap_y": [
138+
[
139+
0.0,
140+
0.0
141+
diff --git a/brushes/Dieterle/Flight_Feathers.myb b/brushes/Dieterle/Flight_Feathers.myb
142+
index 3ee7c33..c881b50 100644
143+
--- a/brushes/Dieterle/Flight_Feathers.myb
144+
+++ b/brushes/Dieterle/Flight_Feathers.myb
145+
@@ -631,7 +631,7 @@
146+
0.0
147+
]
148+
],
149+
- "surfacemap_x": [
150+
+ "gridmap_x": [
151+
[
152+
0.0,
153+
0.0
154+
@@ -641,7 +641,7 @@
155+
0.0
156+
]
157+
],
158+
- "surfacemap_y": [
159+
+ "gridmap_y": [
160+
[
161+
0.0,
162+
0.0
163+
diff --git a/brushes/Dieterle/Posterizer.myb b/brushes/Dieterle/Posterizer.myb
164+
index 6d702cb..a789ed7 100644
165+
--- a/brushes/Dieterle/Posterizer.myb
166+
+++ b/brushes/Dieterle/Posterizer.myb
167+
@@ -691,7 +691,7 @@
168+
0.0
169+
]
170+
],
171+
- "surfacemap_x": [
172+
+ "gridmap_x": [
173+
[
174+
0.0,
175+
0.0
176+
@@ -701,7 +701,7 @@
177+
0.0
178+
]
179+
],
180+
- "surfacemap_y": [
181+
+ "gridmap_y": [
182+
[
183+
0.0,
184+
0.0
185+
diff --git a/brushes/Dieterle/Round#1.myb b/brushes/Dieterle/Round#1.myb
186+
index 4b0840f..8b32d1a 100644
187+
--- a/brushes/Dieterle/Round#1.myb
188+
+++ b/brushes/Dieterle/Round#1.myb
189+
@@ -787,7 +787,7 @@
190+
0.0
191+
]
192+
],
193+
- "surfacemap_x": [
194+
+ "gridmap_x": [
195+
[
196+
0.0,
197+
0.0
198+
@@ -797,7 +797,7 @@
199+
0.0
200+
]
201+
],
202+
- "surfacemap_y": [
203+
+ "gridmap_y": [
204+
[
205+
0.0,
206+
0.0
207+
diff --git a/brushes/Dieterle/Splash.myb b/brushes/Dieterle/Splash.myb
208+
index eec09a0..3655e39 100644
209+
--- a/brushes/Dieterle/Splash.myb
210+
+++ b/brushes/Dieterle/Splash.myb
211+
@@ -710,7 +710,7 @@
212+
0.0
213+
]
214+
],
215+
- "surfacemap_x": [
216+
+ "gridmap_x": [
217+
[
218+
0.0,
219+
0.0
220+
@@ -720,7 +720,7 @@
221+
0.0
222+
]
223+
],
224+
- "surfacemap_y": [
225+
+ "gridmap_y": [
226+
[
227+
0.0,
228+
0.0
229+
diff --git a/brushes/Dieterle/Tail_Feathers.myb b/brushes/Dieterle/Tail_Feathers.myb
230+
index 1ecd6c7..a58b7d9 100644
231+
--- a/brushes/Dieterle/Tail_Feathers.myb
232+
+++ b/brushes/Dieterle/Tail_Feathers.myb
233+
@@ -562,7 +562,7 @@
234+
0.0
235+
]
236+
],
237+
- "surfacemap_x": [
238+
+ "gridmap_x": [
239+
[
240+
0.0,
241+
0.0
242+
@@ -572,7 +572,7 @@
243+
0.0
244+
]
245+
],
246+
- "surfacemap_y": [
247+
+ "gridmap_y": [
248+
[
249+
0.0,
250+
0.0
251+
diff --git a/brushes/Dieterle/Tail_Feathers2.myb b/brushes/Dieterle/Tail_Feathers2.myb
252+
index eb7c72a..d8c54ca 100644
253+
--- a/brushes/Dieterle/Tail_Feathers2.myb
254+
+++ b/brushes/Dieterle/Tail_Feathers2.myb
255+
@@ -638,7 +638,7 @@
256+
0.0
257+
]
258+
],
259+
- "surfacemap_x": [
260+
+ "gridmap_x": [
261+
[
262+
0.0,
263+
0.0
264+
@@ -648,7 +648,7 @@
265+
0.0
266+
]
267+
],
268+
- "surfacemap_y": [
269+
+ "gridmap_y": [
270+
[
271+
0.0,
272+
0.0
273+
diff --git a/brushes/Dieterle/WateryFlatbrush.myb b/brushes/Dieterle/WateryFlatbrush.myb
274+
index 61faafe..3cba89a 100644
275+
--- a/brushes/Dieterle/WateryFlatbrush.myb
276+
+++ b/brushes/Dieterle/WateryFlatbrush.myb
277+
@@ -782,7 +782,7 @@
278+
0.0
279+
]
280+
],
281+
- "surfacemap_x": [
282+
+ "gridmap_x": [
283+
[
284+
0.0,
285+
0.0
286+
@@ -792,7 +792,7 @@
287+
0.0
288+
]
289+
],
290+
- "surfacemap_y": [
291+
+ "gridmap_y": [
292+
[
293+
0.0,
294+
0.0

0 commit comments

Comments
 (0)