alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Fixing a bug in 'giv'. Reported upstream already.

Browse source 
svn path=/nixpkgs/trunk/; revision=28504
This commit is contained in:
Lluís Batlle i Rossell 2011-08-12 08:31:48 +00:00
parent 4fad68a33e
commit 5a177910ad
2 changed files with 39 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/graphics/giv/default.nix
View file

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sed -i s,/usr/local,$out, SConstruct
'';
patches = [ ./build.patch ];
patches = [ ./build.patch ./union.patch ];
buildPhase = "scons";

38
pkgs/applications/graphics/giv/union.patch Normal file
View file

@ -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 {