Author: raskin
Date: Fri Nov 19 04:07:34 2010
New Revision: 24762
URL: https://svn.nixos.org/websvn/nix/?rev=24762&sc=1
Log:
Fix DrGeo build
Added:
nixpkgs/branches/stdenv-updates/pkgs/applications/science/geometry/drgeo/struct.patch
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/science/geometry/drgeo/default.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/science/geometry/drgeo/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/applications/science/geometry/drgeo/default.nix
Thu Nov 18 22:59:57 2010 (r24761)
+++
nixpkgs/branches/stdenv-updates/pkgs/applications/science/geometry/drgeo/default.nix
Fri Nov 19 04:07:34 2010 (r24762)
@@ -11,7 +11,8 @@
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
Added:
nixpkgs/branches/stdenv-updates/pkgs/applications/science/geometry/drgeo/struct.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/stdenv-updates/pkgs/applications/science/geometry/drgeo/struct.patch
Fri Nov 19 04:07:34 2010 (r24762)
@@ -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 <[email protected]>
+##
+## Description: fix FTBFS with gcc 4.5 with undefined reference to
+## `drgeoDialogData'
+## Author: Petr Gajdos <[email protected]>
+## 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
+ {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
