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

abiword: 3.0.1 -> 3.0.2 #31194

Merged
merged 3 commits into from Nov 3, 2017
Merged

abiword: 3.0.1 -> 3.0.2 #31194

merged 3 commits into from Nov 3, 2017

Conversation

ylwghst
Copy link
Contributor

@ylwghst ylwghst commented Nov 3, 2017 •
edited by grahamc

Motivation for this change

Two bugs both in 3.0.1 and 3.0.2 makes Abiword unusable.
Raising to 3.0.2 and appending fix patch.

Bug 13791
Bug description: constant redraw flicker when document not empty
Bug report: https://bugzilla.abisource.com/show_bug.cgi?id=13791
Patch source: https://bugzilla.abisource.com/attachment.cgi?id=5860

Bug 13815
Bug description: Document view is black
Bug report: https://bugzilla.abisource.com/show_bug.cgi?id=13815
Patch source: https://bugzilla.abisource.com/attachment.cgi?id=5837

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • [+] Fits CONTRIBUTING.md.

@ylwghst
Copy link
Contributor Author

ylwghst commented Nov 3, 2017 •
edited

Changed patch to one which covers both fixes.

grahamc
grahamc reviewed Nov 3, 2017
View reviewed changes
pkgs/applications/office/abiword/default.nix Outdated
};

enableParallelBuilding = true;

patches = [
(fetchurl { url = https://gist.github.com/ylwghst/b28ef051980f41aca56df7a8affd9526/raw/; sha256 = "02p8kz02xm1197zcpzjs010mna9hxsbq5lwgxr8b7qhh9yxja7al"; })
Copy link
Member

Choose a reason for hiding this comment

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

I think we'd prefer this patch be in nixpkgs, than just in your gists.

Copy link
Member

Choose a reason for hiding this comment

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

In fact, just use two patches, linking to the original URLs you already put in the body of the issue?

Copy link
Contributor Author

@ylwghst ylwghst Nov 3, 2017 •
edited

Choose a reason for hiding this comment

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

When I try to fetch this URL:
https://bugzilla.abisource.com/attachment.cgi?id=5860&format=raw
Patch is fetched as 'attachment.cgi?id=5860&format=raw'
and build fails due to the '&' in it's name.

Copy link
Contributor

Choose a reason for hiding this comment

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

You can add name attribute but it should not be necessary to add format.

@jtojnar
Copy link
Contributor

jtojnar commented Nov 3, 2017 •
edited

There is a conflict between:

    (fetchurl {
      url = https://bugzilla.abisource.com/attachment.cgi?id=5860;
      sha256 = "02p8kz02xm1197zcpzjs010mna9hxsbq5lwgxr8b7qhh9yxja7al";
    })

and

    (fetchurl {
      url = https://bugzilla.abisource.com/attachment.cgi?id=5837;
      sha256 = "15j4ysms56bb7zs01bqdin9n9jiax0k5q17r9915hvvx2x559wh5";
    })

It would be the best to use 5860 as is and place the modified smaller one to the repo.

@ylwghst
Copy link
Contributor Author

ylwghst commented Nov 3, 2017 •
edited

@jtojnar I've put only nr. 5860 into code which fixes both issues.

@jtojnar
Copy link
Contributor

jtojnar commented Nov 3, 2017 •
edited

@ylwghst Yes, you are right. Seems like it is no longer black or flickering.

@Mic92 Mic92 merged commit b4677c0 into NixOS:master Nov 3, 2017
@jtojnar
Copy link
Contributor

jtojnar commented Nov 3, 2017

We should still use the remote patch.

@Mic92
Copy link
Member

Mic92 commented Nov 3, 2017

also ported to stable.

@jtojnar jtojnar mentioned this pull request Nov 25, 2017
Closed
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@grahamc grahamc grahamc left review comments

@jtojnar jtojnar jtojnar left review comments

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@ylwghst @jtojnar @Mic92 @grahamc @GrahamcOfBorg