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

Merge pull request #14161 from lazka/gimp-2.99.14

Browse Source 
gimp3: Update to 2.99.14
This commit is contained in:
Christoph Reiter
2022-11-20 07:16:07 +01:00
committed by GitHub
parent ae66afa27d 68c7446d14
commit af9426258c
3 changed files with 340 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mingw-w64-gimp3/0003-meson-tarball-version-fix.patch
View File

@@ -1,13 +0,0 @@
diff -bur gimp-2.99.12-c/plug-ins/common/meson.build gimp-2.99.12/plug-ins/common/meson.build
--- gimp-2.99.12-c/plug-ins/common/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/common/meson.build 2022-08-26 00:56:14.353052600 -0600
@@ -184,8 +184,7 @@
],
include_directories: [
rootInclude, appInclude,
- ],
- depends: [ gitversion_h ],
+ ]
)
endif

657
mingw-w64-gimp3/0004-clang-windres.patch
View File

@@ -7,10 +7,10 @@ diff -bur gimp-2.99.12-c/app/meson.build gimp-2.99.12/app/meson.build
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(console_rc_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(console_rc_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(console_rc_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(console_rc_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
@@ -20,10 +20,10 @@ diff -bur gimp-2.99.12-c/app/meson.build gimp-2.99.12/app/meson.build
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(gui_rc_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(gui_rc_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(gui_rc_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(gui_rc_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
@@ -36,10 +36,10 @@ diff -bur gimp-2.99.12-c/extensions/goat-exercises/meson.build gimp-2.99.12/exte
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plug_in_name + '-c.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plug_in_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plug_in_name + '-c.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plug_in_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
@@ -52,10 +52,10 @@ diff -bur gimp-2.99.12-c/plug-ins/common/meson.build gimp-2.99.12/plug-ins/commo
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
@@ -68,10 +68,10 @@ diff -bur gimp-2.99.12-c/plug-ins/file-bmp/meson.build gimp-2.99.12/plug-ins/fil
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
@@ -84,10 +84,10 @@ diff -bur gimp-2.99.12-c/plug-ins/file-dds/meson.build gimp-2.99.12/plug-ins/fil
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
@@ -100,10 +100,10 @@ diff -bur gimp-2.99.12-c/plug-ins/file-exr/meson.build gimp-2.99.12/plug-ins/fil
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
@@ -116,10 +116,10 @@ diff -bur gimp-2.99.12-c/plug-ins/file-faxg3/meson.build gimp-2.99.12/plug-ins/f
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
@@ -132,10 +132,10 @@ diff -bur gimp-2.99.12-c/plug-ins/file-fits/meson.build gimp-2.99.12/plug-ins/fi
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
@@ -148,10 +148,10 @@ diff -bur gimp-2.99.12-c/plug-ins/file-fli/meson.build gimp-2.99.12/plug-ins/fil
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
@@ -164,10 +164,10 @@ diff -bur gimp-2.99.12-c/plug-ins/file-ico/meson.build gimp-2.99.12/plug-ins/fil
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
@@ -180,10 +180,10 @@ diff -bur gimp-2.99.12-c/plug-ins/file-jpeg/meson.build gimp-2.99.12/plug-ins/fi
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
@@ -196,10 +196,10 @@ diff -bur gimp-2.99.12-c/plug-ins/file-psd/meson.build gimp-2.99.12/plug-ins/fil
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
@@ -212,10 +212,10 @@ diff -bur gimp-2.99.12-c/plug-ins/file-raw/meson.build gimp-2.99.12/plug-ins/fil
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
@@ -228,10 +228,10 @@ diff -bur gimp-2.99.12-c/plug-ins/file-sgi/meson.build gimp-2.99.12/plug-ins/fil
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
@@ -244,10 +244,10 @@ diff -bur gimp-2.99.12-c/plug-ins/file-tiff/meson.build gimp-2.99.12/plug-ins/fi
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
@@ -260,10 +260,10 @@ diff -bur gimp-2.99.12-c/plug-ins/file-webp/meson.build gimp-2.99.12/plug-ins/fi
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
@@ -276,10 +276,10 @@ diff -bur gimp-2.99.12-c/plug-ins/flame/meson.build gimp-2.99.12/plug-ins/flame/
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
@@ -292,6 +292,306 @@ diff -bur gimp-2.99.12-c/plug-ins/fractal-explorer/meson.build gimp-2.99.12/plug
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/gfig/meson.build gimp-2.99.12/plug-ins/gfig/meson.build
--- gimp-2.99.12-c/plug-ins/gfig/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/gfig/meson.build 2022-08-26 11:05:18.358466600 -0600
@@ -27,9 +27,9 @@
plugin_sources += windows.compile_resources(
gimp_plugins_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/gimpressionist/meson.build gimp-2.99.12/plug-ins/gimpressionist/meson.build
--- gimp-2.99.12-c/plug-ins/gimpressionist/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/gimpressionist/meson.build 2022-08-26 11:05:18.361592500 -0600
@@ -29,9 +29,9 @@
plugin_sources += windows.compile_resources(
gimp_plugins_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/gradient-flare/meson.build gimp-2.99.12/plug-ins/gradient-flare/meson.build
--- gimp-2.99.12-c/plug-ins/gradient-flare/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/gradient-flare/meson.build 2022-08-26 11:05:18.365447800 -0600
@@ -10,9 +10,9 @@
plugin_sources += windows.compile_resources(
gimp_plugins_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/help/meson.build gimp-2.99.12/plug-ins/help/meson.build
--- gimp-2.99.12-c/plug-ins/help/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/help/meson.build 2022-08-26 11:05:18.367447200 -0600
@@ -13,9 +13,9 @@
plugin_sources += windows.compile_resources(
gimp_plugins_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/help-browser/meson.build gimp-2.99.12/plug-ins/help-browser/meson.build
--- gimp-2.99.12-c/plug-ins/help-browser/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/help-browser/meson.build 2022-08-26 11:05:18.369447300 -0600
@@ -12,9 +12,9 @@
plugin_sources += windows.compile_resources(
gimp_plugins_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/ifs-compose/meson.build gimp-2.99.12/plug-ins/ifs-compose/meson.build
--- gimp-2.99.12-c/plug-ins/ifs-compose/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/ifs-compose/meson.build 2022-08-26 11:05:18.371447900 -0600
@@ -10,9 +10,9 @@
plugin_sources += windows.compile_resources(
gimp_plugins_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/imagemap/meson.build gimp-2.99.12/plug-ins/imagemap/meson.build
--- gimp-2.99.12-c/plug-ins/imagemap/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/imagemap/meson.build 2022-08-26 11:05:18.373620200 -0600
@@ -73,9 +73,9 @@
plugin_sources += windows.compile_resources(
gimp_plugins_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/lighting/meson.build gimp-2.99.12/plug-ins/lighting/meson.build
--- gimp-2.99.12-c/plug-ins/lighting/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/lighting/meson.build 2022-08-26 11:05:18.376619900 -0600
@@ -17,9 +17,9 @@
plugin_sources += windows.compile_resources(
gimp_plugins_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/map-object/meson.build gimp-2.99.12/plug-ins/map-object/meson.build
--- gimp-2.99.12-c/plug-ins/map-object/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/map-object/meson.build 2022-08-26 11:05:18.378618900 -0600
@@ -16,9 +16,9 @@
plugin_sources += windows.compile_resources(
gimp_plugins_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/metadata/meson.build gimp-2.99.12/plug-ins/metadata/meson.build
--- gimp-2.99.12-c/plug-ins/metadata/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/metadata/meson.build 2022-08-26 11:05:18.381620300 -0600
@@ -17,9 +17,9 @@
plugin_sources += windows.compile_resources(
plugin_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
@@ -55,9 +55,9 @@
plugin_sources += windows.compile_resources(
plugin_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/pagecurl/meson.build gimp-2.99.12/plug-ins/pagecurl/meson.build
--- gimp-2.99.12-c/plug-ins/pagecurl/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/pagecurl/meson.build 2022-08-26 11:05:18.383620200 -0600
@@ -41,9 +41,9 @@
plugin_sources += windows.compile_resources(
gimp_plugins_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/print/meson.build gimp-2.99.12/plug-ins/print/meson.build
--- gimp-2.99.12-c/plug-ins/print/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/print/meson.build 2022-08-26 11:05:18.385620400 -0600
@@ -17,9 +17,9 @@
plugin_sources += windows.compile_resources(
gimp_plugins_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/script-fu/interpreter/meson.build gimp-2.99.12/plug-ins/script-fu/interpreter/meson.build
--- gimp-2.99.12-c/plug-ins/script-fu/interpreter/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/script-fu/interpreter/meson.build 2022-08-26 11:05:18.388620100 -0600
@@ -12,9 +12,9 @@
plugin_sources += windows.compile_resources(
plugin_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(executable_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(executable_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(executable_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(executable_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/script-fu/meson.build gimp-2.99.12/plug-ins/script-fu/meson.build
--- gimp-2.99.12-c/plug-ins/script-fu/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/script-fu/meson.build 2022-08-26 11:05:18.392620300 -0600
@@ -31,9 +31,9 @@
plugin_sources += windows.compile_resources(
plugin_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(executable_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(executable_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(executable_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(executable_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/script-fu/server/meson.build gimp-2.99.12/plug-ins/script-fu/server/meson.build
--- gimp-2.99.12-c/plug-ins/script-fu/server/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/script-fu/server/meson.build 2022-08-26 11:05:18.394619900 -0600
@@ -12,9 +12,9 @@
plugin_sources += windows.compile_resources(
plugin_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(executable_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(executable_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(executable_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(executable_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/selection-to-path/meson.build gimp-2.99.12/plug-ins/selection-to-path/meson.build
--- gimp-2.99.12-c/plug-ins/selection-to-path/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/selection-to-path/meson.build 2022-08-26 11:05:18.396618000 -0600
@@ -16,9 +16,9 @@
plugin_sources += windows.compile_resources(
gimp_plugins_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/twain/meson.build gimp-2.99.12/plug-ins/twain/meson.build
--- gimp-2.99.12-c/plug-ins/twain/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/twain/meson.build 2022-08-26 11:05:18.398619200 -0600
@@ -14,9 +14,9 @@
plugin_sources += windows.compile_resources(
gimp_plugins_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
--- gimp-2.99.14/plug-ins/file-icns/meson.build.orig 2022-11-14 00:04:38.000000000 +0100
+++ gimp-2.99.14/plug-ins/file-icns/meson.build 2022-11-19 21:03:14.665912600 +0100
@@ -11,9 +11,9 @@
plugin_sources += windows.compile_resources(
gimp_plugins_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
@@ -299,288 +599,3 @@ diff -bur gimp-2.99.12-c/plug-ins/fractal-explorer/meson.build gimp-2.99.12/plug
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/gfig/meson.build gimp-2.99.12/plug-ins/gfig/meson.build
--- gimp-2.99.12-c/plug-ins/gfig/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/gfig/meson.build 2022-08-26 11:05:18.358466600 -0600
@@ -27,9 +27,9 @@
plugin_sources += windows.compile_resources(
gimp_plugins_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/gimpressionist/meson.build gimp-2.99.12/plug-ins/gimpressionist/meson.build
--- gimp-2.99.12-c/plug-ins/gimpressionist/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/gimpressionist/meson.build 2022-08-26 11:05:18.361592500 -0600
@@ -29,9 +29,9 @@
plugin_sources += windows.compile_resources(
gimp_plugins_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/gradient-flare/meson.build gimp-2.99.12/plug-ins/gradient-flare/meson.build
--- gimp-2.99.12-c/plug-ins/gradient-flare/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/gradient-flare/meson.build 2022-08-26 11:05:18.365447800 -0600
@@ -10,9 +10,9 @@
plugin_sources += windows.compile_resources(
gimp_plugins_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/help/meson.build gimp-2.99.12/plug-ins/help/meson.build
--- gimp-2.99.12-c/plug-ins/help/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/help/meson.build 2022-08-26 11:05:18.367447200 -0600
@@ -13,9 +13,9 @@
plugin_sources += windows.compile_resources(
gimp_plugins_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/help-browser/meson.build gimp-2.99.12/plug-ins/help-browser/meson.build
--- gimp-2.99.12-c/plug-ins/help-browser/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/help-browser/meson.build 2022-08-26 11:05:18.369447300 -0600
@@ -12,9 +12,9 @@
plugin_sources += windows.compile_resources(
gimp_plugins_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/ifs-compose/meson.build gimp-2.99.12/plug-ins/ifs-compose/meson.build
--- gimp-2.99.12-c/plug-ins/ifs-compose/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/ifs-compose/meson.build 2022-08-26 11:05:18.371447900 -0600
@@ -10,9 +10,9 @@
plugin_sources += windows.compile_resources(
gimp_plugins_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/imagemap/meson.build gimp-2.99.12/plug-ins/imagemap/meson.build
--- gimp-2.99.12-c/plug-ins/imagemap/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/imagemap/meson.build 2022-08-26 11:05:18.373620200 -0600
@@ -73,9 +73,9 @@
plugin_sources += windows.compile_resources(
gimp_plugins_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/lighting/meson.build gimp-2.99.12/plug-ins/lighting/meson.build
--- gimp-2.99.12-c/plug-ins/lighting/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/lighting/meson.build 2022-08-26 11:05:18.376619900 -0600
@@ -17,9 +17,9 @@
plugin_sources += windows.compile_resources(
gimp_plugins_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/map-object/meson.build gimp-2.99.12/plug-ins/map-object/meson.build
--- gimp-2.99.12-c/plug-ins/map-object/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/map-object/meson.build 2022-08-26 11:05:18.378618900 -0600
@@ -16,9 +16,9 @@
plugin_sources += windows.compile_resources(
gimp_plugins_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/metadata/meson.build gimp-2.99.12/plug-ins/metadata/meson.build
--- gimp-2.99.12-c/plug-ins/metadata/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/metadata/meson.build 2022-08-26 11:05:18.381620300 -0600
@@ -17,9 +17,9 @@
plugin_sources += windows.compile_resources(
plugin_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
],
include_directories: [
rootInclude, appInclude,
@@ -55,9 +55,9 @@
plugin_sources += windows.compile_resources(
plugin_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/pagecurl/meson.build gimp-2.99.12/plug-ins/pagecurl/meson.build
--- gimp-2.99.12-c/plug-ins/pagecurl/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/pagecurl/meson.build 2022-08-26 11:05:18.383620200 -0600
@@ -41,9 +41,9 @@
plugin_sources += windows.compile_resources(
gimp_plugins_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/print/meson.build gimp-2.99.12/plug-ins/print/meson.build
--- gimp-2.99.12-c/plug-ins/print/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/print/meson.build 2022-08-26 11:05:18.385620400 -0600
@@ -17,9 +17,9 @@
plugin_sources += windows.compile_resources(
gimp_plugins_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/script-fu/interpreter/meson.build gimp-2.99.12/plug-ins/script-fu/interpreter/meson.build
--- gimp-2.99.12-c/plug-ins/script-fu/interpreter/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/script-fu/interpreter/meson.build 2022-08-26 11:05:18.388620100 -0600
@@ -12,9 +12,9 @@
plugin_sources += windows.compile_resources(
plugin_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(executable_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(executable_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(executable_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(executable_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/script-fu/meson.build gimp-2.99.12/plug-ins/script-fu/meson.build
--- gimp-2.99.12-c/plug-ins/script-fu/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/script-fu/meson.build 2022-08-26 11:05:18.392620300 -0600
@@ -31,9 +31,9 @@
plugin_sources += windows.compile_resources(
plugin_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(executable_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(executable_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(executable_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(executable_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/script-fu/server/meson.build gimp-2.99.12/plug-ins/script-fu/server/meson.build
--- gimp-2.99.12-c/plug-ins/script-fu/server/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/script-fu/server/meson.build 2022-08-26 11:05:18.394619900 -0600
@@ -12,9 +12,9 @@
plugin_sources += windows.compile_resources(
plugin_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(executable_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(executable_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(executable_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(executable_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/selection-to-path/meson.build gimp-2.99.12/plug-ins/selection-to-path/meson.build
--- gimp-2.99.12-c/plug-ins/selection-to-path/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/selection-to-path/meson.build 2022-08-26 11:05:18.396618000 -0600
@@ -16,9 +16,9 @@
plugin_sources += windows.compile_resources(
gimp_plugins_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
],
include_directories: [
rootInclude, appInclude,
diff -bur gimp-2.99.12-c/plug-ins/twain/meson.build gimp-2.99.12/plug-ins/twain/meson.build
--- gimp-2.99.12-c/plug-ins/twain/meson.build 2022-08-21 13:21:38.000000000 -0600
+++ gimp-2.99.12/plug-ins/twain/meson.build 2022-08-26 11:05:18.398619200 -0600
@@ -14,9 +14,9 @@
plugin_sources += windows.compile_resources(
gimp_plugins_rc,
args: [
- '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
- '--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'ORIGINALFILENAME_STR=@0@'.format(plugin_name+'.exe'),
+ '--define', 'INTERNALNAME_STR=@0@' .format(plugin_name),
+ '--define', 'TOP_SRCDIR=@0@' .format(meson.source_root()),
],
include_directories: [
rootInclude, appInclude,

15
mingw-w64-gimp3/PKGBUILD
View File

@@ -3,8 +3,8 @@
_realname=gimp3
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=2.99.12
pkgrel=6
pkgver=2.99.14
pkgrel=1
pkgdesc="GNU Image Manipulation Program (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang32' 'clang64' 'clangarm64')
@@ -58,15 +58,12 @@ options=('strip' 'makeflags')
source=("https://download.gimp.org/pub/gimp/v2.99/gimp-${pkgver}.tar.xz"
0001-clang-rc-files-fix.patch
0002-skip-test-env.patch
0003-meson-tarball-version-fix.patch
0004-clang-windres.patch
)
sha256sums=('7ba1b032ea520d540e4acad3da16d8637fe693743fdb36e0121775eea569f6a3'
sha256sums=('313a205475d1ff03c5c4d9602f09f5c975ba6c1c79d8843e2396f9fe2abdf7a8'
'54b3abc136b78fd2ae9b7d2acd202fb91bf3b6c248b131f1629ca50ef2493fbe'
'511a2a969d1ff3254b4f2453cdfbc3a86a60e2379adf9f6ed5735454a45ef6ee'
'eb0469cda9e55832eff260aef4f877a84948c2ed1d7bc53104a4fa28b8f718b8'
'2cc3a2c43e16afad531eacb60bb591f34b0059fefbc3881933ac8af9e8db734e'
)
'ca612aeec8ae33e1fdcc70262aa65feefc4c0e391a9fda600b44aebfdd5f8cf5')
apply_patch_with_msg() {
for _patch in "$@"
@@ -82,10 +79,6 @@ prepare() {
0001-clang-rc-files-fix.patch \
0002-skip-test-env.patch
# Workaround for https://gitlab.gnome.org/GNOME/gimp/-/issues/8537
apply_patch_with_msg \
0003-meson-tarball-version-fix.patch
# Workaround for https://github.com/llvm/llvm-project/issues/57334
apply_patch_with_msg \
0004-clang-windres.patch