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

ttfautohint: 1.7 -> 1.8.1 #33294

Merged
merged 1 commit into from Jan 5, 2018
Merged

ttfautohint: 1.7 -> 1.8.1 #33294

merged 1 commit into from Jan 5, 2018

Conversation

bkchr
Copy link
Contributor

@bkchr bkchr commented Jan 1, 2018

Motivation for this change
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.

@@ -0,0 +1,11 @@
--- a/configure 2017-12-29 01:10:59.201970193 +0100
+++ b/configure 2017-12-29 01:10:40.161330131 +0100
Copy link
Member

@lukateras lukateras Jan 1, 2018

Choose a reason for hiding this comment

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

It's unfortunate that this patches configure rather than configure.ac from which the former was generated.

Copy link
Member

@lukateras lukateras Jan 1, 2018

Choose a reason for hiding this comment

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

Judging by the fact that ttfautohint configure.ac doesn't have qmake_version_sed at all, it's brought in by Autotools and this could be solved just by autoreconfing the package (i.e. regenerating configure script). Could you please try adding autoreconfHook to nativeBuildInputs?

(We should really autoreconf all Autotools packages).

Copy link
Contributor Author

@bkchr bkchr Jan 2, 2018

Choose a reason for hiding this comment

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

I tried that, but it does not work. (Also crashes with configure: error: Cannot detect Qt's version.)

@@ -17,10 +17,12 @@ stdenv.mkDerivation rec {

buildInputs = [ freetype harfbuzz libiconv ] ++ lib.optional enableGUI qtbase;

configureFlags = lib.optional (!enableGUI) "--with-qt=no";
configureFlags = (if enableGUI then "--with-qt=${qtbase}/lib" else "--with-qt=no");
Copy link
Member

Choose a reason for hiding this comment

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

Perhaps:

configureFlags = [ ''--with-qt=${if enableGUI then "${qtbase}/lib" else "no"}'' ];

@bkchr
Copy link
Contributor Author

bkchr commented Jan 2, 2018

They released a new version, I will update the package to use that. So, please not merge now!

@bkchr bkchr changed the title ttfautohint: Fixes build with Qt5.10 ttfautohint: 1.7 -> 1.8.1 Jan 2, 2018
@bkchr
Copy link
Contributor Author

bkchr commented Jan 2, 2018

@yegortimoshenko updated to 1.8.1 and that also fixes the compilation with qt5.10 :)

@lukateras
Copy link
Member

@GrahamcOfBorg build ttfautohint

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Failure for system: x86_64-darwin

    linked by target "mariadbclient" in directory /tmp/nix-build-mariadb-connector-c-2.3.4.drv-0/mariadb-connector-c-2.3.4-src/libmariadb
    linked by target "libmariadb" in directory /tmp/nix-build-mariadb-connector-c-2.3.4.drv-0/mariadb-connector-c-2.3.4-src/libmariadb

-- Configuring incomplete, errors occurred!
See also "/tmp/nix-build-mariadb-connector-c-2.3.4.drv-0/mariadb-connector-c-2.3.4-src/build/CMakeFiles/CMakeOutput.log".
See also "/tmp/nix-build-mariadb-connector-c-2.3.4.drv-0/mariadb-connector-c-2.3.4-src/build/CMakeFiles/CMakeError.log".
builder for ‘/nix/store/91q9srsmgza1x00r6khvj2i9lq2adwlw-mariadb-connector-c-2.3.4.drv’ failed with exit code 1
cannot build derivation ‘/nix/store/39ph34dihy7iyhmzh8j665il5jmvqggs-qtbase-5.9.3.drv’: 1 dependencies couldn't be built
cannot build derivation ‘/nix/store/78asf7f9z24cn1rdfsjnbjlpci04l50k-ttfautohint-1.8.1.drv’: 1 dependencies couldn't be built
error: build of ‘/nix/store/78asf7f9z24cn1rdfsjnbjlpci04l50k-ttfautohint-1.8.1.drv’ failed

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-linux

shrinking /nix/store/yzrgknj8fw704l8y9i8cxd1igld5g3s9-ttfautohint-1.8.1/bin/ttfautohint
shrinking /nix/store/yzrgknj8fw704l8y9i8cxd1igld5g3s9-ttfautohint-1.8.1/bin/ttfautohintGUI
shrinking /nix/store/yzrgknj8fw704l8y9i8cxd1igld5g3s9-ttfautohint-1.8.1/lib/libttfautohint.so.1.0.0
strip is /nix/store/wxn5gn8amxm1w0ikcx4gbs8a17wvss4j-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/yzrgknj8fw704l8y9i8cxd1igld5g3s9-ttfautohint-1.8.1/lib  /nix/store/yzrgknj8fw704l8y9i8cxd1igld5g3s9-ttfautohint-1.8.1/bin 
patching script interpreter paths in /nix/store/yzrgknj8fw704l8y9i8cxd1igld5g3s9-ttfautohint-1.8.1
checking for references to /tmp/nix-build-ttfautohint-1.8.1.drv-0 in /nix/store/yzrgknj8fw704l8y9i8cxd1igld5g3s9-ttfautohint-1.8.1...
postPatchMkspecs
postMoveQtStaticLibs
/nix/store/yzrgknj8fw704l8y9i8cxd1igld5g3s9-ttfautohint-1.8.1

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: aarch64-linux

shrinking /nix/store/f3ib9qf15van5zfd9fyysm3z7l33g25v-ttfautohint-1.8.1/bin/ttfautohintGUI
shrinking /nix/store/f3ib9qf15van5zfd9fyysm3z7l33g25v-ttfautohint-1.8.1/bin/ttfautohint
shrinking /nix/store/f3ib9qf15van5zfd9fyysm3z7l33g25v-ttfautohint-1.8.1/lib/libttfautohint.so.1.0.0
strip is /nix/store/c6qj0j45xizkrx58i65j75a5ysmqhgrs-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/f3ib9qf15van5zfd9fyysm3z7l33g25v-ttfautohint-1.8.1/lib  /nix/store/f3ib9qf15van5zfd9fyysm3z7l33g25v-ttfautohint-1.8.1/bin
patching script interpreter paths in /nix/store/f3ib9qf15van5zfd9fyysm3z7l33g25v-ttfautohint-1.8.1
checking for references to /build in /nix/store/f3ib9qf15van5zfd9fyysm3z7l33g25v-ttfautohint-1.8.1...
postPatchMkspecs
postMoveQtStaticLibs
/nix/store/f3ib9qf15van5zfd9fyysm3z7l33g25v-ttfautohint-1.8.1

@lukateras lukateras merged commit c4899f4 into NixOS:master Jan 5, 2018

buildInputs = [ freetype harfbuzz libiconv ] ++ lib.optional enableGUI qtbase;

configureFlags = lib.optional (!enableGUI) "--with-qt=no";
configureFlags = [ ''--with-qt=${if enableGUI then "${qtbase}/lib" else "no"}'' ];
Copy link
Contributor

Choose a reason for hiding this comment

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

Is the change to configureFlags necessary?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No I don't think so. Any problems with that change?

Copy link
Contributor

Choose a reason for hiding this comment

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

No, but it looks suspicious.

I have little time to review at the moment, but I noticed this PR due to the darwin build failure, whereas I knew that ttfautohint GUI used to work on darwin. I understand that master is in the bad shape now, but in general I expect that PRs that fail to build on the declared platforms are not merged. I had to fix mysql.connector-c in b41e5ec and ttfautohint in d1204e6.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ohh sorry! I did not wanted to break stuff on Mac Os. I thought that the package failed before also :(
The problem is that I have no Mac Os and can not do any debuggin/fixing :/

Copy link
Member

Choose a reason for hiding this comment

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

@orivej: sorry!

orivej added a commit that referenced this pull request Jan 5, 2018
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

4 participants