mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-23 21:57:52 +03:00
Fixing a bug in 'giv'. Reported upstream already.
svn path=/nixpkgs/trunk/; revision=28504
This commit is contained in:
parent
4fad68a33e
commit
5a177910ad
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||||||
sed -i s,/usr/local,$out, SConstruct
|
sed -i s,/usr/local,$out, SConstruct
|
||||||
'';
|
'';
|
||||||
|
|
||||||
patches = [ ./build.patch ];
|
patches = [ ./build.patch ./union.patch ];
|
||||||
|
|
||||||
buildPhase = "scons";
|
buildPhase = "scons";
|
||||||
|
|
||||||
|
38
pkgs/applications/graphics/giv/union.patch
Normal file
38
pkgs/applications/graphics/giv/union.patch
Normal 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 {
|
Loading…
Reference in New Issue
Block a user