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

nifskope: 1.1.3 -> 2.0.dev7 #42143

Merged
merged 1 commit into from Jun 18, 2018
Merged

nifskope: 1.1.3 -> 2.0.dev7 #42143

merged 1 commit into from Jun 18, 2018

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Jun 17, 2018

Motivation for this change

nifskope v2 contains a lot of new features and a new, QT5-based UI
(see https://github.com/niftools/nifskope/releases). Additionally the
2.0 sourcetree exists for quite a while and after some short user tests
it seems fairly stable.

The following aspects have been changed:

  • Use QT 5.9 rather than QT4 (see Qt4 deprecation tracking issue #33248).

  • GCC7 support from upstream (gcc6 patch not needed anymore, build on
    GCC7 works fine), disabled -Werror=format-security can be used again
    as compiler flag.

  • Patched broken paths in NifSkope_targets.pri to point to the proper
    dependencies (otherwise <gli.hpp> and qhull couldn't be found).

  • Patched paths in NifSkope.pro to lupdate and lrelease (default
    QT_* paths point to libsForQt5x.qtbase which doesn't contain the
    needed binaries, instead they need to point to libsForQt5x.qttools).

  • Added myself as maintainer.

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/)
  • Fits CONTRIBUTING.md.

`nifskope` v2 contains a lot of new features and a new, QT5-based UI
(see https://github.com/niftools/nifskope/releases). Additionally the
2.0 sourcetree exists for quite a while and after some short user tests
it seems fairly stable.

The following aspects have been changed:

* Use QT 5.9 rather than QT4 (see NixOS#33248).

* GCC7 support from upstream (gcc6 patch not needed anymore, build on
  GCC7 works fine), disabled `-Werror=format-security` can be used again
  as compiler flag.

* Patched broken paths in `NifSkope_targets.pri` to point to the proper
  dependencies (otherwise `<gli.hpp>` and `qhull` couldn't be found).

* Patched paths in `NifSkope.pro` to `lupdate` and `lrelease` (default
  `QT_*` paths point to `libsForQt5x.qtbase` which doesn't contain the
  needed binaries, instead they need to point to `libsForQt5x.qttools`).

* Added myself as maintainer.
@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: nifskope

Partial log (click to expand)

         got = write(state->fd, strm->next_in, strm->avail_in);
               ^~~~~
               fwrite
lib/zlib/gzwrite.c: In function 'gzclose_w':
lib/zlib/gzwrite.c:573:9: warning: implicit declaration of function 'close'; did you mean 'pclose'? [-Wimplicit-function-declaration]
     if (close(state->fd) == -1)
         ^~~~~
         pclose
builder for '/nix/store/cr27zj02sa96v27158gy69dxym9ri1f2-nifskope-2.0.dev7.drv' failed with exit code 2
error: build of '/nix/store/cr27zj02sa96v27158gy69dxym9ri1f2-nifskope-2.0.dev7.drv' failed

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: nifskope

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/fsy4rznd78zqrj6lkm861abfslzzngqw-nifskope-2.0.dev7
shrinking /nix/store/fsy4rznd78zqrj6lkm861abfslzzngqw-nifskope-2.0.dev7/bin/.NifSkope-wrapped
strip is /nix/store/4mf2xm9p32lzrim927yk92xhx35yaz62-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/fsy4rznd78zqrj6lkm861abfslzzngqw-nifskope-2.0.dev7/bin
patching script interpreter paths in /nix/store/fsy4rznd78zqrj6lkm861abfslzzngqw-nifskope-2.0.dev7
checking for references to /build in /nix/store/fsy4rznd78zqrj6lkm861abfslzzngqw-nifskope-2.0.dev7...
postPatchMkspecs
postPatchMkspecs
postPatchMkspecs
/nix/store/fsy4rznd78zqrj6lkm861abfslzzngqw-nifskope-2.0.dev7

@Mic92 Mic92 merged commit df9f2c7 into NixOS:master Jun 18, 2018
@Ma27 Ma27 deleted the bump-nifskope branch June 18, 2018 10:36
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

3 participants