mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-30 19:02:57 +00:00
69 lines
2.3 KiB
Diff
69 lines
2.3 KiB
Diff
-- 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
|
|
{
|