summary refs log tree commit diff
path: root/pkgs/development/libraries/libgdiplus
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2019-09-21 08:41:10 +0200
committerVladimír Čunát <v@cunat.cz>2019-09-21 08:45:00 +0200
commit22d7eb74d9b554fe6a18e6542ff85bc38f0bc923 (patch)
tree8600a779e410910019fe0f27acbe05e17f56e0ff /pkgs/development/libraries/libgdiplus
parent0b12d44c06dccbfedaae89cb00f782d7c89fc814 (diff)
downloadnixpkgs-22d7eb74d9b554fe6a18e6542ff85bc38f0bc923.tar
nixpkgs-22d7eb74d9b554fe6a18e6542ff85bc38f0bc923.tar.gz
nixpkgs-22d7eb74d9b554fe6a18e6542ff85bc38f0bc923.tar.bz2
nixpkgs-22d7eb74d9b554fe6a18e6542ff85bc38f0bc923.tar.lz
nixpkgs-22d7eb74d9b554fe6a18e6542ff85bc38f0bc923.tar.xz
nixpkgs-22d7eb74d9b554fe6a18e6542ff85bc38f0bc923.tar.zst
nixpkgs-22d7eb74d9b554fe6a18e6542ff85bc38f0bc923.zip
libgdiplus: 5.6.1 -> 6.0.2
Fixes build error: undefined reference to `GifQuantizeBuffer'
that was most likely caused by giflib update in 3605f1285
ABI tracker didn't show removal of this symbol - I don't know,
perhaps we have different build setting, or something.

Here I found no NEWS, ABI tracker seems OK - only minor
incompatibilities in -private headers.  Mono stuff builds now.
Diffstat (limited to 'pkgs/development/libraries/libgdiplus')
-rw-r--r--pkgs/development/libraries/libgdiplus/default.nix24
1 files changed, 5 insertions, 19 deletions
diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix
index 9ba3cdbd09a..ca65c3fdf8c 100644
--- a/pkgs/development/libraries/libgdiplus/default.nix
+++ b/pkgs/development/libraries/libgdiplus/default.nix
@@ -2,33 +2,19 @@
 , libtiff, giflib, libjpeg, libpng
 , libXrender, libexif, autoreconfHook, fetchpatch }:
 
-stdenv.mkDerivation {
-  name = "libgdiplus-5.6.1";
+stdenv.mkDerivation rec {
+  pname = "libgdiplus";
+  version = "6.0.2";
 
   src = fetchFromGitHub {
     owner = "mono";
     repo = "libgdiplus";
-    rev = "5.6.1";
-    sha256 = "023xf3l2s0mxcdbl2viglzrkhx3lwcrpm66fiq7cfdqz80d4vsj2";
+    rev = version;
+    sha256 = "07a3n7i35mn5j2djah64by785b1hzy8ckk1pz0xwvk716yzb7sxg";
   };
 
   NIX_LDFLAGS = "-lgif";
 
-  patches = [ # Series of patches cherry-picked from master, all fixes various sigsegv (or required by other patch)
-    (fetchpatch {
-          url = "https://github.com/mono/libgdiplus/commit/d33a2580a94701ff33abe28c22881d6173be57d0.patch";
-          sha256 = "0rr54jylscn4icqjprqhwrncyr92r0d7kmfrrq3myskplpqv1c11";
-    })
-    (fetchpatch {
-          url ="https://github.com/mono/libgdiplus/commit/aa6aa53906935572f52f519fe4ab9ebedc051d08.patch";
-          sha256 = "1wg0avm8qv5cb4vk80baflfzszm6q7ydhn89c3h6kq68hg6zsf1f";
-    })
-    (fetchpatch {
-          url = "https://github.com/mono/libgdiplus/commit/81e45a1d5a3ac3cf035bcc3fabb2859818b6cc04.patch";
-          sha256 = "07wmc88cd1lqifs5x6npryni65jyy9gi8lgr2i1lb7v0fhvlyswg";
-    })
-  ];
-
   hardeningDisable = [ "format" ];
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];