public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #16488: rawtherapee: 4.0 -> 4.2

Browse Source
This commit is contained in:
Vladimír Čunát 2016-07-03 17:43:18 +02:00
commit 07139b8c3f
2 changed files with 67 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/applications/graphics/rawtherapee/default.nix
View File

@ -1,21 +1,26 @@
{ stdenv, fetchurl, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau { stdenv, fetchFromGitHub, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau
, libXdmcp, lcms2, libiptcdata, libcanberra, fftw, expat , libXdmcp, lcms2, libiptcdata, libcanberra, fftw, expat, pcre, libsigcxx
, mercurial # Not really needed for anything, but it fails if it does not find 'hg' , mercurial # Not really needed for anything, but it fails if it does not find 'hg'
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "rawtherapee-4.0.10"; name = "rawtherapee-4.2";
src = fetchurl { src = fetchFromGitHub {
url = http://rawtherapee.googlecode.com/files/rawtherapee-4.0.10.tar.xz; owner = "Beep6581";
sha256 = "1ibsdm2kqpw796rcdihnnp67vx0wm1d1bnlzq269r9p01w5s102g"; repo = "RawTherapee";
rev = "4.2";
sha256 = "1v4px239vlmk9l8wbzlvlyni4ns12icxmgfz21m86jkd10pj5dgr";
}; };
buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp
lcms2 libiptcdata mercurial libcanberra fftw expat ]; lcms2 libiptcdata mercurial libcanberra fftw expat pcre libsigcxx ];
# Disable the use of the RAWZOR propietary libraries patchPhase = ''
cmakeFlags = [ "-DWITH_RAWZOR=OFF" ]; patch -p1 < ${./sigc++_fix.patch}
'';
NIX_CFLAGS_COMPILE = "-std=gnu++11 -Wno-deprecated-declarations -Wno-unused-result";
enableParallelBuilding = true; enableParallelBuilding = true;
@ -23,7 +28,7 @@ stdenv.mkDerivation rec {
description = "RAW converter and digital photo processing software"; description = "RAW converter and digital photo processing software";
homepage = http://www.rawtherapee.com/; homepage = http://www.rawtherapee.com/;
license = stdenv.lib.licenses.gpl3Plus; license = stdenv.lib.licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [viric jcumming]; maintainers = with stdenv.lib.maintainers; [viric jcumming mahe];
platforms = with stdenv.lib.platforms; linux; platforms = with stdenv.lib.platforms; linux;
}; };
} }

52
pkgs/applications/graphics/rawtherapee/sigc++_fix.patch Normal file
View File

@ -0,0 +1,52 @@
diff --git a/rtgui/adjuster.cc b/rtgui/adjuster.cc
index f73dd8a..a7a069c 100644
--- a/rtgui/adjuster.cc
+++ b/rtgui/adjuster.cc
@@ -17,7 +17,7 @@
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/
#include "adjuster.h"
-#include <sigc++/class_slot.h>
+#include <sigc++/slot.h>
#include <cmath>
#include "multilangmgr.h"
#include "../rtengine/rtengine.h"
diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc
index 134c0d7..8ce1808 100644
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <sigc++/class_slot.h>
+#include <sigc++/slot.h>
#include "preferences.h"
#include "multilangmgr.h"
#include "splash.h"
diff --git a/rtgui/thresholdadjuster.cc b/rtgui/thresholdadjuster.cc
index 6b41329..19cde25 100644
--- a/rtgui/thresholdadjuster.cc
+++ b/rtgui/thresholdadjuster.cc
@@ -17,7 +17,7 @@
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/
#include "thresholdadjuster.h"
-#include <sigc++/class_slot.h>
+#include <sigc++/slot.h>
#include <cmath>
#include "multilangmgr.h"
#include "../rtengine/rtengine.h"
diff --git a/rtgui/tonecurve.cc b/rtgui/tonecurve.cc
index 2e439e1..5f14200 100644
--- a/rtgui/tonecurve.cc
+++ b/rtgui/tonecurve.cc
@@ -18,7 +18,7 @@
*/
#include "tonecurve.h"
#include "adjuster.h"
-#include <sigc++/class_slot.h>
+#include <sigc++/slot.h>
#include <iomanip>
#include "ppversion.h"
#include "edit.h"