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.

Sign up for GitHub

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

Jump to bottom

epsonscan2: 6.7.63.0 -> 6.7.70.0 #365687

Merged
merged 4 commits into from
Dec 24, 2024
Merged

epsonscan2: 6.7.63.0 -> 6.7.70.0 #365687

merged 4 commits into from
Dec 24, 2024

Conversation

Shawn8901
Copy link
Contributor

@Shawn8901 Shawn8901 commented Dec 16, 2024 •
edited
Loading

Updates epsonscan2 to the latest version. As flathub is not shipping that version is switched patch source from flathub to AUR.
Aside that i updated our build.patch and added a gcc14 patch (as i noticed that epsonscan2 does not build on staging-next).
In addition the icon is now showing correctly when built with withGUI = true;

For testing a scanned a page with a ET-3750 using epsonscan2 GUI.

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.

@Shawn8901 Shawn8901 force-pushed the update-epsonscan2 branch 2 times, most recently from 0397c72 to 3a50217 Compare December 16, 2024 20:38
Shawn8901
Shawn8901 commented Dec 16, 2024
View reviewed changes
pkgs/misc/drivers/epsonscan2/default.nix
})
];

postPatch = ''
rm CMakeCache.txt
Copy link
Contributor Author

@Shawn8901 Shawn8901 Dec 16, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

fyi that is needed as the currents version archive contains that cmake cache file, thus cmake is unhappy about our build system.

Shawn8901
Shawn8901 commented Dec 16, 2024
View reviewed changes
pkgs/misc/drivers/epsonscan2/default.nix Outdated
Comment on lines 133 to 134
convert $src/Resources/Icons/escan2_app.ico -resize 48x48 -delete 1,2,3 $out/share/icons/hicolor/48x48/apps/epsonscan2.png
convert $src/Resources/Icons/escan2_app.ico -resize 128x128 -delete 1,2,3 $out/share/icons/hicolor/128x128/apps/epsonscan2.png
Copy link
Contributor Author

Choose a reason for hiding this comment

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

icons havent worked, as the ico contains multiple resolutions and resulting in multiple pngs after convertion and thus not being named correctly

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Dec 16, 2024
@ofborg ofborg bot requested a review from james-atkins December 17, 2024 06:08
@james-atkins
Copy link
Contributor

Thanks! I pushed PR #358303 a while ago but it hasn't been merged and so this would supersede it. Nice catch with the icons.

@Shawn8901
Copy link
Contributor Author

Shawn8901 commented Dec 19, 2024 •
edited
Loading

Thanks! I pushed PR #358303 a while ago but it hasn't been merged and so this would supersede it. Nice catch with the icons.

ah, i did not see that pr, i was mainly motivated by the compile error with gcc14 (which is an issue on staging-next atm). Should i split that out so that we can cherry-pick that and the icon thing to your pr?

@wegank wegank added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Dec 20, 2024
FliegendeWurst
FliegendeWurst reviewed Dec 20, 2024
View reviewed changes
pkgs/misc/drivers/epsonscan2/default.nix Outdated
(fetchpatch {
url = "https://github.com/flathub/net.epson.epsonscan2/raw/master/patches/epsonscan2-crash.patch";
hash = "sha256-srMxlFfnZuJ3ed5veFcJIiZuW27F/3xOS0yr4ywn4FI=";
url = "https://aur.archlinux.org/cgit/aur.git/plain/0002-Fix-crash.patch?h=epsonscan2";
Copy link
Member

@FliegendeWurst FliegendeWurst Dec 20, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
url = "https://aur.archlinux.org/cgit/aur.git/plain/0002-Fix-crash.patch?h=epsonscan2";
url = "https://aur.archlinux.org/cgit/aur.git/plain/0002-Fix-crash.patch?h=epsonscan2&id=6e422c487f5f3b135df554fde65ab57bc6377159";

Same for other URLs, to ensure the content doesn't change.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i did so, but by keeping the flatpak patch sources, as they also apply correctly on 6.7.70.0 (which i did not even check before).

james-atkins and others added 4 commits December 21, 2024 17:14
@james-atkins @Shawn8901
epsonscan2: move to pkgs/by-name
2d56a18
@james-atkins @Shawn8901
epsonscan2: 6.7.63.0 -> 6.7.70.0
6795953 
Epson doesn't seem to publish a changelog anywhere.
Remove 32-bit version as it is 2024.
@Shawn8901
epsonscan2: use pinned patches, add gcc14 patch
794d4f8
@Shawn8901
epsonscan2: fix not showing icons when built with withGui = true
5ea32c6 
upstream ico file contains multiple resolutions, those need to be deleted
on convert
@Shawn8901
Copy link
Contributor Author

@james-atkins i cherry-picked your bump in here (i hope that was okay), and updated the patches according @FliegendeWurst s (good) suggestion to use patch origins with commit hashes. As the flatpaks 6.7.65.0 patches seem to apply correctly (havent honestly checked after i saw that the had been updated for 6.7.70.0 on archlinux end), i kept the flatpak patches

@Shawn8901 Shawn8901 mentioned this pull request Dec 21, 2024
Closed
13 tasks
@ofborg ofborg bot requested a review from james-atkins December 22, 2024 02:47
@Shawn8901
Copy link
Contributor Author

as staging-next was merged. That becomes an unbreak PR for master (already targets master).

@FliegendeWurst FliegendeWurst merged commit dcbfd14 into NixOS:master Dec 24, 2024
41 of 42 checks passed
@Shawn8901 Shawn8901 deleted the update-epsonscan2 branch December 24, 2024 17:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FliegendeWurst FliegendeWurst FliegendeWurst approved these changes

@james-atkins james-atkins james-atkins approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Shawn8901 @james-atkins @FliegendeWurst @wegank