drgeo-1.1.0-gcc45.patch 1.1 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162
  1. Fix build with GCC 4.5, fix random SIGSEGV
  2. http://bugs.gentoo.org/show_bug.cgi?id=322211
  3. https://bugzilla.redhat.com/show_bug.cgi?id=454045
  4. --- a/geo/drgeo_figure.h
  5. +++ b/geo/drgeo_figure.h
  6. @@ -322,4 +322,11 @@
  7. gboolean showGrid;
  8. };
  9. +struct
  10. +{
  11. + drgeoPoint mouse;
  12. + drgeoFigure *figure;
  13. +}
  14. +drgeoDialogData;
  15. +
  16. #endif
  17. --- a/geo/drgeo_figure.cc
  18. +++ b/geo/drgeo_figure.cc
  19. @@ -48,13 +48,6 @@
  20. #include "drgeo_dialog.h"
  21. #include "traite.h"
  22. -extern struct
  23. -{
  24. - drgeoPoint mouse;
  25. - drgeoFigure *figure;
  26. -}
  27. -drgeoDialogData;
  28. -
  29. typedef struct drgeoSearchValue
  30. {
  31. gpointer value;
  32. @@ -1309,7 +1302,7 @@
  33. gint
  34. drgeoFigure::preferedUndoLevel ()
  35. {
  36. - atoi (drgeoConfigGet (":undoLevel"));
  37. + return atoi (drgeoConfigGet (":undoLevel"));
  38. }
  39. void
  40. --- a/geo/drgeo_dialog.cc
  41. +++ b/geo/drgeo_dialog.cc
  42. @@ -38,14 +38,6 @@
  43. // Used in the style dialod callback, I know it's ugly, but so easy
  44. static drgeoFigure *selected_figure;
  45. -struct
  46. -{
  47. - drgeoPoint mouse;
  48. - drgeoFigure *figure;
  49. -}
  50. -drgeoDialogData;
  51. -
  52. -
  53. static void drgeo_edit_dialog_cb (GtkWidget * dialog,
  54. gint button, gpointer entry);