gimp: Testing dev version with Meson #67576
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jtojnar
added
the
2.status: wait-for-upstream
|
The gjs failure will require #72805 |
worldofpeace
reviewed
Nov 5, 2019
worldofpeace
reviewed
Nov 5, 2019
| ]; | ||
|
|
||
| buildInputs = [ | ||
| python3 |
There was a problem hiding this comment.
Think this won't work if it ends up in a shebang for darwin (because wrappers).
There was a problem hiding this comment.
Bah. Hoping for C wrappers before GIMP 3 is released.
There was a problem hiding this comment.
Good news! makeBinaryWrapper is a thing now: #124556
jtojnar
force-pushed
the
gimp-meson
branch
2 times, most recently
from
715ab15
to
f52c409
Compare
jtojnar
changed the title
jtojnar
force-pushed
the
gimp-meson
branch
2 times, most recently
from
c750da1
to
359513f
Compare
10 tasks
|
@GrahamcOfBorg eval |
17 tasks
jtojnar
force-pushed
the
gimp-meson
branch
2 times, most recently
from
d83954d
to
65d90f9
Compare
|
Can we maybe just remove the old GIMP? I know 3.0 isn't released, but it seems better than the old one in every respect at the state it currently is. |
|
Gimp 2.99 crashes for me without |
|
Any progress ? |
|
How can one build this properly? I've tried several commits on this thread, and they call come back with something like
|
|
Update for 2.99.16: https://git.sr.ht/~fd/nix-configs/tree/main/item/pkgs/gimp-devel/default.nix |
ghagl
added a commit
to ghagl/nix-pkgs
that referenced
this pull request
Jan 1, 2024
|
Given that GIMP is finalizing their stuff before 3.0 release, I guess now is the best time to rebase? <3 |
|
There are a few changes that need to be made for 2.99.18 (adjust a patch file, disable an image format that's not packaged) I have 2.99.18 tested and running here https://git.sr.ht/~fd/nix-configs/tree/main/item/pkgs/gimp-devel/default.nix |
|
Using the latest commit as of 09.03 ( The little GIMP loader popup appears, runs through fully, and then when gimp is supposed to actually appear, it crashes with the following dump: Full Dump
Stack trace: |
wegank
added
2.status: stale
stale
bot
removed
the
2.status: stale
13 tasks
Co-Authored-By: Linus Heckemann <git@sphalerite.org>
https://www.gimp.org/news/2022/08/27/gimp-2-99-12-released/ GNOME/gimp@256b2d9...a791151 Introduces `gimp-script-fu-interpreter-3.0` as interpreter invoked by shebang of some plug-ins. Let’s ensure it is on `PATH`.
GNOME GitLab instance fails with “fatal: the remote end hung up unexpectedly”
This reverts commit f39b88c. Currently it does not build.
This is already part of gimp master but that does not build yet.
|
I rebased to resolve the conflicts, skimmed the upstream changes and merged the update but for some reason that does not build. The previous GIMP revision still builds fine if I apply https://gitlab.gnome.org/GNOME/gimp/-/commit/a4f02398188bc36d1808ef802082b3856cc73741 as a patch but the latest one does not. I reverted for that for now. It appears to fail at running GIMP at build time (https://gitlab.gnome.org/GNOME/gimp/-/commit/354970c0ebb5b2af706b6b5aea16d4a19b2dd0ea makes that failure visible) and at test time. I tried to bisect it but did not succeed. It resulted in a translation commit that obviously cannot be causing the issue: Bisection logPatch to facilitate bisectiondiff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index ffb40331d952..ff8229def450 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -89,15 +89,16 @@ in stdenv.mkDerivation (finalAttrs: {
# We should not use fetchFromGitLab because the build system
# will complain and mark the build as unsupported when it cannot find
# .git directory but downloading the whole repo is jus too much.
- src = fetchFromGitHub rec {
- name = "gimp-dev-${rev}"; # to make sure the hash is updated
- owner = "GNOME";
- repo = "gimp";
- rev = "254d4270e6084f6794e737c561d9a5460df9df4c";
- hash = "sha256-dCddCFCRDTT4iY+kepKKu413ezWOMEQ1m4hxBptBCfU=";
- # For gimp-data containing assets.
- fetchSubmodules = true;
- };
+ # src = fetchFromGitHub rec {
+ # name = "gimp-dev-${rev}"; # to make sure the hash is updated
+ # owner = "GNOME";
+ # repo = "gimp";
+ # rev = "254d4270e6084f6794e737c561d9a5460df9df4c";
+ # hash = "sha256-dCddCFCRDTT4iY+kepKKu413ezWOMEQ1m4hxBptBCfU=";
+ # # For gimp-data containing assets.
+ # fetchSubmodules = true;
+ # };
+ src = /home/jtojnar/Projects/gimp;
patches = [
# to remove compiler from the runtime closure, reference was retained via
@@ -226,7 +227,7 @@ in stdenv.mkDerivation (finalAttrs: {
# Requires neweer appstreamcli and not necessary
"-Dappdata-test=disabled"
# Not yet packaged.
- "-Dilbm=disabled"
+ # "-Dilbm=disabled"
] ++ lib.optionals stdenv.isDarwin [
"-Dalsa=disabled"
"-Djavascript=false"
@@ -250,11 +251,22 @@ in stdenv.mkDerivation (finalAttrs: {
app/tests/create_test_env.sh \
tools/gimp-mkenums
+ export NIX_CFLAGS_COMPILE=$(echo "$NIX_CFLAGS_COMPILE" | sed "s/ -Wno-incompatible-function-pointer-types//g")
+ echo "====$NIX_CFLAGS_COMPILE"
+
# Bypass the need for downloading git archive.
- substitute app/git-version.h.in git-version.h \
- --subst-var-by GIMP_GIT_VERSION "GIMP_2.99.?-g${builtins.substring 0 10 finalAttrs.src.rev}" \
- --subst-var-by GIMP_GIT_VERSION_ABBREV "${builtins.substring 0 10 finalAttrs.src.rev}" \
- --subst-var-by GIMP_GIT_LAST_COMMIT_YEAR "${builtins.head (builtins.match ".+\-unstable-([0-9]{4})-[0-9]{2}-[0-9]{2}" finalAttrs.version)}"
+ '';
+ # substitute app/git-version.h.in git-version.h \
+ # --subst-var-by GIMP_GIT_VERSION "GIMP_2.99.?-g${builtins.substring 0 10 finalAttrs.src.rev}" \
+ # --subst-var-by GIMP_GIT_VERSION_ABBREV "${builtins.substring 0 10 finalAttrs.src.rev}" \
+ # --subst-var-by GIMP_GIT_LAST_COMMIT_YEAR "${builtins.head (builtins.match ".+\-unstable-([0-9]{4})-[0-9]{2}-[0-9]{2}" finalAttrs.version)}"
+
+ preBuild = ''
+ # Generating gimp-data/images/gimp-splash.png using tools/in-build-gimp.sh appears to run gimp, which complains:
+ # Failed to create the data directory '/homeless-shelter/.local/share': Permission denied
+ export HOME="$(mktemp -d)"
+
+ templaterc="$out/etc/gimp/3.0/templaterc"
'';
preCheck = ''
diff --git a/pkgs/applications/graphics/gimp/hardcode-plugin-interpreters.patch b/pkgs/applications/graphics/gimp/hardcode-plugin-interpreters.patch
index 13e37da3bd24..6cb261d84ff0 100644
--- a/pkgs/applications/graphics/gimp/hardcode-plugin-interpreters.patch
+++ b/pkgs/applications/graphics/gimp/hardcode-plugin-interpreters.patch
@@ -1,8 +1,8 @@
--- a/plug-ins/python/pygimp.interp.in
+++ b/plug-ins/python/pygimp.interp.in
@@ -2,4 +2,4 @@ python=@PYTHON_PATH@
- python3=@PYTHON_PATH@python.exe
- /usr/bin/python=@PYTHON_PATH@python.exe
- /usr/bin/python3=@PYTHON_PATH@python.exe
+ python3=@PYTHON_PATH@
+ /usr/bin/python=@PYTHON_PATH@
+ /usr/bin/python3=@PYTHON_PATH@
-:Python:E::py::python3:
+:Python:E::py::@python_interpreter@:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Trying to see if we need any changes on Darwin.
Depends on #73833