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

rawtherapee: 5.0-r1 -> 5.0-r1 with gtk3 support #22911

Merged
merged 1 commit into from Mar 20, 2017

Conversation

2chilled
Copy link
Contributor

Motivation for this change

Bugfixes and some improvements.

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
    • Linux
  • 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.

@mention-bot
Copy link

@2chilled, thanks for your PR! By analyzing the history of the files in this pull request, we identified @the-kenny, @viric and @aske to be potential reviewers.

@@ -3,13 +3,13 @@
}:

stdenv.mkDerivation rec {
version = "5.0-r1";
version = "5.0-r1-gtk2";
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not sure if that's a good idea. builtins.versionCompare "5.0-r1-gtk2" "5.0-r1" says the gtk2 version is greater. This will break nix-env -u when the suffix is removed at some point.

@paperdigits
Copy link
Contributor

The GTK2 version of RawTherapee is on life support. It won't be maintained going forward and GTK3 is what is being currently developed and deployed.

Why stick to GTK2?

@the-kenny
Copy link
Contributor

@paperdigits right now it's a workaround. I tried the gtk3 version (it builds fine after replacing a few dependencies) but looks horrible for some reason (missing themes, icons, etc. - I'm not entirely sure what causes this) and I didn't have the time to hunt down these issues.

That said, I'd accept a PR to switch to the gtk3 version any time.

@the-kenny
Copy link
Contributor

@2chilled Any thoughts on my comment earlier? I'm not sure if there's a point in adding this suffix at all - to me it seems like it doesn't provide any benefit (as it doesn't really matter in nixpkgs if a package depends on gtk2 or gtk3 - dependencies are handled transparently)

@paperdigits
Copy link
Contributor

@the-kenny the GTK3 version needs at least GTK 3.22 for the theme to work. I was thinking that the version of GTK was <3.22, but I didn't have time to investigate.

I've been trying to get photography related tools all up-to-date, as I'd like to switch my editing machine to NixOS :)

@the-kenny
Copy link
Contributor

@paperdigits Our rawtherapee is up to date, and I'm sure we can switch to the gtk3 branch at some point :) What other tools are you using in your workflow (personal interest here)?

@paperdigits
Copy link
Contributor

paperdigits commented Feb 23, 2017

@the-kenny Cool, I'm sure we can switch to GTK3 once the GTK+ package gets to 3.22, right now it seems to be at 3.20.

I'm using Darktable, RawTherapee, Hugin/enfuse (which isn't built with openMP/GPU support by default in nix), Geeqie, G'MIC, and GIMP 2.9.x (currently not packaged). Less frequently I use Luminance HDR. I need to get DisplayCAL, and HDR Merge packaged.

If you have interest in photography, please join us at https://discuss.pixls.us -- many devs and users of all sorts of FOSS programs there. Same for you @2chilled, please join us.

@2chilled
Copy link
Contributor Author

Seems like we have support for gtk 3.22 now, so I'll try a gtk3 build.

@the-kenny I'll remove the suffix to keep nix-env -u healthy. Thanks for pointing that out.

@2chilled 2chilled changed the title rawtherapee: 5.0-r1 -> 5.0-r1-gtk2 rawtherapee: 5.0-r1 -> 5.0-r1 with gtk3 support Mar 18, 2017
@2chilled
Copy link
Contributor Author

@the-kenny @paperdigits gtk3 version works and looks very nice on my system!

@the-kenny
Copy link
Contributor

Trying it now!

@the-kenny
Copy link
Contributor

Sorry for the late response. I had to mnually adjust the font size from 10 down to 8, but I'm quite sure that's caused by me using this font size for the gtk2 build (gtk2 likely isn't high-dpi compatible).

LGTM, merging now.

@the-kenny the-kenny merged commit a3b3a7f into NixOS:master Mar 20, 2017
@paperdigits
Copy link
Contributor

@2chilled this is awesome! Thank you!

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

5 participants