pyrox.dev
Inkscape: Work around libpng's unhappiness.
svn path=/nixpkgs/trunk/; revision=13873
+4
pkgs/applications/graphics/inkscape/configure-python-libs.patch
+4
pkgs/applications/graphics/inkscape/configure-python-libs.patch
···
1
+
Work around Python misdetection and set `PYTHON_LIBS' to
2
+
"-L/nix/store/... -lpython2.4" instead of "/nix/store/.../libpython2.4.so".
3
+
Changed to 2.5.
4
+
1
5
--- inkscape-0.45.1/configure 2007-03-20 14:56:43.000000000 +0100
2
6
+++ inkscape-0.45.1/configure 2008-02-22 16:19:10.000000000 +0100
3
7
@@ -10202,7 +10202,7 @@ if test "x$with_python" = "xyes"; then
+1
-4
pkgs/applications/graphics/inkscape/default.nix
+1
-4
pkgs/applications/graphics/inkscape/default.nix
···
8
8
sha256 = "0flrjqa68vnnn8lrhj86xpa6h2cyzrvjy6873v9id092f86ix1li";
9
9
};
10
10
11
-
# Work around Python misdetection and set `PYTHON_LIBS' to
12
-
# "-L/nix/store/... -lpython2.4" instead of "/nix/store/.../libpython2.4.so".
13
-
# Changed to 2.5
14
-
patches = [ ./configure-python-libs.patch ];
11
+
patches = [ ./configure-python-libs.patch ./libpng-setjmp.patch ];
15
12
16
13
propagatedBuildInputs = [
17
14
# Python is used at run-time to execute scripts, e.g., those from
+62
pkgs/applications/graphics/inkscape/libpng-setjmp.patch
+62
pkgs/applications/graphics/inkscape/libpng-setjmp.patch
···
1
+
Include <png.h> as early as possible to make sure <setjmp.h> is not
2
+
included before it.
3
+
4
+
See http://thread.gmane.org/gmane.linux.distributions.nixos/1501 .
5
+
6
+
--- inkscape-0.46/src/sp-image.cpp 2008-03-11 05:19:56.000000000 +0100
7
+
+++ inkscape-0.46/src/sp-image.cpp 2009-01-26 15:34:33.000000000 +0100
8
+
@@ -17,6 +17,8 @@
9
+
# include "config.h"
10
+
#endif
11
+
12
+
+#include <png.h>
13
+
+
14
+
#include <cstring>
15
+
#include <string>
16
+
#include <libnr/nr-matrix-fns.h>
17
+
@@ -41,7 +43,6 @@
18
+
#include "libnr/nr-matrix-fns.h"
19
+
20
+
#include "io/sys.h"
21
+
-#include <png.h>
22
+
#if ENABLE_LCMS
23
+
#include "color-profile-fns.h"
24
+
#include "color-profile.h"
25
+
26
+
--- inkscape-0.46/src/dialogs/export.cpp 2008-03-11 05:19:54.000000000 +0100
27
+
+++ inkscape-0.46/src/dialogs/export.cpp 2009-01-26 17:01:13.000000000 +0100
28
+
@@ -20,6 +20,7 @@
29
+
# include "config.h"
30
+
#endif
31
+
32
+
+#include <png.h>
33
+
#include <gtk/gtk.h>
34
+
#include <gtkmm/box.h>
35
+
#include <gtkmm/buttonbox.h>
36
+
@@ -60,7 +61,6 @@
37
+
#include "io/sys.h"
38
+
39
+
#include "helper/png-write.h"
40
+
-#include <png.h>
41
+
42
+
43
+
#define SP_EXPORT_MIN_SIZE 1.0
44
+
45
+
--- inkscape-0.46/src/main.cpp 2008-03-11 05:20:50.000000000 +0100
46
+
+++ inkscape-0.46/src/main.cpp 2009-01-26 17:57:12.000000000 +0100
47
+
@@ -26,6 +26,7 @@
48
+
#ifdef HAVE_CONFIG_H
49
+
# include "config.h"
50
+
#endif
51
+
+#include <png.h>
52
+
#include "path-prefix.h"
53
+
54
+
#include <gtk/gtkmessagedialog.h>
55
+
@@ -111,7 +112,6 @@ using Inkscape::Extension::Internal::Pri
56
+
57
+
#include "main-cmdlineact.h"
58
+
59
+
-#include <png.h>
60
+
#include <errno.h>
61
+
62
+
enum {