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

mupdf: 1.14.0 -> 1.15.0 #61196

Closed
wants to merge 2 commits into from
Closed

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented May 9, 2019

Motivation for this change

Drop CVE patch, presumably included since it's from their repo :).
(but not mentioned in release notes online)

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

Drop CVE patch, presumably included since it's from their repo :).
(but not mentioned in release notes online)
@c0bw3b
Copy link
Contributor

c0bw3b commented May 9, 2019

Drop CVE patch, presumably included since it's from their repo :).

I checked 1.15 sources and it is indeed applied ✔️

}
)]
++ stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch
stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch
Copy link
Contributor

Choose a reason for hiding this comment

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

Checked the makefile and this patch is still valid & needed for 1.15

Copy link
Contributor

@endgame endgame left a comment

Choose a reason for hiding this comment

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

Builds fine on my machine with:

nix build '(with import (builtins.fetchTarball { url = "https://github.com/dtzWill/nixpkgs/archive/update/mupdf-1.15.0.tar.gz"; }) {}; pkgs.mupdf)'

And I can view a PDF with it. It seemed to produce only one output (bin), though that might be a nix build thing?

@c0bw3b
Copy link
Contributor

c0bw3b commented May 10, 2019

@endgame It's a multi-output derivation so you should get several "folders" in your nix store (mupdf-1.15.0-bin, mudpf-1.15.0-dev, etc...)


Result of nix-review pr 61196 1

2 package failed to build:
  • k2pdfopt (cups_filters ,system_config_printer)
  • llpp (cups_filters ,system_config_printer)
7 package were build:
  • cups-filters (cups_filters ,system_config_printer)
  • jfbpdf (cups_filters ,system_config_printer)
  • jfbview (cups_filters ,system_config_printer)
  • mupdf (cups_filters ,system_config_printer)
  • splix (cups_filters ,system_config_printer)
  • system-config-printer (cups_filters ,system_config_printer)
  • zathura (cups_filters ,system_config_printer)

llpp failure is a regression. Excerpt of the build logs:

link.c -> link.o
./link.c:122:9: error: unknown type name 'fz_annot'
         fz_annot *annot;
         ^~~~~~~~
./link.c:128:5: error: unknown type name 'fz_annot'
     fz_annot *annot;
     ^~~~~~~~
./link.c: In function 'ensureannots':
./link.c:1983:5: error: unknown type name 'fz_annot'; did you mean 'pdf_annot'?
     fz_annot *annot;
     ^~~~~~~~
     pdf_annot
./link.c:1991:18: error: implicit declaration of function 'fz_first_annot'; did you mean 'pdf_first_annot'? [-Werror=implicit-function-declaration]
     for (annot = fz_first_annot (state.ctx, page->fzpage);
                  ^~~~~~~~~~~~~~
                  pdf_first_annot
./link.c:1991:16: error: assignment makes pointer from integer without a cast [-Werror=int-conversion]
     for (annot = fz_first_annot (state.ctx, page->fzpage);
                ^
./link.c:1993:18: error: implicit declaration of function 'fz_next_annot'; did you mean 'pdf_next_annot'? [-Werror=implicit-function-declaration]
          annot = fz_next_annot (state.ctx, annot)) {
                  ^~~~~~~~~~~~~
                  pdf_next_annot
./link.c:1993:16: error: assignment makes pointer from integer without a cast [-Werror=int-conversion]
          annot = fz_next_annot (state.ctx, annot)) {
                ^
./link.c:2004:20: error: assignment makes pointer from integer without a cast [-Werror=int-conversion]
         for (annot = fz_first_annot (state.ctx, page->fzpage), i = 0;
                    ^
./link.c:2006:20: error: assignment makes pointer from integer without a cast [-Werror=int-conversion]
              annot = fz_next_annot (state.ctx, annot), i++) {
                    ^
./link.c:2009:20: error: implicit declaration of function 'fz_bound_annot'; did you mean 'pdf_bound_annot'? [-Werror=implicit-function-declaration]
             rect = fz_bound_annot (state.ctx, annot);
                    ^~~~~~~~~~~~~~
                    pdf_bound_annot
./link.c:2009:18: error: incompatible types when assigning to type 'fz_rect {aka struct fz_rect_s}' from type 'int'
             rect = fz_bound_annot (state.ctx, annot);
                  ^
./link.c: In function 'ensureslinks':
./link.c:2070:18: error: incompatible types when assigning to type 'fz_rect {aka struct fz_rect_s}' from type 'int'
             rect = fz_bound_annot (state.ctx, page->annots[j].annot);
                  ^
./link.c: In function 'getannot':
./link.c:2377:18: error: incompatible types when assigning to type 'fz_rect {aka struct fz_rect_s}' from type 'int'
             rect = fz_bound_annot (state.ctx, a->annot);
                  ^
./link.c: In function 'ml_addannot':
./link.c:3678:9: error: implicit declaration of function 'pdf_set_text_annot_position'; did you mean 'pdf_set_annot_author'? [-Werror=implicit-function-declaration]
         pdf_set_text_annot_position (state.ctx, annot, p);
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~
         pdf_set_annot_author
cc1: all warnings being treated as errors
ocamlc -ccopt "-g -std=c99 -O2 -I build/mupdf/include -I build/mupdf/thirdparty/freetype/include -Wall -Werror -Wextra -pedantic -DCACHE_PAGEREFS -DKeySym=uint32_t -D_POSIX_C_SOURCE -MMD -MF build/link.o.dep -MT_ -o build/link.o" ./link.c failed
fail 3 sec

@teto teto mentioned this pull request Sep 11, 2019
10 tasks
@teto
Copy link
Member

teto commented Sep 11, 2019

updated the PR in #68506. Wanted to run a nix-review on it but it was trying to fetch/build > 2000 packages for some reason so I ended up cancelling the session.

@lheckemann
Copy link
Member

Closing in favour of #68506

@lheckemann lheckemann closed this Sep 12, 2019
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

5 participants