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

kakasi: avoid an implicit declaration of exit #368909

Merged
merged 2 commits into from
Dec 29, 2024
Merged

Conversation

paveloom
Copy link
Member

@paveloom paveloom commented Dec 28, 2024

This caused the following false alarm:

error: can not use EUC-JP or UTF-8 encoding on iconv

See https://git.launchpad.net/ubuntu/+source/kakasi/commit/?h=applied/ubuntu/plucky&id=08f53a5.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@emilazy
Copy link
Member

emilazy commented Dec 28, 2024

Better to:

  • Use fetchurl with the original source of the patch, https://src.fedoraproject.org/rpms/kakasi/raw/4756771349822d4ccd4d74a6ce70040ca57084cb/f/kakasi-configure-c99.patch;

  • Use autoreconfHook in nativeBuildInputs to get configure regenerated automatically from configure.in.

@SFrijters
Copy link
Member

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 368909


x86_64-linux

✅ 7 packages built:
  • kakasi
  • quodlibet-full
  • quodlibet-full.dist
  • quodlibet-full.doc
  • quodlibet-xine-full
  • quodlibet-xine-full.dist
  • quodlibet-xine-full.doc

@teto
Copy link
Member

teto commented Dec 29, 2024

this fixes the build of me. I've discovered the software thanks to this PR.
I have some trouble to make it work though: how can one convert kanjis into kanas ?
echo "猟" | result/bin/kakasi -k or result/bin/kakasi -k 猟 does nothing for me.

As a sidenote, this PR could be an occasion to fix the warning:

substituteStream() in derivation kakasi-2.3.6: WARNING: '--replace' is deprecated, use --replace-{fail,warn,quiet}. (file 'tests/kakasi-1')
substituteStream() in derivation kakasi-2.3.6: WARNING: pattern /bin/echo doesn't match anything in file 'tests/kakasi-2'
substituteStream() in derivation kakasi-2.3.6: WARNING: pattern /bin/echo doesn't match anything in file 'tests/kakasi-3'
substituteStream() in derivation kakasi-2.3.6: WARNING: pattern /bin/echo doesn't match anything in file 'tests/kakasi-8'
substituteStream() in derivation kakasi-2.3.6: WARNING: pattern /bin/echo doesn't match anything in file 'tests/kakasi-9'

@paveloom
Copy link
Member Author

Copy link
Member

@emilazy emilazy left a comment

Choose a reason for hiding this comment

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

Looks good, thanks.

pkgs/by-name/ka/kakasi/package.nix Outdated Show resolved Hide resolved
@emilazy emilazy merged commit cea53d9 into NixOS:master Dec 29, 2024
23 of 24 checks passed
@paveloom paveloom deleted the kakasi branch December 29, 2024 18:26
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.

5 participants