scribusUnstable: fix build failure from poppler bump #53958
Merged
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
|
@GrahamcOfBorg build scribusUnstable |
|
Looks like perhaps bumping scribus to more recent SVN revision might fix the build failures borg's encountering? (seems to contain fixes for poppler 0.72, so this fix would be needed as well) |
Poppler was upgraded in [0] and therefore the build broke, as poppler/goo/gtypes.h was moved into poppler/goo/gfile.h [1]. The patch is intended to be broght upstream and then can be reverted. [0] NixOS@7757e43 [1] https://gitlab.freedesktop.org/poppler/poppler/commit/ef3ef702bc3dc845731e43215400448c5324efd4
erictapen
force-pushed
the
scribusUnstable-poppler-fix
branch
from
ba2427d
to
ac891e9
Compare
You're right, I only tested the change with a rev bump, but didn't include it in the PR. |
|
@GrahamcOfBorg build scribusUnstable |
|
LGTM, thanks and sorry about the breakage! :) |
|
@dtzWill Thanks for merging. Imho there is no need to be sorry, thats how work should be distributed between maintainers! |
10 tasks
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.
Poppler was upgraded in 7757e43 and therefore
scribusUnstablebroke, as poppler/goo/gtypes.h was moved into poppler/goo/gfile.h.The patch is intended to be broght upstream and then can be reverted.
Motivation for this change
Fixes #53943.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)