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

Updating to the latest cinepaint. I haven't checked thoroughly the bunch of

Browse Source 
dependencies, whether any is no more needed in the update.

svn path=/nixpkgs/trunk/; revision=15778
This commit is contained in:
Lluís Batlle i Rossell 2009-05-28 21:57:05 +00:00
parent 5239d4b26b
commit 6175b1d633
3 changed files with 21 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkgs/applications/graphics/cinepaint/default.nix
View File

@ -1,36 +1,36 @@
{ stdenv, fetchurl, pkgconfig, gtk, freetype, fontconfig, lcms, fltk,
{ stdenv, fetchcvs, cmake, pkgconfig, gtk, freetype, fontconfig, lcms, fltk,
flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11,
perlXMLParser, python, pygtk, gettext, intltool, babl, gegl,
glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr,
mesa, libXext, libXpm, libXxf86vm } :
mesa, libXext, libXpm, libXxf86vm, automake, autoconf, libtool } :
stdenv.mkDerivation {
name = "cinepaint-0.22-1";
name = "cinepaint-0.25.0";
src = fetchurl {
url = mirror://sourceforge/cinepaint/cinepaint-0.22-1.tar.gz;
sha256 = "bb08a9210658959772df12408769d660999ede168b7431514e1f3cead07c0fea";
# The developer told me this cvs fetch is 0.25.0
src = fetchcvs {
cvsRoot = ":pserver:anonymous@cinepaint.cvs.sourceforge.net:/cvsroot/cinepaint";
module = "cinepaint-project";
date = "2004-03-01";
sha256 = "bf6dc04f3ea2094b7ef6f87f40f2c90d75a557e40a773f8eb76e8a71f14362cf";
};
buildInputs = [ pkgconfig gtk freetype fontconfig lcms fltk flex libtiff
buildInputs = [ cmake pkgconfig gtk freetype fontconfig lcms fltk flex libtiff
libjpeg libpng libexif zlib perl libX11 perlXMLParser python pygtk gettext
intltool babl gegl glib makedepend xf86vidmodeproto xineramaproto libXmu
openexr mesa libXext libXpm libXxf86vm ];
openexr mesa libXext libXpm libXxf86vm automake autoconf libtool ];
patches = [ ./fltk.patch ];
dontUseCmakeConfigure = 1;
prePatch = ''
sed -i -e s@/usr/X11R6/bin/makedepend@${makedepend}/bin/makedepend@ \
-e s@/usr/X11R6/include/X11/extensions/xf86vmode@${xf86vidmodeproto}/include/X11/extensions/xf86vmode@ \
-e s@/usr/X11R6/include/X11/Xlib.h@${libX11}/include/X11/Xlib.h@ \
-e s@/usr/X11R6/include/X11/extensions/Xinerama.h@${xineramaproto}/include/X11/extensions/Xinerama.h@ \
-e s@/usr/X11R6/lib/libfreetype.a@${freetype}/lib/libfreetype.a@ \
plug-ins/icc_examin/icc_examin/configure \
plug-ins/icc_examin/icc_examin/configure.sh
NIX_CFLAGS_COMPILE = "-I.";
configurePhase = ''
cd cinepaint
chmod 0777 autogen.sh
./autogen.sh
./configure --prefix=$out
'';
configureFlags = [ "--disable-print" "--enable-gtk2" ];
meta = {
homepage = http://www.cinepaint.org/;
license = "free";

13
pkgs/applications/graphics/cinepaint/fltk.patch
View File

@ -1,13 +0,0 @@
diff --git a/plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp b/plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp
index b507454..85f4441 100644
--- a/plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp
+++ b/plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp
@@ -226,7 +226,7 @@ namespace icc_examin_ns {
int awake(void)
{
- Fl::awake(0);
+ Fl::awake((void *)0);
return 0;
}
int leerWait(void) { return 0; }

4
pkgs/top-level/all-packages.nix
View File

@ -5871,9 +5871,9 @@ let
};
cinepaint = import ../applications/graphics/cinepaint {
inherit stdenv fetchurl pkgconfig freetype fontconfig lcms flex libtiff
inherit stdenv fetchcvs cmake pkgconfig freetype fontconfig lcms flex libtiff
libjpeg libpng libexif zlib perl mesa perlXMLParser python pygtk gettext
intltool babl gegl;
intltool babl gegl automake autoconf libtool;
inherit (xlibs) makedepend libX11 xf86vidmodeproto xineramaproto libXmu
libXext libXpm libXxf86vm;
inherit (gtkLibs) gtk glib;