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

k3d: 0.8.0.2 -> 0.8.03

Browse Source
This commit is contained in:
Domen Kožar 2014-09-23 11:33:30 +02:00
parent d3d889eaef
commit 6e3114a8a3
4 changed files with 11 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/applications/graphics/k3d/default.nix
View File

@ -1,31 +1,27 @@
{stdenv, fetchurl
{ stdenv, fetchurl, unzip, ftgl, glew, asciidoc
, cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype
, libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff
, gettext, intltool, perl, gtkmm, glibmm, gtkglext, pangox_compat, libXmu
}:
, gettext, intltool, perl, gtkmm, glibmm, gtkglext, pangox_compat, libXmu }:
stdenv.mkDerivation rec {
version = "0.8.0.2";
version = "0.8.0.3";
name = "k3d-${version}";
src = fetchurl {
url = "mirror://sourceforge/k3d/k3d-source-0.8.0.2.tar.bz2";
sha256 = "01fd2qb0zddif3wz1a2wdmwyzn81cf73678qp2gjs8iikmdz6w7x";
url = "https://github.com/K-3D/k3d/archive/${name}.zip";
sha256 = "09ywwvlk8hh1357pnal96kc40ma4jq7776hqk0609rgz13s6babp";
};
patches = [
./k3d_gtkmm224.patch
./libpng-1.4.patch
];
cmakeFlags = "-DK3D_BUILD_DOCS=false -DK3D_BUILD_GUIDE=false";
preConfigure = ''
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fpermissive -I$(echo ${gtkglext}/include/gtkglext-*) -I$(echo ${gtkglext}/lib/gtkglext-*/include)"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${gtkglext}/include/gtkglext-*) -I$(echo ${gtkglext}/lib/gtkglext-*/include)"
'';
buildInputs = [
cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng
boost boost.lib doxygen cairomm pkgconfig imagemagick libjpeg libtiff
gettext intltool perl
boost boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff
gettext intltool perl unzip ftgl glew asciidoc
gtkmm glibmm gtkglext pangox_compat libXmu
];

40
pkgs/applications/graphics/k3d/k3d_gtkmm224.patch
View File

@ -1,40 +0,0 @@
--- a/k3dsdk/ngui/main_document_window.cpp
+++ b/k3dsdk/ngui/main_document_window.cpp
@@ -1371,7 +1371,7 @@
Gtk::HBox import_box(false, 5);
Gtk::Label import_label(_("Choose import plugin:"));
- Gtk::ComboBox import_combo(model);
+ Gtk::ComboBox import_combo((Glib::RefPtr<Gtk::TreeModel> &) model);
import_combo.pack_start(columns.icon, false);
import_combo.pack_start(columns.label);
import_combo.set_active(0);
@@ -1461,7 +1461,7 @@
Gtk::HBox export_box(false, 5);
Gtk::Label export_label(_("Choose export plugin:"));
- Gtk::ComboBox export_combo(model);
+ Gtk::ComboBox export_combo((Glib::RefPtr<Gtk::TreeModel> &) model);
export_combo.pack_start(columns.icon, false);
export_combo.pack_start(columns.label);
export_combo.set_active(0);
--- a/k3dsdk/ngui/render.cpp
+++ b/k3dsdk/ngui/render.cpp
@@ -169,7 +169,7 @@
row[columns.separator] = false;
}
- Gtk::ComboBox combo(model);
+ Gtk::ComboBox combo((Glib::RefPtr<Gtk::TreeModel> &) model);
combo.pack_start(columns.icon, false);
@@ -295,7 +295,7 @@
row[columns.separator] = false;
}
- Gtk::ComboBox combo(model);
+ Gtk::ComboBox combo((Glib::RefPtr<Gtk::TreeModel> &) model);
combo.pack_start(columns.icon, false);

53
pkgs/applications/graphics/k3d/libpng-1.4.patch
View File

@ -1,53 +0,0 @@
--- k3d-source-0.8.0.1/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp 2010-04-18 13:49:33.000000000 +0800
+++ k3d-source-0.8.0.1-patched/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp 2010-06-10 21:17:51.555920268 +0800
@@ -148,12 +148,12 @@
// allocate/initialize the image information data
_info_ptr = png_create_info_struct(_png_ptr);
if (_info_ptr == NULL) {
- png_destroy_read_struct(&_png_ptr,png_infopp_NULL,png_infopp_NULL);
+ png_destroy_read_struct(&_png_ptr,NULL,NULL);
io_error("png_get_file_size: fail to call png_create_info_struct()");
}
if (setjmp(png_jmpbuf(_png_ptr))) {
//free all of the memory associated with the png_ptr and info_ptr
- png_destroy_read_struct(&_png_ptr, &_info_ptr, png_infopp_NULL);
+ png_destroy_read_struct(&_png_ptr, &_info_ptr, NULL);
io_error("png_get_file_size: fail to call setjmp()");
}
png_init_io(_png_ptr, get());
@@ -165,7 +165,7 @@
png_reader(const char* filename) : file_mgr(filename, "rb") { init(); }
~png_reader() {
- png_destroy_read_struct(&_png_ptr,&_info_ptr,png_infopp_NULL);
+ png_destroy_read_struct(&_png_ptr,&_info_ptr,NULL);
}
point2<std::ptrdiff_t> get_dimensions() {
return point2<std::ptrdiff_t>(png_get_image_width(_png_ptr,_info_ptr),
@@ -177,7 +177,7 @@
int bit_depth, color_type, interlace_type;
png_get_IHDR(_png_ptr, _info_ptr,
&width, &height,&bit_depth,&color_type,&interlace_type,
- int_p_NULL, int_p_NULL);
+ (int *) NULL, (int *) NULL);
io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height),
"png_read_view: input view size does not match PNG file size");
@@ -219,7 +219,7 @@
int bit_depth, color_type, interlace_type;
png_get_IHDR(_png_ptr, _info_ptr,
&width, &height,&bit_depth,&color_type,&interlace_type,
- int_p_NULL, int_p_NULL);
+ (int *) NULL, (int *) NULL);
io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height),
"png_reader_color_convert::apply(): input view size does not match PNG file size");
switch (color_type) {
@@ -308,7 +308,7 @@
io_error_if(!_png_ptr,"png_write_initialize: fail to call png_create_write_struct()");
_info_ptr = png_create_info_struct(_png_ptr);
if (!_info_ptr) {
- png_destroy_write_struct(&_png_ptr,png_infopp_NULL);
+ png_destroy_write_struct(&_png_ptr,NULL);
io_error("png_write_initialize: fail to call png_create_info_struct()");
}
if (setjmp(png_jmpbuf(_png_ptr))) {

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

@ -9432,6 +9432,7 @@ let
k3d = callPackage ../applications/graphics/k3d {
inherit (pkgs.gnome2) gtkglext;
boost = boost149;
};
keepnote = callPackage ../applications/office/keepnote {