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.

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

gimp-with-plugins: Fix build errors with exiv2-0.27.1 #64353

Closed
wants to merge 2 commits into from

Conversation

neilmayhew
Copy link
Member

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@worldofpeace
Copy link
Contributor

@GrahamcOfBorg build gimp-with-plugins

@@ -20,6 +20,10 @@ stdenv.mkDerivation rec {
gtk2 gtkimageview bzip2 zlib
libjpeg libtiff cfitsio exiv2 lcms2 lensfun
] ++ stdenv.lib.optional withGimpPlugin gimp;
patches = [
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a comment that these are needed for exiv2 0.27.1?
Would it also be okay to combine these patches?

#include <libgimp/gimpui.h>

+#include <exiv2/error.hpp>
#include <exiv2/image.hpp>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upstream discourages from using individual header files since it breaks build, so you should just use
#include <exiv2/exiv2.hpp>

#include "ufraw.h"

#ifdef HAVE_EXIV2
+#include <exiv2/error.hpp>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@neilmayhew
Copy link
Member Author

Although I've updated this in response to your review comments, I expect you'll want to use #64607 instead. If so, I'll close this.

@worldofpeace
Copy link
Contributor

That is true @neilmayhew.
Thank you for the patches though ✨

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants