From 9afd1161e715a7966a1f29bf6626e505ef2a7f2b Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sun, 3 Apr 2016 10:31:52 +0200 Subject: inkscape: fix due to glibmm update --- pkgs/applications/graphics/inkscape/default.nix | 2 ++ .../graphics/inkscape/deprecated-scopedptr.patch | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/applications/graphics/inkscape/deprecated-scopedptr.patch diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 3704ea2f9c41..e009676f2f19 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { sha256 = "06ql3x732x2rlnanv0a8aharsnj91j5kplksg574090rks51z42d"; }; + patches = [ ./deprecated-scopedptr.patch ]; + postPatch = '' patchShebangs share/extensions '' diff --git a/pkgs/applications/graphics/inkscape/deprecated-scopedptr.patch b/pkgs/applications/graphics/inkscape/deprecated-scopedptr.patch new file mode 100644 index 000000000000..94ae901394fa --- /dev/null +++ b/pkgs/applications/graphics/inkscape/deprecated-scopedptr.patch @@ -0,0 +1,16 @@ +glibmm deprecated ScopedPtr +--- +diff -u src/ui/clipboard.cpp src/ui/clipboard.cpp +--- a/src/ui/clipboard.cpp 2015-01-28 04:32:28.162676000 +0100 ++++ b/src/ui/clipboard.cpp 2016-04-03 09:13:12.360980533 +0200 +@@ -1402,7 +1402,7 @@ + + Glib::ustring target; + if (atom_name) { +- target = Glib::ScopedPtr(atom_name).get(); //This frees the gchar*. ++ target = Glib::make_unique_ptr_gfree(atom_name).get(); //This frees the gchar*. + } + + listTargets.push_back(target); + +Diff finished. Sun Apr 3 09:13:51 2016 -- cgit 1.4.1