about summary refs log tree commit diff
path: root/pkgs/applications/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r--pkgs/applications/graphics/geeqie/default.nix2
-rw-r--r--pkgs/applications/graphics/gimp/2.8.nix4
-rw-r--r--pkgs/applications/graphics/grafx2/default.nix2
-rw-r--r--pkgs/applications/graphics/jbrout/default.nix2
-rw-r--r--pkgs/applications/graphics/k3d/debian-patches.nix14
-rw-r--r--pkgs/applications/graphics/k3d/debian-patches.txt3
-rw-r--r--pkgs/applications/graphics/k3d/default.nix12
-rw-r--r--pkgs/applications/graphics/k3d/disable_mutable_in_boost_gil.patch20
-rw-r--r--pkgs/applications/graphics/k3d/k3d-0.7.11.0-libpng14.patch54
-rw-r--r--pkgs/applications/graphics/k3d/k3d_gtkmm224.patch40
-rw-r--r--pkgs/applications/graphics/ocrad/default.nix2
-rw-r--r--pkgs/applications/graphics/qiv/default.nix2
-rw-r--r--pkgs/applications/graphics/synfigstudio/default.nix8
-rw-r--r--pkgs/applications/graphics/ufraw/default.nix2
-rw-r--r--pkgs/applications/graphics/viewnior/default.nix2
-rw-r--r--pkgs/applications/graphics/xaos/default.nix2
16 files changed, 137 insertions, 34 deletions
diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix
index b170b784aaa4..de906e3d8443 100644
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/pkgs/applications/graphics/geeqie/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     '';
 
   meta = {
-    description = "Geeqie, a lightweight GTK+ based image viewer";
+    description = "Lightweight GTK+ based image viewer";
 
     longDescription =
       ''
diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index aca4d822c820..bd155c59c6b2 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -4,11 +4,11 @@
 , python, pygtk, libart_lgpl, libexif, gettext, xlibs, wrapPython }:
 
 stdenv.mkDerivation rec {
-  name = "gimp-2.8.10";
+  name = "gimp-2.8.14";
 
   src = fetchurl {
     url = "http://download.gimp.org/pub/gimp/v2.8/${name}.tar.bz2";
-    sha256 = "1rha8yx0pplfjziqczjrxxp16vsvpmb5ziq3c218s4w9z4cqpzg7";
+    sha256 = "d82a958641c9c752d68e35f65840925c08e314cea90222ad845892a40e05b22d";
   };
 
   buildInputs =
diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix
index 6b7c9a27694a..ee9df683c0a2 100644
--- a/pkgs/applications/graphics/grafx2/default.nix
+++ b/pkgs/applications/graphics/grafx2/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   installPhase = ''make install prefix="$out"'';
 
   meta = {
-    description = "GrafX2 is a bitmap paint program inspired by the Amiga programs Deluxe Paint and Brilliance.";
+    description = "Bitmap paint program inspired by the Amiga programs Deluxe Paint and Brilliance";
     homepage = http://code.google.co/p/grafx2/;
     license = stdenv.lib.licenses.gpl2;
     platforms = [ "x86_64-linux" "i686-linux" ];
diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix
index 2207e8884f0c..496078ffdb2e 100644
--- a/pkgs/applications/graphics/jbrout/default.nix
+++ b/pkgs/applications/graphics/jbrout/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage {
   buildInputs = [ python pyGtkGlade makeWrapper pyexiv2 lxml pil fbida which ];
   meta = {
     homepage = "http://code.google.com/p/jbrout";
-    description = "jBrout is a photo manager";
+    description = "Photo manager";
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/graphics/k3d/debian-patches.nix b/pkgs/applications/graphics/k3d/debian-patches.nix
deleted file mode 100644
index cf6b47ee9597..000000000000
--- a/pkgs/applications/graphics/k3d/debian-patches.nix
+++ /dev/null
@@ -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";
-  }
-]
diff --git a/pkgs/applications/graphics/k3d/debian-patches.txt b/pkgs/applications/graphics/k3d/debian-patches.txt
deleted file mode 100644
index a9b4abed2f09..000000000000
--- a/pkgs/applications/graphics/k3d/debian-patches.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-k3d/0.8.0.2-15
-disable_mutable_in_boost_gil.patch
-k3d_gtkmm224.patch
diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix
index 9f31d94ac7fb..35f3bed866d1 100644
--- a/pkgs/applications/graphics/k3d/default.nix
+++ b/pkgs/applications/graphics/k3d/default.nix
@@ -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"
diff --git a/pkgs/applications/graphics/k3d/disable_mutable_in_boost_gil.patch b/pkgs/applications/graphics/k3d/disable_mutable_in_boost_gil.patch
new file mode 100644
index 000000000000..1774328c6186
--- /dev/null
+++ b/pkgs/applications/graphics/k3d/disable_mutable_in_boost_gil.patch
@@ -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;
+ 
diff --git a/pkgs/applications/graphics/k3d/k3d-0.7.11.0-libpng14.patch b/pkgs/applications/graphics/k3d/k3d-0.7.11.0-libpng14.patch
new file mode 100644
index 000000000000..b54168227b40
--- /dev/null
+++ b/pkgs/applications/graphics/k3d/k3d-0.7.11.0-libpng14.patch
@@ -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))) {
diff --git a/pkgs/applications/graphics/k3d/k3d_gtkmm224.patch b/pkgs/applications/graphics/k3d/k3d_gtkmm224.patch
new file mode 100644
index 000000000000..2484994531f0
--- /dev/null
+++ b/pkgs/applications/graphics/k3d/k3d_gtkmm224.patch
@@ -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);
+ 
diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix
index 4c20a41061ae..201b59ad5e12 100644
--- a/pkgs/applications/graphics/ocrad/default.nix
+++ b/pkgs/applications/graphics/ocrad/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    description = "GNU Ocrad, optical character recognition (OCR) program & library";
+    description = "Optical character recognition (OCR) program & library";
 
     longDescription =
       '' GNU Ocrad is an OCR (Optical Character Recognition) program based on
diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix
index 86891f2cb937..01b0a1414a74 100644
--- a/pkgs/applications/graphics/qiv/default.nix
+++ b/pkgs/applications/graphics/qiv/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (rec {
   '';
 
   meta = {
-    description = "qiv (quick image viewer)";
+    description = "Quick image viewer";
     homepage = http://spiegl.de/qiv/;
     inherit version;
   };
diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix
index 034a147b7874..ba7a916e3fe4 100644
--- a/pkgs/applications/graphics/synfigstudio/default.nix
+++ b/pkgs/applications/graphics/synfigstudio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, cairo, gettext, glibmm, gtk, gtkmm
+{ stdenv, fetchurl, boost, cairo, fontsConf, gettext, glibmm, gtk, gtkmm
 , libsigcxx, libtool, libxmlxx, pango, pkgconfig, imagemagick
 , intltool
 }:
@@ -42,10 +42,14 @@ stdenv.mkDerivation rec {
     };
 
   buildInputs = [
-    ETL boost cairo gettext glibmm gtk gtkmm imagemagick intltool
+    ETL boost cairo fontsConf gettext glibmm gtk gtkmm imagemagick intltool
     intltool libsigcxx libtool libxmlxx pkgconfig synfig
   ];
 
+  preBuild = ''
+    export FONTCONFIG_FILE=${fontsConf}
+  '';
+
   meta = with stdenv.lib; {
     description = "A 2D animation program";
     homepage = http://www.synfig.org;
diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix
index 783832abd003..dbfda4e58195 100644
--- a/pkgs/applications/graphics/ufraw/default.nix
+++ b/pkgs/applications/graphics/ufraw/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://ufraw.sourceforge.net/;
 
-    description = "UFRaw, a utility to read and manipulate raw images from digital cameras";
+    description = "Utility to read and manipulate raw images from digital cameras";
 
     longDescription =
       '' The Unidentified Flying Raw (UFRaw) is a utility to read and
diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix
index dd8e01298ff4..478553d2c00a 100644
--- a/pkgs/applications/graphics/viewnior/default.nix
+++ b/pkgs/applications/graphics/viewnior/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Viewnior is a fast and simple image viewer for GNU/Linux";
+    description = "Fast and simple image viewer";
     longDescription =
       '' Viewnior is insipred by big projects like Eye of Gnome, because of it's
          usability and richness,and by GPicView, because of it's lightweight design and
diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix
index 8387b3486d4d..cacefc9bcc12 100644
--- a/pkgs/applications/graphics/xaos/default.nix
+++ b/pkgs/applications/graphics/xaos/default.nix
@@ -28,7 +28,7 @@ rec {
   name = "xaos-" + version;
   meta = {
     homepage = http://xaos.sourceforge.net/;
-    description = "XaoS - fractal viewer";
+    description = "Fractal viewer";
     license = a.stdenv.lib.licenses.gpl2Plus;
   };
 }
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-08-07 01:49:18 +0000