Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gimp: 2.10.12 → 2.10.14 #72386

Merged
merged 13 commits into from
Nov 3, 2019
Merged

gimp: 2.10.12 → 2.10.14 #72386

merged 13 commits into from
Nov 3, 2019
+279 −49

Conversation

jtojnar
Copy link
Member

@jtojnar jtojnar commented Oct 31, 2019 •
edited
Loading

Sorry, something went wrong.

@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 labels Oct 31, 2019
@ofborg ofborg bot added the 6.topic: GNOME GNOME desktop environment and its underlying platform label Oct 31, 2019
@jtojnar
Copy link
Member Author

jtojnar commented Oct 31, 2019

I am seeing the following in the console.

Traceback (most recent call last):
  File "/nix/store/cb4y33mrqkmd8aca855kjyks9l9mbkkj-gimp-2.10.12/lib/gimp/2.0/plug-ins/spyro_plus/.spyro_plus.py-wrapped", line 23, in <module>
    import gimpui
  File "/nix/store/cb4y33mrqkmd8aca855kjyks9l9mbkkj-gimp-2.10.12/lib/gimp/2.0/python/gimpui.py", line 33, in <module>
    import gtk, gobject, gimp, gimpcolor
ImportError: No module named gtk

It is not a regression, we have it in GIMP 2.10.12 too.

Not sure why that is happening, GIMP itself is wrapped to have pygtk in PYTHONPATH and spyro does not overwrite the environment variable.

@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Oct 31, 2019
@ofborg ofborg bot requested a review from vrthra October 31, 2019 23:54
@worldofpeace worldofpeace self-requested a review November 1, 2019 13:08
@jtojnar jtojnar mentioned this pull request Nov 1, 2019
Closed
@jtojnar
Copy link
Member Author

jtojnar commented Nov 1, 2019 •
edited
Loading

GEGL fails to build on Darwin:

FAILED: subprojects/poly2tri-c/libpoly2tri-c.a
rm -f subprojects/poly2tri-c/libpoly2tri-c.a && ar csr subprojects/poly2tri-c/libpoly2tri-c.a
ar: no archive members specified
usage:  ar -d [-TLsv] archive file ...
        ar -m [-TLsv] archive file ...
        ar -m [-abiTLsv] position archive file ...
        ar -p [-TLsv] archive [file ...]
        ar -q [-cTLsv] archive file ...
        ar -r [-cuTLsv] archive file ...
        ar -r [-abciuTLsv] position archive file ...
        ar -t [-TLsv] archive [file ...]
        ar -x [-ouTLsv] archive [file ...]
ninja: build stopped: subcommand failed.

Edit: opened bug upstream: https://gitlab.gnome.org/GNOME/gegl/issues/214
And there is also a meson bug mesonbuild/meson#3735

jtojnar added 12 commits November 3, 2019 14:31
@jtojnar
netsurf.buildsystem: build on Darwin

Verified

This commit was signed with the committer’s verified signature. The key has expired.
marsam Mario Rodas
GPG key ID: 4C4BEFD7B18DC5E8
Expired
Verified
Learn about vigilant mode
a881d11
@jtojnar
netsurf.libnsgif: build on Darwin
fdd6153
@jtojnar
poly2tri-c: init at 0.1.0
148eae4
@jtojnar
gegl_0_4: 0.4.16 → 0.4.18
258f6f4 
https://gitlab.gnome.org/GNOME/gegl/blob/GEGL_0_4_18/docs/NEWS.txt#L1-123

Ported to Meson, which means ton of extra dependencies used by default.
Though the closure size effect appears to be minimal: 88.9M → 92.9M

