inkscape: 1.0.2 -> 1.1

Reworks:
 * Remove fetchpatch
 * Remove gdl (jtojnar)
 * gtkspell -> gspell (jtojnar)
 * Add pillow to fix jpg export (jtojnar)
 * Remove double-conversion, add substituteInPlace (jtojnar)
This commit is contained in:
Jordan Justen 2021-05-24 21:24:26 -07:00
parent ff8752a603
commit 413d927150
No known key found for this signature in database
GPG Key ID: 37F99F68CAF992EB
2 changed files with 23 additions and 26 deletions

View File

@ -3,22 +3,20 @@
, boost
, cairo
, cmake
, double-conversion
, fetchurl
, fetchpatch
, gettext
, gdl
, ghostscript
, glib
, glib-networking
, glibmm
, gsl
, gspell
, gtk-mac-integration
, gtkmm3
, gtkspell3
, gdk-pixbuf
, imagemagick
, lcms
, lib2geom
, libcdr
, libexif
, libpng
@ -47,16 +45,17 @@ let
(ps: with ps; [
numpy
lxml
pillow
scour
]);
in
stdenv.mkDerivation rec {
pname = "inkscape";
version = "1.0.2";
version = "1.1";
src = fetchurl {
url = "https://media.inkscape.org/dl/resources/file/${pname}-${version}.tar.xz";
sha256 = "sha256-2j4jBRGgjL8h6GcQ0WFFhZT+qHhn6RV7Z+0BoE6ieYo=";
sha256 = "sha256-cebozj/fcC9Z28SidmZeuYLreCKwKbvb7O0t9DAXleY=";
};
# Inkscape hits the ARGMAX when linking on macOS. It appears to be
@ -72,13 +71,6 @@ stdenv.mkDerivation rec {
# e.g., those from the "Effects" menu.
python3 = "${python3Env}/bin/python";
})
# Fix build with glib 2.68
# https://gitlab.com/inkscape/inkscape/-/merge_requests/2790
(fetchpatch {
url = "https://gitlab.com/inkscape/inkscape/-/commit/eb24388f1730918edd9565d9e5d09340ec0b3b08.patch";
sha256 = "d2FHRWcOzi0Vsr6t0MuLu3rWpvhFKuuvoXd4/NKUSJI=";
})
];
postPatch = ''
@ -91,6 +83,10 @@ stdenv.mkDerivation rec {
--replace "call('ps2pdf'" "call('${ghostscript}/bin/ps2pdf'"
patchShebangs share/templates
patchShebangs man/fix-roff-punct
# double-conversion is a dependency of 2geom
substituteInPlace CMakeScripts/DefineDependsandFlags.cmake \
--replace 'find_package(DoubleConversion REQUIRED)' ""
'';
nativeBuildInputs = [
@ -109,8 +105,6 @@ stdenv.mkDerivation rec {
buildInputs = [
boehmgc
boost
double-conversion
gdl
gettext
glib
glib-networking
@ -119,6 +113,7 @@ stdenv.mkDerivation rec {
gtkmm3
imagemagick
lcms
lib2geom
libcdr
libexif
libpng
@ -138,7 +133,7 @@ stdenv.mkDerivation rec {
python3Env
zlib
] ++ lib.optionals (!stdenv.isDarwin) [
gtkspell3
gspell
] ++ lib.optionals stdenv.isDarwin [
cairo
gtk-mac-integration

View File

@ -1,15 +1,17 @@
diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp
index bc6c0ed845..181467834d 100644
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -77,10 +77,10 @@ const std::map<std::string, Script::inte
{ "python", {"python-interpreter", {"pythonw" }}},
@@ -82,10 +82,10 @@ const std::map<std::string, Script::interpreter_t> Script::interpreterTab = {
{ "python", {"python-interpreter", {"pythonw" }}},
#elif defined __APPLE__
{ "perl", {"perl-interpreter", {"perl" }}},
- { "python", {"python-interpreter", {"python3" }}},
+ { "python", {"python-interpreter", {"@python3@" }}},
{ "perl", {"perl-interpreter", {"perl" }}},
- { "python", {"python-interpreter", {"python3" }}},
+ { "python", {"python-interpreter", {"@python3@" }}},
#else
{ "perl", {"perl-interpreter", {"perl" }}},
- { "python", {"python-interpreter", {"python3", "python" }}},
+ { "python", {"python-interpreter", {"@python3@" }}},
{ "perl", {"perl-interpreter", {"perl" }}},
- { "python", {"python-interpreter", {"python3", "python" }}},
+ { "python", {"python-interpreter", {"@python3@" }}},
#endif
{ "python2", {"python2-interpreter", {"python2", "python" }}},
{ "ruby", {"ruby-interpreter", {"ruby" }}},
{ "python2", {"python2-interpreter", {"python2", "python" }}},
{ "ruby", {"ruby-interpreter", {"ruby" }}},