Updating giv.

svn path=/nixpkgs/trunk/; revision=30508

pkgs/applications/graphics/giv/default.nix

@@ -2,11 +2,11 @@
   pcre, cfitsio, perl, gob2, vala, libtiff }:
 
 stdenv.mkDerivation rec {
-  name = "giv-0.9.19";
+  name = "giv-0.9.20";
 
   src = fetchurl {
     url = "mirror://sourceforge/giv/${name}.tar.gz";
-    sha256 = "07sgpp4k27417ymavcvil4waq6ac2mj08g42g1l52l435xm5mnh7";
+    sha256 = "09s659vvv26nw9vaw3a766al8yq6np7p0xb4iw907921j6nbqp7z";
   };
 
   # It built code to be put in a shared object without -fPIC
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     sed -i s,/usr/local,$out, SConstruct 
   '';
 
-  patches = [ ./build.patch ./union.patch ];
+  patches = [ ./build.patch ];
 
   buildPhase = "scons";
 

pkgs/applications/graphics/giv/union.patch

@@ -1,38 +0,0 @@
-Already reported uptream
-
-diff --git a/src/giv-data.h b/src/giv-data.h
-index 64e7696..d34bfe4 100644
---- a/src/giv-data.h
-+++ b/src/giv-data.h
-@@ -88,7 +88,7 @@ typedef struct
- typedef struct
- {
-   gint op;
--  union
-+  struct
-   {
-     struct
-     {
-diff --git a/src/giv_types.h b/src/giv_types.h
-index 02abebe..c3cfb78 100644
---- a/src/giv_types.h
-+++ b/src/giv_types.h
-@@ -11,13 +11,11 @@ typedef struct {
- 
- typedef struct {
-   gint op;
--  union {
--    struct {
--      gdouble x,y;
--    } point;
--    double arc_dev;
--    text_mark_t *text_object;
--  } data;
-+  struct {
-+    gdouble x,y;
-+  } point;
-+  double arc_dev;
-+  text_mark_t *text_object;
- } point_t;
- 
- typedef struct {