Also drop GTK dependency, since it is not needed any more (was it ever?)
@jtojnar
gimp: 2.10.12 → 2.10.14
c75c6b5 
https://www.gimp.org/news/2019/10/31/gimp-2-10-14-released/
@jtojnar
gimp: format with nixpkgs-format
43c3f47
@jtojnar
gimp-with-plugins: fix installing custom scripts
ae21a2b 
script-fu (Scheme) scripts are not actually loaded from $GIMP2_PLUGINDIR (lib/gimp/2.10) but $GIMP_DATADIR (share/gimp/2.10).
@jtojnar
gimp-with-plugins: install plug-ins into subdirs
8da26cc 
GIMP 3 will require all plugins to be installed into their own subdirectories, so let’s just do that now.
@jtojnar
gimpPlugins.waveletSharpen: fix build
a73ad44
@jtojnar
gimpPlugins.gap: fix build
46818a5
@jtojnar
gimp-with-plugins: pass all script attributes
e93c38f 
to the pluginDerivation
@jtojnar
gimpPlugin.exposureBlend: mark as broken
f3a8147 
It produces an error:

	GIMP-Error: Calling error for procedure 'gimp-image-get-active-layer':
	Procedure 'gimp-image-get-active-layer' has been called with an invalid ID for argument 'image'. Most likely a plug-in is trying to work on an image that doesn't exist any longer.

	(script-fu:25123): GLib-WARNING **: 12:41:03.500: (../glib/gerror.c:416):g_error_new_valist: runtime check failed: (domain != 0)
	script-fu-Warning: Error while loading /nix/store/31y1qiyg8fzn07yz6lrnkbja33298gmz-gimp-with-plugins-2.10.14/share/gimp/2.0/scripts/exposure-blend/nds9ds1m18d0wg1b01fch8wyzdwpmr8x-exposure-blend.scm:

	Error: (/nix/store/31y1qiyg8fzn07yz6lrnkbja33298gmz-gimp-with-plugins-2.10.14/share/gimp/2.0/scripts/exposure-blend/nds9ds1m18d0wg1b01fch8wyzdwpmr8x-exposure-blend.scm : 627) Procedure execution of gimp-image-get-active-layer failed on invalid input arguments: Procedure 'gimp-image-get-active-layer' has been called with an invalid ID for argument 'image'. Most likely a plug-in is trying to work on an image that doesn't exist any longer.
@jtojnar
Copy link
Member Author

jtojnar commented Nov 3, 2019 

../gegl/opencl/cl_gl.h:37:10: fatal error: 'OpenGL/CGLDevice.h' file not found
#include <OpenGL/CGLDevice.h>
         ^~~~~~~~~~~~~~~~~~~~

jtojnar ,locate CGLDevice.h
{^_^} Couldn't find in any packages

🤷‍♀️ @NixOS/darwin-maintainers

@LnL7
gegl: fix darwin build
80a5dd7 
    ../gegl/opencl/cl_gl.h:37:10: fatal error: 'OpenGL/CGLDevice.h' file not found
    #include <OpenGL/CGLDevice.h>
@LnL7
Copy link
Member

LnL7 commented Nov 3, 2019

nix-index generates it's database based on the derivations for your system, ie. darwin only packages won't be indexed on linux (by default?).
As a general rule of thumb, if you see camel case in headers it's probably a framework.

@jtojnar
Copy link
Member Author

jtojnar commented Nov 3, 2019

@GrahamcOfBorg build gimp

@jtojnar
Copy link
Member Author

jtojnar commented Nov 3, 2019 •
edited
Loading

Thanks.
gegl should be gegl_0_4 and I wonder about all these libm failures.

@jtojnar jtojnar merged commit 3df93db into NixOS:master Nov 3, 2019
dtzWill pushed a commit to dtzWill/nixpkgs that referenced this pull request Nov 3, 2019
@jtojnar @dtzWill
Merge pull request NixOS#72386 from jtojnar/gimp-2.10.14
6fb5ce4 
gimp: 2.10.12 → 2.10.14
(cherry picked from commit 3df93db)
@jtojnar jtojnar deleted the gimp-2.10.14 branch November 4, 2019 13:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vrthra vrthra

@worldofpeace worldofpeace

Assignees
No one assigned
Labels
6.topic: GNOME GNOME desktop environment and its underlying platform 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@jtojnar @LnL7