ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-26 23:27:29 +03:00
Code Issues Projects Releases Wiki Activity

k3d: move patches into source

Browse Source
This commit is contained in:
Domen Kožar 2014-08-23 11:39:05 +02:00
parent 01cc5a98d6
commit bd32f323d8
6 changed files with 121 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/graphics/k3d/debian-patches.nix
View File

@ -1,14 +0,0 @@
# Generated by debian-patches.sh from debian-patches.txt
let
prefix = "http://patch-tracker.debian.org/patch/series/dl/k3d/0.8.0.2-18";
in
[
{
url = "${prefix}/disable_mutable_in_boost_gil.patch";
sha256 = "037l86h2hszqgw8arqpzprz5qvngsb61i7lpww617mkvqrc4hiq3";
}
{
url = "${prefix}/k3d_gtkmm224.patch";
sha256 = "1c7z2zkqs9qw185q7bhz6vvzl6vlf1zpg9vlhc1f0cz9rgak3gji";
}
]

3
pkgs/applications/graphics/k3d/debian-patches.txt
View File

@ -1,3 +0,0 @@
k3d/0.8.0.2-15
disable_mutable_in_boost_gil.patch
k3d_gtkmm224.patch

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

@ -12,11 +12,13 @@ stdenv.mkDerivation rec {
sha256 = "01fd2qb0zddif3wz1a2wdmwyzn81cf73678qp2gjs8iikmdz6w7x";
};
patches = map fetchurl ((import ./debian-patches.nix) ++
[ {
url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-gfx/k3d/files/k3d-0.7.11.0-libpng14.patch;
sha256 = "1vl7dbvxg9b54ay0n8dd2v2k3j001h8h1bpr1cbm3vrzv31lnwzx";
} ]);
patches = [
# debian package source
./disable_mutable_in_boost_gil.patch
./k3d_gtkmm224.patch
# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-gfx/k3d/files/k3d-0.7.11.0-libpng14.patch
./k3d-0.7.11.0-libpng14.patch
];
preConfigure = ''
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib"

20
pkgs/applications/graphics/k3d/disable_mutable_in_boost_gil.patch Normal file
View File

@ -0,0 +1,20 @@
--- a/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp
+++ b/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp
@@ -114,7 +114,7 @@
template <typename T2, typename Op>
struct reduce_bind1 {
const T2& _t2;
- mutable Op& _op;
+ Op& _op;
typedef typename Op::result_type result_type;
@@ -127,7 +127,7 @@
struct reduce_bind2 {
const Bits1& _bits1;
std::size_t _index1;
- mutable Op& _op;
+ Op& _op;
typedef typename Op::result_type result_type;

54
pkgs/applications/graphics/k3d/k3d-0.7.11.0-libpng14.patch Normal file
View File

@ -0,0 +1,54 @@
diff -ur k3d-source-0.7.11.0.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp
--- k3d-source-0.7.11.0.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp 2009-03-19 22:28:53.000000000 +0200
+++ k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp 2010-05-12 12:21:50.000000000 +0300
@@ -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))) {

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

@ -0,0 +1,40 @@
--- 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);