colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix DrGeo build

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24762
This commit is contained in:
Michael Raskin 2010-11-19 04:07:34 +00:00
parent a98b72fb77
commit 9d124b1c70
2 changed files with 70 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/science/geometry/drgeo/default.nix
View File

@ -11,7 +11,8 @@ rec {
configureFlags = [];
/* doConfigure should be specified separately */
phaseNames = ["doConfigure" "doPreBuild" "doMakeInstall"];
phaseNames = ["doPatch" "doConfigure" "doPreBuild" "doMakeInstall"];
patches = [ ./struct.patch ];
doPreBuild = fullDepEntry (''
cp drgeo.desktop.in drgeo.desktop

68
pkgs/applications/science/geometry/drgeo/struct.patch Normal file
View File

@ -0,0 +1,68 @@
-- drgeo-1.1.0/debian/patches/00list
++ drgeo-1.1.0/debian/patches/00list
@ -7 +7 @@
07-fix_ftbfs-gcc-4.5.dpatch
nly in patch2:
nchanged:
-- drgeo-1.1.0.orig/debian/patches/07-fix_ftbfs-gcc-4.5.dpatch
++ drgeo-1.1.0/debian/patches/07-fix_ftbfs-gcc-4.5.dpatch
@ -0,0 +1,58 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 07-fix_ftbfs-gcc-4.5.dpatch by Fabrice Coutadeur <fabric...@ubuntu.com>
##
## Description: fix FTBFS with gcc 4.5 with undefined reference to
## `drgeoDialogData'
## Author: Petr Gajdos <pgaj...@suse.cz>
## Origin: https://build.opensuse.org/package/files?package=drgeo&project=openSUSE%3A11.3%3AContrib
...@dpatch@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' drgeo-1.1.0~/geo/drgeo_dialog.cc drgeo-1.1.0/geo/drgeo_dialog.cc
--- drgeo-1.1.0~/geo/drgeo_dialog.cc 2003-10-27 10:17:25.000000000 +0000
+++ drgeo-1.1.0/geo/drgeo_dialog.cc 2010-11-13 07:26:03.258908003 +0000
@@ -38,12 +38,7 @@
// Used in the style dialod callback, I know it's ugly, but so easy
static drgeoFigure *selected_figure;
-struct
-{
- drgeoPoint mouse;
- drgeoFigure *figure;
-}
-drgeoDialogData;
+DialogData drgeoDialogData;
static void drgeo_edit_dialog_cb (GtkWidget * dialog,
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' drgeo-1.1.0~/geo/drgeo_dialog.h drgeo-1.1.0/geo/drgeo_dialog.h
--- drgeo-1.1.0~/geo/drgeo_dialog.h 2003-06-12 22:30:23.000000000 +0000
+++ drgeo-1.1.0/geo/drgeo_dialog.h 2010-11-13 07:26:03.258908003 +0000
@@ -34,4 +34,11 @@
}
#endif /* __cplusplus */
+
+typedef struct
+{
+ drgeoPoint mouse;
+ drgeoFigure *figure;
+} DialogData;
+
#endif
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' drgeo-1.1.0~/geo/drgeo_figure.cc drgeo-1.1.0/geo/drgeo_figure.cc
--- drgeo-1.1.0~/geo/drgeo_figure.cc 2005-07-14 07:30:01.000000000 +0000
+++ drgeo-1.1.0/geo/drgeo_figure.cc 2010-11-13 07:26:03.258908003 +0000
@@ -48,12 +48,7 @@
#include "drgeo_dialog.h"
#include "traite.h"
-extern struct
-{
- drgeoPoint mouse;
- drgeoFigure *figure;
-}
-drgeoDialogData;
+extern DialogData drgeoDialogData;
typedef struct drgeoSearchValue
{