Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

mypaint-brushes2: Change old surfacemap inputs to gridmap (#25316)

Browse Source 
* mypaint-brushes2: Change old surfacemap inputs to gridmap

See: https://gitlab.gnome.org/GNOME/gimp/-/issues/14461

* Update PKGBUILD

---------

Co-authored-by: Christoph Reiter <reiter.christoph@gmail.com>
This commit is contained in:
Bruno 2025-08-30 10:55:49 -03:00 committed by GitHub
parent 58cfd5a0c0
commit 02162fe0e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 303 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

294
mingw-w64-mypaint-brushes2/0001-change-surfacemap-inputs.patch Normal file
View File

@ -0,0 +1,294 @@
From ff9d830d78fcec17d87d5259ecfaa254c2a27276 Mon Sep 17 00:00:00 2001
From: cmyk-student <118295169+cmyk-student@users.noreply.github.com>
Date: Sun, 13 Jul 2025 09:40:56 -0400
Subject: [PATCH] Brushes: Change surfacemap inputs to gridmap
brushsettings.json in libmypaint does not
have "surfacemap_x" or "surfacemap_y"
brush inputs, which causes a warning when
trying to load /Dieterle brushes in libmypaint.
"surfacemap" was an older name for these
inputs, which were ultimately renamed to
"gridmap" in libmypaint.
This patch renames them in mypaint-brushes
as well, so that they can load without
warnings.
---
brushes/Dieterle/Blender.myb | 4 ++--
brushes/Dieterle/Dissolver.myb | 4 ++--
brushes/Dieterle/Eraser.myb | 4 ++--
brushes/Dieterle/Fan#1.myb | 4 ++--
brushes/Dieterle/Flat2#1.myb | 4 ++--
brushes/Dieterle/Flight_Feathers.myb | 4 ++--
brushes/Dieterle/Posterizer.myb | 4 ++--
brushes/Dieterle/Round#1.myb | 4 ++--
brushes/Dieterle/Splash.myb | 4 ++--
brushes/Dieterle/Tail_Feathers.myb | 4 ++--
brushes/Dieterle/Tail_Feathers2.myb | 4 ++--
brushes/Dieterle/WateryFlatbrush.myb | 4 ++--
12 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/brushes/Dieterle/Blender.myb b/brushes/Dieterle/Blender.myb
index 138940c..996a742 100644
--- a/brushes/Dieterle/Blender.myb
+++ b/brushes/Dieterle/Blender.myb
@@ -669,7 +669,7 @@
0.0
]
],
- "surfacemap_x": [
+ "gridmap_x": [
[
0.0,
0.0
@@ -679,7 +679,7 @@
0.0
]
],
- "surfacemap_y": [
+ "gridmap_y": [
[
0.0,
0.0
diff --git a/brushes/Dieterle/Dissolver.myb b/brushes/Dieterle/Dissolver.myb
index 9514427..dfea759 100644
--- a/brushes/Dieterle/Dissolver.myb
+++ b/brushes/Dieterle/Dissolver.myb
@@ -665,7 +665,7 @@
0.0
]
],
- "surfacemap_x": [
+ "gridmap_x": [
[
0.0,
0.0
@@ -675,7 +675,7 @@
0.0
]
],
- "surfacemap_y": [
+ "gridmap_y": [
[
0.0,
0.0
diff --git a/brushes/Dieterle/Eraser.myb b/brushes/Dieterle/Eraser.myb
index 6fae185..d9b706f 100644
--- a/brushes/Dieterle/Eraser.myb
+++ b/brushes/Dieterle/Eraser.myb
@@ -665,7 +665,7 @@
0.0
]
],
- "surfacemap_x": [
+ "gridmap_x": [
[
0.0,
0.0
@@ -675,7 +675,7 @@
0.0
]
],
- "surfacemap_y": [
+ "gridmap_y": [
[
0.0,
0.0
diff --git a/brushes/Dieterle/Fan#1.myb b/brushes/Dieterle/Fan#1.myb
index 51c6427..1d1d0a3 100644
--- a/brushes/Dieterle/Fan#1.myb
+++ b/brushes/Dieterle/Fan#1.myb
@@ -822,7 +822,7 @@
0.0
]
],
- "surfacemap_x": [
+ "gridmap_x": [
[
0.0,
0.0
@@ -832,7 +832,7 @@
0.0
]
],
- "surfacemap_y": [
+ "gridmap_y": [
[
0.0,
0.0
diff --git a/brushes/Dieterle/Flat2#1.myb b/brushes/Dieterle/Flat2#1.myb
index 9979afd..b11ec18 100644
--- a/brushes/Dieterle/Flat2#1.myb
+++ b/brushes/Dieterle/Flat2#1.myb
@@ -646,7 +646,7 @@
0.0
]
],
- "surfacemap_x": [
+ "gridmap_x": [
[
0.0,
0.0
@@ -656,7 +656,7 @@
0.0
]
],
- "surfacemap_y": [
+ "gridmap_y": [
[
0.0,
0.0
diff --git a/brushes/Dieterle/Flight_Feathers.myb b/brushes/Dieterle/Flight_Feathers.myb
index 3ee7c33..c881b50 100644
--- a/brushes/Dieterle/Flight_Feathers.myb
+++ b/brushes/Dieterle/Flight_Feathers.myb
@@ -631,7 +631,7 @@
0.0
]
],
- "surfacemap_x": [
+ "gridmap_x": [
[
0.0,
0.0
@@ -641,7 +641,7 @@
0.0
]
],
- "surfacemap_y": [
+ "gridmap_y": [
[
0.0,
0.0
diff --git a/brushes/Dieterle/Posterizer.myb b/brushes/Dieterle/Posterizer.myb
index 6d702cb..a789ed7 100644
--- a/brushes/Dieterle/Posterizer.myb
+++ b/brushes/Dieterle/Posterizer.myb
@@ -691,7 +691,7 @@
0.0
]
],
- "surfacemap_x": [
+ "gridmap_x": [
[
0.0,
0.0
@@ -701,7 +701,7 @@
0.0
]
],
- "surfacemap_y": [
+ "gridmap_y": [
[
0.0,
0.0
diff --git a/brushes/Dieterle/Round#1.myb b/brushes/Dieterle/Round#1.myb
index 4b0840f..8b32d1a 100644
--- a/brushes/Dieterle/Round#1.myb
+++ b/brushes/Dieterle/Round#1.myb
@@ -787,7 +787,7 @@
0.0
]
],
- "surfacemap_x": [
+ "gridmap_x": [
[
0.0,
0.0
@@ -797,7 +797,7 @@
0.0
]
],
- "surfacemap_y": [
+ "gridmap_y": [
[
0.0,
0.0
diff --git a/brushes/Dieterle/Splash.myb b/brushes/Dieterle/Splash.myb
index eec09a0..3655e39 100644
--- a/brushes/Dieterle/Splash.myb
+++ b/brushes/Dieterle/Splash.myb
@@ -710,7 +710,7 @@
0.0
]
],
- "surfacemap_x": [
+ "gridmap_x": [
[
0.0,
0.0
@@ -720,7 +720,7 @@
0.0
]
],
- "surfacemap_y": [
+ "gridmap_y": [
[
0.0,
0.0
diff --git a/brushes/Dieterle/Tail_Feathers.myb b/brushes/Dieterle/Tail_Feathers.myb
index 1ecd6c7..a58b7d9 100644
--- a/brushes/Dieterle/Tail_Feathers.myb
+++ b/brushes/Dieterle/Tail_Feathers.myb
@@ -562,7 +562,7 @@
0.0
]
],
- "surfacemap_x": [
+ "gridmap_x": [
[
0.0,
0.0
@@ -572,7 +572,7 @@
0.0
]
],
- "surfacemap_y": [
+ "gridmap_y": [
[
0.0,
0.0
diff --git a/brushes/Dieterle/Tail_Feathers2.myb b/brushes/Dieterle/Tail_Feathers2.myb
index eb7c72a..d8c54ca 100644
--- a/brushes/Dieterle/Tail_Feathers2.myb
+++ b/brushes/Dieterle/Tail_Feathers2.myb
@@ -638,7 +638,7 @@
0.0
]
],
- "surfacemap_x": [
+ "gridmap_x": [
[
0.0,
0.0
@@ -648,7 +648,7 @@
0.0
]
],
- "surfacemap_y": [
+ "gridmap_y": [
[
0.0,
0.0
diff --git a/brushes/Dieterle/WateryFlatbrush.myb b/brushes/Dieterle/WateryFlatbrush.myb
index 61faafe..3cba89a 100644
--- a/brushes/Dieterle/WateryFlatbrush.myb
+++ b/brushes/Dieterle/WateryFlatbrush.myb
@@ -782,7 +782,7 @@
0.0
]
],
- "surfacemap_x": [
+ "gridmap_x": [
[
0.0,
0.0
@@ -792,7 +792,7 @@
0.0
]
],
- "surfacemap_y": [
+ "gridmap_y": [
[
0.0,
0.0

12
mingw-w64-mypaint-brushes2/PKGBUILD
View File

@ -4,7 +4,7 @@ _realname=mypaint-brushes
pkgbase=mingw-w64-${_realname}2
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}2"
pkgver=2.0.2
pkgrel=3
pkgrel=4
pkgdesc="Brushes for MyPaint 2.0 (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
@ -15,8 +15,10 @@ msys2_references=(
license=('spdx:ISC')
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-autotools")
source=(https://github.com/mypaint/mypaint-brushes/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz)
sha256sums=('01032550dd817bb0f8e85d83a632ed2e50bc16e0735630839e6c508f02f800ac')
source=("https://github.com/mypaint/mypaint-brushes/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
0001-change-surfacemap-inputs.patch)
sha256sums=('01032550dd817bb0f8e85d83a632ed2e50bc16e0735630839e6c508f02f800ac'
'b1fb7930edfee1b96e10d58e81c1c1046ab31bbf97ae747d87ddf4fdbf1cbaf0')
noextract=(${_realname}-${pkgver}.tar.gz)
prepare() {
@ -25,6 +27,10 @@ prepare() {
tar --exclude=README -xzf ${_realname}-${pkgver}.tar.gz
cd ${_realname}-${pkgver}
# https://gitlab.gnome.org/GNOME/gimp/-/issues/14461
patch -p1 -i "${srcdir}"/0001-change-surfacemap-inputs.patch
./autogen.sh
}