diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2011-08-12 08:31:48 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2011-08-12 08:31:48 +0000 |
commit | 5a177910ad91ccb274cf9d3b6865241c183e7e61 (patch) | |
tree | f5c3bdcc7f9dcec4a7165148de4aa97a6d6ddad6 /pkgs/applications/graphics/giv | |
parent | 4fad68a33e829800238e95b976bd3bff52e50658 (diff) |
Fixing a bug in 'giv'. Reported upstream already.
svn path=/nixpkgs/trunk/; revision=28504
Diffstat (limited to 'pkgs/applications/graphics/giv')
-rw-r--r-- | pkgs/applications/graphics/giv/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/graphics/giv/union.patch | 38 |
2 files changed, 39 insertions, 1 deletions
diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix index a6cf6b205dc0b..d32ef5bbebc98 100644 --- a/pkgs/applications/graphics/giv/default.nix +++ b/pkgs/applications/graphics/giv/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sed -i s,/usr/local,$out, SConstruct ''; - patches = [ ./build.patch ]; + patches = [ ./build.patch ./union.patch ]; buildPhase = "scons"; diff --git a/pkgs/applications/graphics/giv/union.patch b/pkgs/applications/graphics/giv/union.patch new file mode 100644 index 0000000000000..f12fce0361358 --- /dev/null +++ b/pkgs/applications/graphics/giv/union.patch @@ -0,0 +1,38 @@ +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 { |