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

apvlv: fix build for poppler 0.73.0 #55337

Closed
wants to merge 1 commit into from
Closed

Conversation

@erictapen
Copy link
Member

@erictapen erictapen commented Feb 6, 2019

Motivation for this change

apvlv doesn't build on master.

Pinging maintainer @ardumont

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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@erictapen
Copy link
Member Author

@erictapen erictapen commented Feb 6, 2019

@GrahamcOfBorg build apvlv

@teto
Copy link
Contributor

@teto teto commented Feb 6, 2019

Related issue #54021

@erictapen
Copy link
Member Author

@erictapen erictapen commented Feb 6, 2019

@teto Thanks for the link, didn't see that.

Poppler was upgraded in [0] and therefore the build broke, as
poppler/goo/gtypes.h was moved into poppler/goo/gfile.h [1].

Upstream issue is [2].

[0] NixOS@7757e43
[1] https://gitlab.freedesktop.org/poppler/poppler/commit/ef3ef702bc3dc845731e43215400448c5324efd4
[2] naihe2010/apvlv#28
@@ -43,6 +43,12 @@ stdenv.mkDerivation rec {
})
];

# poppler 0.73.0 moved functionality from gtypes.h into gfile.h
postPatch = ''
grep -rlF '#include "goo/gtypes.h"' | xargs sed -i 's|#include "goo/gtypes.h"|#include "goo/gfile.h"|g'
Copy link
Contributor

@worldofpeace worldofpeace Feb 6, 2019

Choose a reason for hiding this comment

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

The only one that matters here is https://github.com/naihe2010/apvlv/blob/41f68a9640dcf2c179567a7e8c8d3d0552ece584/src/ApvlvPdf.cc#L32

So a patch would be safer.

I conveniently have a patch lying around for this, if you'd like to include it
worldofpeace@1d34b85

Copy link
Member Author

@erictapen erictapen Feb 7, 2019

Choose a reason for hiding this comment

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

Your solution looks more convenient indeed. I'll provide a new PR with your patch.

@erictapen erictapen closed this Feb 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants