Author: viric
Date: Fri Aug 12 08:31:48 2011
New Revision: 28504
URL: https://svn.nixos.org/websvn/nix/?rev=28504&sc=1
Log:
Fixing a bug in 'giv'. Reported upstream already.
Added:
nixpkgs/trunk/pkgs/applications/graphics/giv/union.patch
Modified:
nixpkgs/trunk/pkgs/applications/graphics/giv/default.nix
Modified: nixpkgs/trunk/pkgs/applications/graphics/giv/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/graphics/giv/default.nix Fri Aug 12
08:31:19 2011 (r28503)
+++ nixpkgs/trunk/pkgs/applications/graphics/giv/default.nix Fri Aug 12
08:31:48 2011 (r28504)
@@ -17,7 +17,7 @@
sed -i s,/usr/local,$out, SConstruct
'';
- patches = [ ./build.patch ];
+ patches = [ ./build.patch ./union.patch ];
buildPhase = "scons";
Added: nixpkgs/trunk/pkgs/applications/graphics/giv/union.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/applications/graphics/giv/union.patch Fri Aug 12
08:31:48 2011 (r28504)
@@ -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 {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
