Skip to content

Commit

Permalink
chore: bump gmic to v3.3.4
Browse files Browse the repository at this point in the history
This also comes with a patch to ensure the build succeeds,
which I suspect can be dropped after the next release of
gmic.
  • Loading branch information
jnsgruk committed Feb 22, 2024
1 parent 7484012 commit a98c2d8
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
13 changes: 13 additions & 0 deletions snap/local/patches/gmic-gimp-image-procedure-new-cast.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/Host/Gimp/host_gimp.cpp b/src/Host/Gimp/host_gimp.cpp
index 166ff0c..86888d4 100644
--- a/src/Host/Gimp/host_gimp.cpp
+++ b/src/Host/Gimp/host_gimp.cpp
@@ -1205,7 +1205,7 @@ static GimpProcedure * gmic_qt_create_procedure(GimpPlugIn * plug_in, const gcha
GimpProcedure * procedure = NULL;

if (strcmp(name, PLUG_IN_PROC) == 0) {
- procedure = gimp_image_procedure_new(plug_in, name, GIMP_PDB_PROC_TYPE_PLUGIN, gmic_qt_run, NULL, NULL);
+ procedure = gimp_image_procedure_new(plug_in, name, GIMP_PDB_PROC_TYPE_PLUGIN, (GimpRunImageFunc) gmic_qt_run, NULL, NULL);

gimp_procedure_set_image_types(procedure, "RGB*, GRAY*");

7 changes: 6 additions & 1 deletion snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ parts:
after: [gimp]
plugin: nil
override-pull: |
VERSION=v.3.3.3
VERSION=v.3.3.4
git clone -b "$VERSION" https://github.com/GreycLab/gmic.git
git clone -b "$VERSION" https://github.com/GreycLab/CImg.git
git clone -b "$VERSION" https://github.com/c-koi/gmic-qt.git
Expand All @@ -571,6 +571,11 @@ parts:
# the build phase, by the time we get there the proxy token has
# expired - so force it to happen here.
wget -qO gmic/src/gmic_stdlib_community.h "https://gmic.eu/gmic_stdlib_community$(echo "${VERSION}" | tr -d "v.").h"
# TODO: This can potentially be dropped after the next release of gmic-qt
pushd gmic-qt
patch -Np1 -i $CRAFT_PROJECT_DIR/snap/local/patches/gmic-gimp-image-procedure-new-cast.patch
popd
build-environment:
- LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib:$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
- PATH: /snap/bin:$PATH
Expand Down

0 comments on commit a98c2d8

Please sign in to comment.