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

fontconfig: 2.12.6 -> 2.13.92 #73795

Open
wants to merge 2 commits into
base: staging
from

Conversation

@worldofpeace
Copy link
Member

worldofpeace commented Nov 20, 2019

Motivation for this change

This currently fails to build at postInstall with

/nix/store/hmqnlh2nvjc4893bxyr0n9i3zyvsh5c3-fontconfig-2.13.92/share/xml/fontconfig/fonts.dtd:127: parser error : xmlParseElementDecl: 'EMPTY', 'ANY' or '(' expected
<!ELEMENT reset-dirs >
                     ^
/nix/store/hmqnlh2nvjc4893bxyr0n9i3zyvsh5c3-fontconfig-2.13.92/share/xml/fontconfig/fonts.dtd:127: parser error : Content error in the external subset
<!ELEMENT reset-dirs >
                     ^
unable to parse /nix/store/hmqnlh2nvjc4893bxyr0n9i3zyvsh5c3-fontconfig-2.13.92/etc/fonts/fonts.conf
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

@worldofpeace

This comment has been minimized.

Copy link
Member Author

worldofpeace commented Nov 20, 2019

@jtojnar

This comment has been minimized.

Copy link
Contributor

jtojnar commented Nov 20, 2019

The DTD looks wrong. The element should have EMPTY as a content specifier.

@worldofpeace worldofpeace force-pushed the worldofpeace:fontconfig-2.13.92 branch from bcef530 to d4e5d2c Nov 20, 2019
@worldofpeace worldofpeace marked this pull request as ready for review Nov 20, 2019
@worldofpeace

This comment has been minimized.

Copy link
Member Author

worldofpeace commented Nov 20, 2019

Un-drafted because it isn't broke anymore. Thanks @jtojnar for the quick patch

@worldofpeace worldofpeace force-pushed the worldofpeace:fontconfig-2.13.92 branch from d4e5d2c to 4c06aab Nov 20, 2019
@worldofpeace worldofpeace changed the base branch from master to staging Nov 20, 2019
@jtojnar

This comment has been minimized.

Copy link
Contributor

jtojnar commented Nov 20, 2019

What is wrong with our current version? Is not x.13 unstable? x.y.92, I would definitely expect to be.

@worldofpeace

This comment has been minimized.

Copy link
Member Author

worldofpeace commented Nov 20, 2019

What is wrong with our current version? Is not x.13 unstable? x.y.92, I would definitely expect to be.

Yes it is a development release, but I'd really like to get it tested while still very early in 20.03 dev.

@worldofpeace

This comment has been minimized.

Copy link
Member Author

worldofpeace commented Nov 20, 2019

@jtojnar Though stable is actually 2.13.1

@sauyon

This comment has been minimized.

Copy link
Member

sauyon commented Nov 20, 2019

I think fontconfig made breaking configuration changes in 2.13, so maybe configVersion should be bumped?

@worldofpeace

This comment has been minimized.

Copy link
Member Author

worldofpeace commented Nov 22, 2019

I think fontconfig made breaking configuration changes in 2.13, so maybe configVersion should be bumped?

I guess that would be adding a new element. However, I'm not certain how this works in the first place in nixpkgs. Why do we have fontconfig 2.10?

@worldofpeace

This comment has been minimized.

Copy link
Member Author

worldofpeace commented Nov 22, 2019

Ah, I see it's backported to generate font caches

  # back-supported fontconfig version and package
  # version is used for font cache generation
  supportVersion = "210";
  supportPkg     = pkgs."fontconfig_${supportVersion}";

  # latest fontconfig version and package
  # version is used for configuration folder name, /etc/fonts/VERSION/
  # note: format differs from supportVersion and can not be used with makeCacheConf
  latestVersion  = pkgs.fontconfig.configVersion;
  latestPkg      = pkgs.fontconfig;

Reading #4410 was a good reference.
Not sure how to determine what this means for non-NixOS and fontconfig 2.10.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.