diff options
Diffstat (limited to 'sci-electronics/geda/files')
-rw-r--r-- | sci-electronics/geda/files/geda-1.9.2-fno-common.patch | 97 | ||||
-rw-r--r-- | sci-electronics/geda/files/geda-1.9.2-guile-2.2.patch | 16 |
2 files changed, 0 insertions, 113 deletions
diff --git a/sci-electronics/geda/files/geda-1.9.2-fno-common.patch b/sci-electronics/geda/files/geda-1.9.2-fno-common.patch deleted file mode 100644 index c509b42904a8..000000000000 --- a/sci-electronics/geda/files/geda-1.9.2-fno-common.patch +++ /dev/null @@ -1,97 +0,0 @@ ---- a/gschem/include/globals.h -+++ b/gschem/include/globals.h -@@ -27,7 +27,7 @@ - extern GList *global_window_list; - - /* Manager for recently used files */ --GtkRecentManager *recent_manager; -+extern GtkRecentManager *recent_manager; - - /* colors */ - extern GdkColor white; ---- a/gschem/src/globals.c -+++ b/gschem/src/globals.c -@@ -28,6 +28,8 @@ - /* window list */ - GList *global_window_list = NULL; - -+GtkRecentManager *recent_manager = NULL; -+ - char *rc_filename = NULL; - char *output_filename = NULL; - ---- a/gattrib/include/globals.h -+++ b/gattrib/include/globals.h -@@ -88,7 +88,7 @@ - * structs.h - */ - /*------------------------------------------------------------------*/ --TOPLEVEL *pr_current; -+extern TOPLEVEL *pr_current; - - /*------------------------------------------------------------------*/ - /*! -@@ -97,7 +97,7 @@ TOPLEVEL *pr_current; - * callbacks. It is defined in structs.h - */ - /*------------------------------------------------------------------*/ --SHEET_DATA *sheet_head; -+extern SHEET_DATA *sheet_head; - - /*------------------------------------------------------------------ - * GTKsheet includes: stuff for dealing with windows. -@@ -106,18 +106,18 @@ SHEET_DATA *sheet_head; - #define DEFAULT_SPACE 8 - #define NUM_SHEETS 3 /* Components, Nets, and Pins */ - --GtkWidget *window; /* Main window */ --GtkWidget *notebook; -+extern GtkWidget *window; /* Main window */ -+extern GtkWidget *notebook; - --GtkSheet **sheets; /* These are the spreadsheet widgets themselves */ -+extern GtkSheet **sheets; /* These are the spreadsheet widgets themselves */ - --GtkWidget **scrolled_windows; --GtkWidget *entry; --GtkWidget *location; --GtkWidget *left_button; --GtkWidget *center_button; --GtkWidget *right_button; --GtkWidget *label; -+extern GtkWidget **scrolled_windows; -+extern GtkWidget *entry; -+extern GtkWidget *location; -+extern GtkWidget *left_button; -+extern GtkWidget *center_button; -+extern GtkWidget *right_button; -+extern GtkWidget *label; - - /* command line switch settings */ - extern int verbose_mode; ---- a/gattrib/src/globals.c -+++ b/gattrib/src/globals.c -@@ -34,6 +34,23 @@ - #include "../include/prototype.h" /* function prototypes */ - #include "../include/globals.h" - -+TOPLEVEL *pr_current; -+ -+SHEET_DATA *sheet_head; -+ -+GtkWidget *window; -+GtkWidget *notebook; -+ -+GtkSheet **sheets; -+ -+GtkWidget **scrolled_windows; -+GtkWidget *entry; -+GtkWidget *location; -+GtkWidget *left_button; -+GtkWidget *center_button; -+GtkWidget *right_button; -+GtkWidget *label; -+ - /* command line arguments */ - int verbose_mode=FALSE; //!< Reflects the value of the command line flag - int quiet_mode=FALSE; //!< Reflects the value of the command line flag diff --git a/sci-electronics/geda/files/geda-1.9.2-guile-2.2.patch b/sci-electronics/geda/files/geda-1.9.2-guile-2.2.patch deleted file mode 100644 index 631673367801..000000000000 --- a/sci-electronics/geda/files/geda-1.9.2-guile-2.2.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- geda-gaf-1.9.2/m4/geda-guile.m4 -+++ geda-gaf-1.9.2/m4/geda-guile.m4 -@@ -35,8 +35,13 @@ - GUILE_MIN_TEENY=`echo ${GUILE_MIN_VER} | sed -e 's;.*\.;;'` - - _found_pkg_config_guile=yes -+ PKG_CHECK_MODULES(GUILE, [guile-2.2 >= $GUILE_MIN_VER], -+ [GUILE_PKG_NAME=guile-2.2], [_found_pkg_config_guile=no]) -+ -+ if test "${_found_pkg_config_guile}" = "no" ; then - PKG_CHECK_MODULES(GUILE, [guile-2.0 >= $GUILE_MIN_VER], - [GUILE_PKG_NAME=guile-2.0], [_found_pkg_config_guile=no]) -+ fi - - if test "${_found_pkg_config_guile}" = "no" ; then - PKG_CHECK_MODULES(GUILE, [guile-1.8 >= $GUILE_MIN_VER], |