[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
Re: gEDA-user: gEDA/gaf unstable/development snapshot 1.5.4-20090830 released
On Sun, 2009-08-30 at 22:24 -0400, Ales Hvezda wrote:
> An unstable/development snapshot of gEDA/gaf was released yesterday
> (1.5.3-20090829) and today (1.5.4-20090830). gEDA/gaf v1.5.3 had some
> release critical bugs (DOA) so it has been withdrawn and is no longer
> available for download. Please download, build, and run gEDA/gaf v1.5.4.
>
> You can find this unstable/development snapshot at:
>
> Release Notes:
> http://geda.seul.org/devel/v1.5/1.5.4/gEDA-gaf-1.5.4-releasenotes.html
> Download: http://geda.seul.org/devel/v1.5/1.5.4
Attached is the deltas required to build this version of gEDA with Cesar
Strauss's "minipack" tools.
--
Peter Clifton
Electrical Engineering Division,
Engineering Department,
University of Cambridge,
9, JJ Thomson Avenue,
Cambridge
CB3 0FA
Tel: +44 (0)7729 980173 - (No signal in the lab!)
From 1af5a1e98afd0f0da26f54d01ca2a1a6e87c0bc8 Mon Sep 17 00:00:00 2001
From: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Mon, 31 Aug 2009 12:50:32 +0100
Subject: [PATCH 3/3] gEDA 1.5.4
---
build-all.sh | 10 +---------
recipes/gEDA-gaf.recipe | 6 ++++++
recipes/geda-docs.recipe | 4 ----
recipes/geda-examples.recipe | 4 ----
recipes/geda-gattrib.recipe | 11 -----------
recipes/geda-gnetlist.recipe | 9 ---------
recipes/geda-gschem.recipe | 11 -----------
recipes/geda-gsymcheck.recipe | 9 ---------
recipes/geda-symbols.recipe | 4 ----
recipes/geda-utils.recipe | 9 ---------
recipes/libgeda.recipe | 11 -----------
11 files changed, 7 insertions(+), 81 deletions(-)
create mode 100644 recipes/gEDA-gaf.recipe
delete mode 100644 recipes/geda-docs.recipe
delete mode 100644 recipes/geda-examples.recipe
delete mode 100644 recipes/geda-gattrib.recipe
delete mode 100644 recipes/geda-gnetlist.recipe
delete mode 100644 recipes/geda-gschem.recipe
delete mode 100644 recipes/geda-gsymcheck.recipe
delete mode 100644 recipes/geda-symbols.recipe
delete mode 100644 recipes/geda-utils.recipe
delete mode 100644 recipes/libgeda.recipe
diff --git a/build-all.sh b/build-all.sh
index da86b6b..2134113 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -26,15 +26,7 @@ mingw-libgnurx
guile
gd
pcb
-libgeda
-geda-symbols
-geda-gschem
-geda-gnetlist
-geda-gattrib
-geda-gsymcheck
-geda-utils
-geda-docs
-geda-examples
+gEDA-gaf
gerbv
"
diff --git a/recipes/gEDA-gaf.recipe b/recipes/gEDA-gaf.recipe
new file mode 100644
index 0000000..a04780c
--- /dev/null
+++ b/recipes/gEDA-gaf.recipe
@@ -0,0 +1,6 @@
+name=gEDA-gaf
+version=1.5.4
+release=1
+download=http://geda.seul.org/devel/v1.5/1.5.4
+
+configure_opt="--disable-update-xdg-database"
diff --git a/recipes/geda-docs.recipe b/recipes/geda-docs.recipe
deleted file mode 100644
index fa188db..0000000
--- a/recipes/geda-docs.recipe
+++ /dev/null
@@ -1,4 +0,0 @@
-name=geda-docs
-version=1.5.1
-release=1
-download=http://geda.seul.org/devel/v1.5/$version
diff --git a/recipes/geda-examples.recipe b/recipes/geda-examples.recipe
deleted file mode 100644
index 4303225..0000000
--- a/recipes/geda-examples.recipe
+++ /dev/null
@@ -1,4 +0,0 @@
-name=geda-examples
-version=1.5.1
-release=1
-download=http://geda.seul.org/devel/v1.5/$version
diff --git a/recipes/geda-gattrib.recipe b/recipes/geda-gattrib.recipe
deleted file mode 100644
index def936d..0000000
--- a/recipes/geda-gattrib.recipe
+++ /dev/null
@@ -1,11 +0,0 @@
-name=geda-gattrib
-version=1.5.1
-release=1
-download=http://geda.seul.org/devel/v1.5/$version
-
-configure_opt="--disable-update-desktop-database"
-
-#src_prep()
-#{
-# ./autogen.sh
-#}
diff --git a/recipes/geda-gnetlist.recipe b/recipes/geda-gnetlist.recipe
deleted file mode 100644
index 27f7f2e..0000000
--- a/recipes/geda-gnetlist.recipe
+++ /dev/null
@@ -1,9 +0,0 @@
-name=geda-gnetlist
-version=1.5.1
-release=1
-download=http://geda.seul.org/devel/v1.5/$version
-
-#src_prep()
-#{
-# ./autogen.sh
-#}
diff --git a/recipes/geda-gschem.recipe b/recipes/geda-gschem.recipe
deleted file mode 100644
index da24e1b..0000000
--- a/recipes/geda-gschem.recipe
+++ /dev/null
@@ -1,11 +0,0 @@
-name=geda-gschem
-version=1.5.1
-release=1
-download=http://geda.seul.org/devel/v1.5/$version
-
-configure_opt="--disable-update-desktop-database"
-
-#src_prep()
-#{
-# ./autogen.sh
-#}
diff --git a/recipes/geda-gsymcheck.recipe b/recipes/geda-gsymcheck.recipe
deleted file mode 100644
index 7bde37f..0000000
--- a/recipes/geda-gsymcheck.recipe
+++ /dev/null
@@ -1,9 +0,0 @@
-name=geda-gsymcheck
-version=1.5.1
-release=1
-download=http://geda.seul.org/devel/v1.5/$version
-
-#src_prep()
-#{
-# ./autogen.sh
-#}
diff --git a/recipes/geda-symbols.recipe b/recipes/geda-symbols.recipe
deleted file mode 100644
index 3a2ce37..0000000
--- a/recipes/geda-symbols.recipe
+++ /dev/null
@@ -1,4 +0,0 @@
-name=geda-symbols
-version=1.5.1
-release=1
-download=http://geda.seul.org/devel/v1.5/$version
diff --git a/recipes/geda-utils.recipe b/recipes/geda-utils.recipe
deleted file mode 100644
index 0ab516c..0000000
--- a/recipes/geda-utils.recipe
+++ /dev/null
@@ -1,9 +0,0 @@
-name=geda-utils
-version=1.5.1
-release=1
-download=http://geda.seul.org/devel/v1.5/$version
-
-#src_prep()
-#{
-# ./autogen.sh
-#}
diff --git a/recipes/libgeda.recipe b/recipes/libgeda.recipe
deleted file mode 100644
index 6e72311..0000000
--- a/recipes/libgeda.recipe
+++ /dev/null
@@ -1,11 +0,0 @@
-name=libgeda
-version=1.5.1
-release=1
-download=http://geda.seul.org/devel/v1.5/1.5.1
-
-configure_opt="--disable-update-mime-database"
-
-src_prep()
-{
- ./autogen.sh
-}
--
1.6.3.3
From 502da2e7d884d89b4e0bc1737f696732303535c4 Mon Sep 17 00:00:00 2001
From: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Mon, 31 Aug 2009 12:45:58 +0100
Subject: [PATCH 2/3] Never build fontconfig, it isn't needed
---
build-all.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/build-all.sh b/build-all.sh
index 050c377..da86b6b 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -1,4 +1,5 @@
NEVERBUILD="
+fontconfig
"
NOBUILD="
@@ -13,7 +14,6 @@ libpng
tiff
expat
freetype
-fontconfig
pixman
glib
atk
--
1.6.3.3
From adf77fd4bf5883776c465ec3eb1c53dc0907380f Mon Sep 17 00:00:00 2001
From: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Mon, 31 Aug 2009 12:20:33 +0100
Subject: [PATCH 1/3] Local changes for testing git HEAD gEDA
---
...e-pkg-config-support-for-Guile-if-present.patch | 54 ------
...-dont-register-recalc-funcs-as-fraw-funcs.patch | 14 --
patches/geda-gattrib/03-Draw-func-cleanup.patch | 24 ---
.../04-Define-select-func-only-in-libgeda.patch | 12 --
...emove-duplicate-definitions-of-do-logging.patch | 14 --
...e-pkg-config-support-for-Guile-if-present.patch | 55 ------
...-dont-register-recalc-funcs-as-fraw-funcs.patch | 32 ----
patches/geda-gnetlist/03-Draw-func-cleanup.patch | 27 ---
...emove-duplicate-definitions-of-do-logging.patch | 13 --
...e-pkg-config-support-for-Guile-if-present.patch | 55 ------
patches/geda-gschem/02-Draw-func-cleanup.patch | 13 --
...3-Fixup-installation-of-drawing-callbacks.patch | 49 ------
.../04-Define-select-func-only-in-libgeda.patch | 27 ---
...emove-duplicate-definitions-of-do-logging.patch | 13 --
...e-pkg-config-support-for-Guile-if-present.patch | 55 ------
...-dont-register-recalc-funcs-as-fraw-funcs.patch | 32 ----
patches/geda-gsymcheck/03-Draw-func-cleanup.patch | 25 ---
...emove-duplicate-definitions-of-do-logging.patch | 13 --
...e-pkg-config-support-for-Guile-if-present.patch | 55 ------
...-dont-register-recalc-funcs-as-fraw-funcs.patch | 31 ----
patches/geda-utils/03-Draw-func-cleanup.patch | 24 ---
...emove-duplicate-definitions-of-do-logging.patch | 12 --
.../0001-MinGW-does-not-have-getlogin.patch | 50 ------
.../0002-MinGW-does-not-have-sys-wait.h.patch | 31 ----
...e-pkg-config-support-for-Guile-if-present.patch | 69 --------
.../0004-MinGW-does-not-have-realpath.patch | 30 ----
patches/libgeda/0005-Draw-func-cleanup.patch | 183 --------------------
.../0006-Add-no-undefined-to-libtool-flags.patch | 13 --
.../0007-Provide-definition-for-do-logging.patch | 14 --
...emove-duplicate-definitions-of-do-logging.patch | 14 --
recipes/cairo.recipe | 3 +-
recipes/geda-docs.recipe | 4 +-
recipes/geda-examples.recipe | 4 +-
recipes/geda-gattrib.recipe | 12 +-
recipes/geda-gnetlist.recipe | 12 +-
recipes/geda-gschem.recipe | 12 +-
recipes/geda-gsymcheck.recipe | 12 +-
recipes/geda-symbols.recipe | 4 +-
recipes/geda-utils.recipe | 13 +-
recipes/libgeda.recipe | 4 +-
40 files changed, 40 insertions(+), 1093 deletions(-)
delete mode 100644 patches/geda-gattrib/01-Use-pkg-config-support-for-Guile-if-present.patch
delete mode 100644 patches/geda-gattrib/02-dont-register-recalc-funcs-as-fraw-funcs.patch
delete mode 100644 patches/geda-gattrib/03-Draw-func-cleanup.patch
delete mode 100644 patches/geda-gattrib/04-Define-select-func-only-in-libgeda.patch
delete mode 100644 patches/geda-gattrib/05-Remove-duplicate-definitions-of-do-logging.patch
delete mode 100644 patches/geda-gnetlist/01-Use-pkg-config-support-for-Guile-if-present.patch
delete mode 100644 patches/geda-gnetlist/02-dont-register-recalc-funcs-as-fraw-funcs.patch
delete mode 100644 patches/geda-gnetlist/03-Draw-func-cleanup.patch
delete mode 100644 patches/geda-gnetlist/05-Remove-duplicate-definitions-of-do-logging.patch
delete mode 100644 patches/geda-gschem/01-Use-pkg-config-support-for-Guile-if-present.patch
delete mode 100644 patches/geda-gschem/02-Draw-func-cleanup.patch
delete mode 100644 patches/geda-gschem/03-Fixup-installation-of-drawing-callbacks.patch
delete mode 100644 patches/geda-gschem/04-Define-select-func-only-in-libgeda.patch
delete mode 100644 patches/geda-gschem/05-Remove-duplicate-definitions-of-do-logging.patch
delete mode 100644 patches/geda-gsymcheck/01-Use-pkg-config-support-for-Guile-if-present.patch
delete mode 100644 patches/geda-gsymcheck/02-dont-register-recalc-funcs-as-fraw-funcs.patch
delete mode 100644 patches/geda-gsymcheck/03-Draw-func-cleanup.patch
delete mode 100644 patches/geda-gsymcheck/05-Remove-duplicate-definitions-of-do-logging.patch
delete mode 100644 patches/geda-utils/01-Use-pkg-config-support-for-Guile-if-present.patch
delete mode 100644 patches/geda-utils/02-dont-register-recalc-funcs-as-fraw-funcs.patch
delete mode 100644 patches/geda-utils/03-Draw-func-cleanup.patch
delete mode 100644 patches/geda-utils/05-Remove-duplicate-definitions-of-do-logging.patch
delete mode 100644 patches/libgeda/0001-MinGW-does-not-have-getlogin.patch
delete mode 100644 patches/libgeda/0002-MinGW-does-not-have-sys-wait.h.patch
delete mode 100644 patches/libgeda/0003-Use-pkg-config-support-for-Guile-if-present.patch
delete mode 100644 patches/libgeda/0004-MinGW-does-not-have-realpath.patch
delete mode 100644 patches/libgeda/0005-Draw-func-cleanup.patch
delete mode 100644 patches/libgeda/0006-Add-no-undefined-to-libtool-flags.patch
delete mode 100644 patches/libgeda/0007-Provide-definition-for-do-logging.patch
delete mode 100644 patches/libgeda/0008-Remove-duplicate-definitions-of-do-logging.patch
diff --git a/patches/geda-gattrib/01-Use-pkg-config-support-for-Guile-if-present.patch b/patches/geda-gattrib/01-Use-pkg-config-support-for-Guile-if-present.patch
deleted file mode 100644
index f6039f5..0000000
--- a/patches/geda-gattrib/01-Use-pkg-config-support-for-Guile-if-present.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index ed29792..8ef73b2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -97,7 +97,28 @@ fi
-
- ############################################################################
- # Check for guile start
--GUILE_FLAGS
-+#
-+
-+# Check for pkg-config
-+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+if test $PKG_CONFIG = no; then
-+ AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
-+fi
-+
-+PKG_CHECK_MODULES(GUILE, guile-1.8, GUILE_PC="yes", no_GUILE_PC="yes")
-+
-+if test "$GUILE_PC" = "yes"
-+then
-+
-+ GUILE_VERSION=`$PKG_CONFIG guile-1.8 --modversion`
-+
-+else
-+
-+ # Find about the installed guile
-+ GUILE_FLAGS
-+ GUILE_VERSION=`$GUILE_CONFIG info guileversion`
-+
-+fi
-
- # Check Guile version
- guile_need_major=1
-@@ -105,7 +126,6 @@ guile_need_minor=6
- guile_need_version="$guile_need_major[].$guile_need_minor.0"
-
- AC_MSG_CHECKING([Guile version >= $guile_need_version])
--GUILE_VERSION=`$GUILE_CONFIG info guileversion`
-
- guile_major=`echo "$GUILE_VERSION" | sed 's/\([[^.]][[^.]]*\).*/\1/'`
- guile_minor=`echo "$GUILE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
-@@ -171,11 +191,6 @@ AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", DL_LIB="")
- ############################################################################
- ## This is looks for GTK2.4.
- #
--# Check for pkg-config
--AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
--if test $PKG_CONFIG = no; then
-- AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
--fi
-
- # Search for gtk+ 2.4.x
- PKG_CHECK_MODULES(GTK24, gtk+-2.0 >= 2.4.0, GTK24="yes", no_GTK24="yes")
diff --git a/patches/geda-gattrib/02-dont-register-recalc-funcs-as-fraw-funcs.patch b/patches/geda-gattrib/02-dont-register-recalc-funcs-as-fraw-funcs.patch
deleted file mode 100644
index c2c83e4..0000000
--- a/patches/geda-gattrib/02-dont-register-recalc-funcs-as-fraw-funcs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/globals.c b/src/globals.c
-index 390a60f..6cf4bdb 100644
---- a/src/globals.c
-+++ b/src/globals.c
-@@ -43,7 +43,7 @@ int quiet_mode=FALSE;
- * for gattrib -- no drawing is done. */
- void (*arc_draw_func)() = NULL;
- void (*box_draw_func)() = NULL;
--void (*picture_draw_func)() = o_picture_recalc;
-+void (*picture_draw_func)() = NULL;
- void (*circle_draw_func)() = NULL;
- void (*complex_draw_func)() = NULL;
- void (*line_draw_func)() = NULL;
-
diff --git a/patches/geda-gattrib/03-Draw-func-cleanup.patch b/patches/geda-gattrib/03-Draw-func-cleanup.patch
deleted file mode 100644
index 6dfc55d..0000000
--- a/patches/geda-gattrib/03-Draw-func-cleanup.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/globals.c b/src/globals.c
-index 6cf4bdb..565ff66 100644
---- a/src/globals.c
-+++ b/src/globals.c
-@@ -41,18 +41,6 @@ int quiet_mode=FALSE;
- /* these are required by libgeda */
- /* I have made most of these NULL because they aren't needed
- * for gattrib -- no drawing is done. */
--void (*arc_draw_func)() = NULL;
--void (*box_draw_func)() = NULL;
--void (*picture_draw_func)() = NULL;
--void (*circle_draw_func)() = NULL;
--void (*complex_draw_func)() = NULL;
--void (*line_draw_func)() = NULL;
--void (*net_draw_func)() = NULL;
--void (*bus_draw_func)() = NULL;
--void (*text_draw_func)() = NULL;
--void (*pin_draw_func)() = NULL;
- void (*select_func)() = s_toplevel_select_object;
--void (*x_log_update_func)() = NULL;
- void (*variable_set_func)() = i_vars_set;
--int (*load_newer_backup_func)() = NULL;
-
-
diff --git a/patches/geda-gattrib/04-Define-select-func-only-in-libgeda.patch b/patches/geda-gattrib/04-Define-select-func-only-in-libgeda.patch
deleted file mode 100644
index 35fd6c6..0000000
--- a/patches/geda-gattrib/04-Define-select-func-only-in-libgeda.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/globals.c b/src/globals.c
-index c83c26c..7731c13 100644
---- a/src/globals.c
-+++ b/src/globals.c
-@@ -39,6 +39,5 @@ int quiet_mode=FALSE;
- /* these are required by libgeda */
- /* I have made most of these NULL because they aren't needed
- * for gattrib -- no drawing is done. */
--void (*select_func)() = s_toplevel_select_object;
- void (*variable_set_func)() = i_vars_set;
-
-
diff --git a/patches/geda-gattrib/05-Remove-duplicate-definitions-of-do-logging.patch b/patches/geda-gattrib/05-Remove-duplicate-definitions-of-do-logging.patch
deleted file mode 100644
index 52b26ac..0000000
--- a/patches/geda-gattrib/05-Remove-duplicate-definitions-of-do-logging.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/globals.c b/src/globals.c
-index 565ff66..c83c26c 100644
---- a/src/globals.c
-+++ b/src/globals.c
-@@ -32,8 +32,6 @@
- #include <dmalloc.h>
- #endif
-
--int do_logging=TRUE;
--
- /* command line arguments */
- int verbose_mode=FALSE;
- int quiet_mode=FALSE;
-
diff --git a/patches/geda-gnetlist/01-Use-pkg-config-support-for-Guile-if-present.patch b/patches/geda-gnetlist/01-Use-pkg-config-support-for-Guile-if-present.patch
deleted file mode 100644
index 9ab9554..0000000
--- a/patches/geda-gnetlist/01-Use-pkg-config-support-for-Guile-if-present.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 5f23fb0..46cc7ec 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -139,7 +139,28 @@ fi
-
- ############################################################################
- # Check for guile start
--GUILE_FLAGS
-+#
-+
-+# Check for pkg-config
-+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+if test $PKG_CONFIG = no; then
-+ AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
-+fi
-+
-+PKG_CHECK_MODULES(GUILE, guile-1.8, GUILE_PC="yes", no_GUILE_PC="yes")
-+
-+if test "$GUILE_PC" = "yes"
-+then
-+
-+ GUILE_VERSION=`$PKG_CONFIG guile-1.8 --modversion`
-+
-+else
-+
-+ # Find about the installed guile
-+ GUILE_FLAGS
-+ GUILE_VERSION=`$GUILE_CONFIG info guileversion`
-+
-+fi
-
- # Check Guile version
- guile_need_major=1
-@@ -147,7 +168,6 @@ guile_need_minor=6
- guile_need_version="$guile_need_major[].$guile_need_minor.0"
-
- AC_MSG_CHECKING([Guile version >= $guile_need_version])
--GUILE_VERSION=`$GUILE_CONFIG info guileversion`
-
- guile_major=`echo "$GUILE_VERSION" | sed 's/\([[^.]][[^.]]*\).*/\1/'`
- guile_minor=`echo "$GUILE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
-@@ -214,12 +234,6 @@ AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", DL_LIB="")
- # Check for gtk+ 2.4 start
- #
-
--# Check for pkg-config
--AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
--if test $PKG_CONFIG = no; then
-- AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
--fi
--
- PKG_CHECK_MODULES(GTK24, gtk+-2.0 >= 2.4.0, GTK24="yes", no_GTK24="yes")
-
- # This next bit of code figures out what gtk we need to use.
diff --git a/patches/geda-gnetlist/02-dont-register-recalc-funcs-as-fraw-funcs.patch b/patches/geda-gnetlist/02-dont-register-recalc-funcs-as-fraw-funcs.patch
deleted file mode 100644
index 0dd8326..0000000
--- a/patches/geda-gnetlist/02-dont-register-recalc-funcs-as-fraw-funcs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/src/globals.c b/src/globals.c
-index 0f8782a..36e270c 100644
---- a/src/globals.c
-+++ b/src/globals.c
-@@ -46,16 +46,16 @@ int do_logging=TRUE;
- int logging_dest=LOG_WINDOW;
-
- /* these are required by libgeda */
--void (*arc_draw_func)() = o_arc_recalc;
--void (*box_draw_func)() = o_box_recalc;
--void (*picture_draw_func)() = o_picture_recalc;
--void (*circle_draw_func)() = o_circle_recalc;
--void (*complex_draw_func)() = o_complex_recalc;
--void (*line_draw_func)() = o_line_recalc;
--void (*net_draw_func)() = o_net_recalc;
--void (*bus_draw_func)() = o_bus_recalc;
--void (*text_draw_func)() = o_text_recalc;
--void (*pin_draw_func)() = o_pin_recalc;
-+void (*arc_draw_func)() = NULL;
-+void (*box_draw_func)() = NULL;
-+void (*picture_draw_func)() = NULL;
-+void (*circle_draw_func)() = NULL;
-+void (*complex_draw_func)() = NULL;
-+void (*line_draw_func)() = NULL;
-+void (*net_draw_func)() = NULL;
-+void (*bus_draw_func)() = NULL;
-+void (*text_draw_func)() = NULL;
-+void (*pin_draw_func)() = NULL;
- void (*select_func)() = NULL;
- void (*x_log_update_func)() = NULL;
- int (*load_newer_backup_func)() = NULL;
-
diff --git a/patches/geda-gnetlist/03-Draw-func-cleanup.patch b/patches/geda-gnetlist/03-Draw-func-cleanup.patch
deleted file mode 100644
index 4145f58..0000000
--- a/patches/geda-gnetlist/03-Draw-func-cleanup.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/src/globals.c b/src/globals.c
-index 36e270c..97e3c35 100644
---- a/src/globals.c
-+++ b/src/globals.c
-@@ -45,21 +45,6 @@ int logfile_fd=-1;
- int do_logging=TRUE;
- int logging_dest=LOG_WINDOW;
-
--/* these are required by libgeda */
--void (*arc_draw_func)() = NULL;
--void (*box_draw_func)() = NULL;
--void (*picture_draw_func)() = NULL;
--void (*circle_draw_func)() = NULL;
--void (*complex_draw_func)() = NULL;
--void (*line_draw_func)() = NULL;
--void (*net_draw_func)() = NULL;
--void (*bus_draw_func)() = NULL;
--void (*text_draw_func)() = NULL;
--void (*pin_draw_func)() = NULL;
--void (*select_func)() = NULL;
--void (*x_log_update_func)() = NULL;
--int (*load_newer_backup_func)() = NULL;
--
- /* netlist specific variables */
- NETLIST *netlist_head=NULL;
- NETLIST *graphical_netlist_head=NULL; /* Special objects with
-
diff --git a/patches/geda-gnetlist/05-Remove-duplicate-definitions-of-do-logging.patch b/patches/geda-gnetlist/05-Remove-duplicate-definitions-of-do-logging.patch
deleted file mode 100644
index 250c733..0000000
--- a/patches/geda-gnetlist/05-Remove-duplicate-definitions-of-do-logging.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/globals.c b/src/globals.c
-index 97e3c35..dff0868 100644
---- a/src/globals.c
-+++ b/src/globals.c
-@@ -42,7 +42,6 @@ GdkColor white;
- GdkColor black;
-
- int logfile_fd=-1;
--int do_logging=TRUE;
- int logging_dest=LOG_WINDOW;
-
- /* netlist specific variables */
-
diff --git a/patches/geda-gschem/01-Use-pkg-config-support-for-Guile-if-present.patch b/patches/geda-gschem/01-Use-pkg-config-support-for-Guile-if-present.patch
deleted file mode 100644
index d392c36..0000000
--- a/patches/geda-gschem/01-Use-pkg-config-support-for-Guile-if-present.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/configure.ac.in b/configure.ac.in
-index 13df721..1febc45 100644
---- a/configure.ac.in
-+++ b/configure.ac.in
-@@ -91,7 +91,28 @@ fi
-
- ############################################################################
- # Check for guile start
--GUILE_FLAGS
-+#
-+
-+# Check for pkg-config
-+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+if test $PKG_CONFIG = no; then
-+ AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
-+fi
-+
-+PKG_CHECK_MODULES(GUILE, guile-1.8, GUILE_PC="yes", no_GUILE_PC="yes")
-+
-+if test "$GUILE_PC" = "yes"
-+then
-+
-+ GUILE_VERSION=`$PKG_CONFIG guile-1.8 --modversion`
-+
-+else
-+
-+ # Find about the installed guile
-+ GUILE_FLAGS
-+ GUILE_VERSION=`$GUILE_CONFIG info guileversion`
-+
-+fi
-
- # Check Guile version
- guile_need_major=1
-@@ -99,7 +120,6 @@ guile_need_minor=6
- guile_need_version="$guile_need_major[].$guile_need_minor.0"
-
- AC_MSG_CHECKING([Guile version >= $guile_need_version])
--GUILE_VERSION=`$GUILE_CONFIG info guileversion`
-
- guile_major=`echo "$GUILE_VERSION" | sed 's/\([[^.]][[^.]]*\).*/\1/'`
- guile_minor=`echo "$GUILE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
-@@ -234,12 +254,6 @@ fi
- # Check for gtk+ 2.4 start
- #
-
--# Check for pkg-config
--AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
--if test $PKG_CONFIG = no; then
-- AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
--fi
--
- PKG_CHECK_MODULES(GTK24, gtk+-2.0 >= 2.4.0, GTK24="yes", no_GTK24="yes")
-
- # This next bit of code figures out what gtk we need to use.
diff --git a/patches/geda-gschem/02-Draw-func-cleanup.patch b/patches/geda-gschem/02-Draw-func-cleanup.patch
deleted file mode 100644
index efe5af5..0000000
--- a/patches/geda-gschem/02-Draw-func-cleanup.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/globals.c b/src/globals.c
-index 858468a..1a489ef 100644
---- a/src/globals.c
-+++ b/src/globals.c
-@@ -66,7 +66,6 @@ void (*bus_draw_func)() = o_bus_draw;
- void (*text_draw_func)() = o_text_draw;
- void (*pin_draw_func)() = o_pin_draw;
- void (*select_func)() = o_select_object; /* NEW SELECTION code */
--void (*x_log_update_func)() = NULL;
- int (*load_newer_backup_func)() = x_fileselect_load_backup;
-
- /* command line options */
-
diff --git a/patches/geda-gschem/03-Fixup-installation-of-drawing-callbacks.patch b/patches/geda-gschem/03-Fixup-installation-of-drawing-callbacks.patch
deleted file mode 100644
index 1c9d71d..0000000
--- a/patches/geda-gschem/03-Fixup-installation-of-drawing-callbacks.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/src/globals.c b/src/globals.c
-index a11e365..7898f89 100644
---- a/src/globals.c
-+++ b/src/globals.c
-@@ -51,18 +51,7 @@ int do_logging = TRUE;
- int logging_dest = LOG_WINDOW;
-
- /* these are required by libgeda */
--void (*arc_draw_func)() = o_arc_draw;
--void (*box_draw_func)() = o_box_draw;
--void (*picture_draw_func)() = o_picture_draw;
--void (*circle_draw_func)() = o_circle_draw;
--void (*complex_draw_func)() = o_complex_draw;
--void (*line_draw_func)() = o_line_draw;
--void (*net_draw_func)() = o_net_draw;
--void (*bus_draw_func)() = o_bus_draw;
--void (*text_draw_func)() = o_text_draw;
--void (*pin_draw_func)() = o_pin_draw;
- void (*select_func)() = o_select_object; /* NEW SELECTION code */
--int (*load_newer_backup_func)() = x_fileselect_load_backup;
-
- /* command line options */
- int quiet_mode = FALSE;
-diff --git a/src/gschem.c b/src/gschem.c
-index 6d68bb4..80c6934 100644
---- a/src/gschem.c
-+++ b/src/gschem.c
-@@ -164,7 +164,20 @@ void main_prog(void *closure, int argc, char *argv[])
- cwd = g_get_current_dir();
-
- libgeda_init();
--
-+
-+ /* Install various libgeda callbacks */
-+ arc_draw_func = o_arc_draw;
-+ box_draw_func = o_box_draw;
-+ bus_draw_func = o_bus_draw;
-+ circle_draw_func = o_circle_draw;
-+ complex_draw_func = o_complex_draw;
-+ line_draw_func = o_line_draw;
-+ net_draw_func = o_net_draw;
-+ picture_draw_func = o_picture_draw;
-+ pin_draw_func = o_pin_draw;
-+ text_draw_func = o_text_draw;
-+ load_newer_backup_func = x_fileselect_load_backup;
-+
- /*! \todo Probably the file name shuold be defined elsewhere */
- /* create log file right away even if logging is enabled */
- filename = g_build_filename (cwd, "gschem.log", NULL);
diff --git a/patches/geda-gschem/04-Define-select-func-only-in-libgeda.patch b/patches/geda-gschem/04-Define-select-func-only-in-libgeda.patch
deleted file mode 100644
index 45a470a..0000000
--- a/patches/geda-gschem/04-Define-select-func-only-in-libgeda.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/src/globals.c b/src/globals.c
-index e0d25a5..d5fc4a5 100644
---- a/src/globals.c
-+++ b/src/globals.c
-@@ -49,9 +49,6 @@ GdkColor black;
-
- int logging_dest = LOG_WINDOW;
-
--/* these are required by libgeda */
--void (*select_func)() = o_select_object; /* NEW SELECTION code */
--
- /* command line options */
- int quiet_mode = FALSE;
- int verbose_mode = FALSE;
-diff --git a/src/gschem.c b/src/gschem.c
-index 633d33d..9b3384a 100644
---- a/src/gschem.c
-+++ b/src/gschem.c
-@@ -178,6 +178,7 @@ void main_prog(void *closure, int argc, char *argv[])
- pin_draw_func = o_pin_draw;
- text_draw_func = o_text_draw;
- load_newer_backup_func = x_fileselect_load_backup;
-+ select_func = o_select_object;
-
- /*! \todo Probably the file name shuold be defined elsewhere */
- /* create log file right away even if logging is enabled */
-
diff --git a/patches/geda-gschem/05-Remove-duplicate-definitions-of-do-logging.patch b/patches/geda-gschem/05-Remove-duplicate-definitions-of-do-logging.patch
deleted file mode 100644
index 58154df..0000000
--- a/patches/geda-gschem/05-Remove-duplicate-definitions-of-do-logging.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/globals.c b/src/globals.c
-index 7898f89..e0d25a5 100644
---- a/src/globals.c
-+++ b/src/globals.c
-@@ -47,7 +47,6 @@ GdkColormap *colormap;
- GdkColor white;
- GdkColor black;
-
--int do_logging = TRUE;
- int logging_dest = LOG_WINDOW;
-
- /* these are required by libgeda */
-
diff --git a/patches/geda-gsymcheck/01-Use-pkg-config-support-for-Guile-if-present.patch b/patches/geda-gsymcheck/01-Use-pkg-config-support-for-Guile-if-present.patch
deleted file mode 100644
index 169c7c7..0000000
--- a/patches/geda-gsymcheck/01-Use-pkg-config-support-for-Guile-if-present.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index ef1ee50..d7c3de0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -51,7 +51,28 @@ fi
-
- ############################################################################
- # Check for guile start
--GUILE_FLAGS
-+#
-+
-+# Check for pkg-config
-+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+if test $PKG_CONFIG = no; then
-+ AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
-+fi
-+
-+PKG_CHECK_MODULES(GUILE, guile-1.8, GUILE_PC="yes", no_GUILE_PC="yes")
-+
-+if test "$GUILE_PC" = "yes"
-+then
-+
-+ GUILE_VERSION=`$PKG_CONFIG guile-1.8 --modversion`
-+
-+else
-+
-+ # Find about the installed guile
-+ GUILE_FLAGS
-+ GUILE_VERSION=`$GUILE_CONFIG info guileversion`
-+
-+fi
-
- # Check Guile version
- guile_need_major=1
-@@ -59,7 +80,6 @@ guile_need_minor=6
- guile_need_version="$guile_need_major[].$guile_need_minor.0"
-
- AC_MSG_CHECKING([Guile version >= $guile_need_version])
--GUILE_VERSION=`$GUILE_CONFIG info guileversion`
-
- guile_major=`echo "$GUILE_VERSION" | sed 's/\([[^.]][[^.]]*\).*/\1/'`
- guile_minor=`echo "$GUILE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
-@@ -127,12 +147,6 @@ AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", DL_LIB="")
- # Check for gtk+ 2.4 start
- #
-
--# Check for pkg-config
--AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
--if test $PKG_CONFIG = no; then
-- AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
--fi
--
- PKG_CHECK_MODULES(GTK24, gtk+-2.0 >= 2.4.0, GTK24="yes", no_GTK24="yes")
-
- # This next bit of code figures out what gtk we need to use.
diff --git a/patches/geda-gsymcheck/02-dont-register-recalc-funcs-as-fraw-funcs.patch b/patches/geda-gsymcheck/02-dont-register-recalc-funcs-as-fraw-funcs.patch
deleted file mode 100644
index f57da8b..0000000
--- a/patches/geda-gsymcheck/02-dont-register-recalc-funcs-as-fraw-funcs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/src/globals.c b/src/globals.c
-index 1baeaf7..40819a4 100644
---- a/src/globals.c
-+++ b/src/globals.c
-@@ -44,16 +44,16 @@ int do_logging=TRUE;
- int logging_dest=STDOUT_TTY;
-
- /* these are required by libgeda */
--void (*arc_draw_func)() = o_arc_recalc;
--void (*box_draw_func)() = o_box_recalc;
--void (*picture_draw_func)() = o_picture_recalc;
--void (*circle_draw_func)() = o_circle_recalc;
--void (*complex_draw_func)() = o_complex_recalc;
--void (*line_draw_func)() = o_line_recalc;
--void (*net_draw_func)() = o_net_recalc;
--void (*text_draw_func)() = o_text_recalc;
--void (*bus_draw_func)() = o_bus_recalc;
--void (*pin_draw_func)() = o_pin_recalc;
-+void (*arc_draw_func)() = NULL;
-+void (*box_draw_func)() = NULL;
-+void (*picture_draw_func)() = NULL;
-+void (*circle_draw_func)() = NULL;
-+void (*complex_draw_func)() = NULL;
-+void (*line_draw_func)() = NULL;
-+void (*net_draw_func)() = NULL;
-+void (*text_draw_func)() = NULL;
-+void (*bus_draw_func)() = NULL;
-+void (*pin_draw_func)() = NULL;
- void (*select_func)() = NULL;
- void (*x_log_update_func)() = s_log_update;
- int (*load_newer_backup_func)() = NULL;
-
diff --git a/patches/geda-gsymcheck/03-Draw-func-cleanup.patch b/patches/geda-gsymcheck/03-Draw-func-cleanup.patch
deleted file mode 100644
index 4282729..0000000
--- a/patches/geda-gsymcheck/03-Draw-func-cleanup.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/src/globals.c b/src/globals.c
-index 40819a4..276dfd1 100644
---- a/src/globals.c
-+++ b/src/globals.c
-@@ -44,19 +44,7 @@ int do_logging=TRUE;
- int logging_dest=STDOUT_TTY;
-
- /* these are required by libgeda */
--void (*arc_draw_func)() = NULL;
--void (*box_draw_func)() = NULL;
--void (*picture_draw_func)() = NULL;
--void (*circle_draw_func)() = NULL;
--void (*complex_draw_func)() = NULL;
--void (*line_draw_func)() = NULL;
--void (*net_draw_func)() = NULL;
--void (*text_draw_func)() = NULL;
--void (*bus_draw_func)() = NULL;
--void (*pin_draw_func)() = NULL;
--void (*select_func)() = NULL;
- void (*x_log_update_func)() = s_log_update;
--int (*load_newer_backup_func)() = NULL;
-
- /* command line arguments */
- int verbose_mode=FALSE;
-
diff --git a/patches/geda-gsymcheck/05-Remove-duplicate-definitions-of-do-logging.patch b/patches/geda-gsymcheck/05-Remove-duplicate-definitions-of-do-logging.patch
deleted file mode 100644
index 90070f6..0000000
--- a/patches/geda-gsymcheck/05-Remove-duplicate-definitions-of-do-logging.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/globals.c b/src/globals.c
-index 276dfd1..1f01108 100644
---- a/src/globals.c
-+++ b/src/globals.c
-@@ -40,7 +40,6 @@ GdkColor black;
-
-
- int logfile_fd=-1;
--int do_logging=TRUE;
- int logging_dest=STDOUT_TTY;
-
- /* these are required by libgeda */
-
diff --git a/patches/geda-utils/01-Use-pkg-config-support-for-Guile-if-present.patch b/patches/geda-utils/01-Use-pkg-config-support-for-Guile-if-present.patch
deleted file mode 100644
index 52b3820..0000000
--- a/patches/geda-utils/01-Use-pkg-config-support-for-Guile-if-present.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 0de3acd..79146cf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -88,7 +88,28 @@ fi
-
- ############################################################################
- # Check for guile start
--GUILE_FLAGS
-+#
-+
-+# Check for pkg-config
-+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+if test $PKG_CONFIG = no; then
-+ AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
-+fi
-+
-+PKG_CHECK_MODULES(GUILE, guile-1.8, GUILE_PC="yes", no_GUILE_PC="yes")
-+
-+if test "$GUILE_PC" = "yes"
-+then
-+
-+ GUILE_VERSION=`$PKG_CONFIG guile-1.8 --modversion`
-+
-+else
-+
-+ # Find about the installed guile
-+ GUILE_FLAGS
-+ GUILE_VERSION=`$GUILE_CONFIG info guileversion`
-+
-+fi
-
- # Check Guile version
- guile_need_major=1
-@@ -96,7 +117,6 @@ guile_need_minor=6
- guile_need_version="$guile_need_major[].$guile_need_minor.0"
-
- AC_MSG_CHECKING([Guile version >= $guile_need_version])
--GUILE_VERSION=`$GUILE_CONFIG info guileversion`
-
- guile_major=`echo "$GUILE_VERSION" | sed 's/\([[^.]][[^.]]*\).*/\1/'`
- guile_minor=`echo "$GUILE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
-@@ -180,12 +200,6 @@ fi
- # Check for gtk+ 2.4 start
- #
-
--# Check for pkg-config
--AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
--if test $PKG_CONFIG = no; then
-- AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
--fi
--
- PKG_CHECK_MODULES(GTK24, gtk+-2.0 >= 2.4.0, GTK24="yes", no_GTK24="yes")
-
- # This next bit of code figures out what gtk we need to use.
diff --git a/patches/geda-utils/02-dont-register-recalc-funcs-as-fraw-funcs.patch b/patches/geda-utils/02-dont-register-recalc-funcs-as-fraw-funcs.patch
deleted file mode 100644
index bbd5b1c..0000000
--- a/patches/geda-utils/02-dont-register-recalc-funcs-as-fraw-funcs.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/gschlas/globals.c b/gschlas/globals.c
-index 005a711..d441517 100644
---- a/gschlas/globals.c
-+++ b/gschlas/globals.c
-@@ -48,16 +48,16 @@ int do_logging=TRUE;
- int logging_dest=LOG_WINDOW;
-
- /* these are required by libgeda */
--void (*arc_draw_func)() = o_arc_recalc;
--void (*box_draw_func)() = o_box_recalc;
--void (*picture_draw_func)() = o_picture_recalc;
--void (*circle_draw_func)() = o_circle_recalc;
--void (*complex_draw_func)() = o_complex_recalc;
--void (*line_draw_func)() = o_line_recalc;
--void (*net_draw_func)() = o_net_recalc;
--void (*bus_draw_func)() = o_bus_recalc;
--void (*text_draw_func)() = o_text_recalc;
--void (*pin_draw_func)() = o_pin_recalc;
-+void (*arc_draw_func)() = NULL;
-+void (*box_draw_func)() = NULL;
-+void (*picture_draw_func)() = NULL;
-+void (*circle_draw_func)() = NULL;
-+void (*complex_draw_func)() = NULL;
-+void (*line_draw_func)() = NULL;
-+void (*net_draw_func)() = NULL;
-+void (*bus_draw_func)() = NULL;
-+void (*text_draw_func)() = NULL;
-+void (*pin_draw_func)() = NULL;
- void (*select_func)() = o_select_dummy;
- void (*x_log_update_func)() = NULL;
- int (*load_newer_backup_func)() = NULL;
diff --git a/patches/geda-utils/03-Draw-func-cleanup.patch b/patches/geda-utils/03-Draw-func-cleanup.patch
deleted file mode 100644
index c0e3975..0000000
--- a/patches/geda-utils/03-Draw-func-cleanup.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/gschlas/globals.c b/gschlas/globals.c
-index d441517..56f1756 100644
---- a/gschlas/globals.c
-+++ b/gschlas/globals.c
-@@ -48,19 +48,7 @@ int do_logging=TRUE;
- int logging_dest=LOG_WINDOW;
-
- /* these are required by libgeda */
--void (*arc_draw_func)() = NULL;
--void (*box_draw_func)() = NULL;
--void (*picture_draw_func)() = NULL;
--void (*circle_draw_func)() = NULL;
--void (*complex_draw_func)() = NULL;
--void (*line_draw_func)() = NULL;
--void (*net_draw_func)() = NULL;
--void (*bus_draw_func)() = NULL;
--void (*text_draw_func)() = NULL;
--void (*pin_draw_func)() = NULL;
- void (*select_func)() = o_select_dummy;
--void (*x_log_update_func)() = NULL;
--int (*load_newer_backup_func)() = NULL;
-
- /* this is just a dummy function, so that compoments are saved properly */
- void
diff --git a/patches/geda-utils/05-Remove-duplicate-definitions-of-do-logging.patch b/patches/geda-utils/05-Remove-duplicate-definitions-of-do-logging.patch
deleted file mode 100644
index c3741d4..0000000
--- a/patches/geda-utils/05-Remove-duplicate-definitions-of-do-logging.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/gschlas/globals.c b/gschlas/globals.c
-index 56f1756..74f9958 100644
---- a/gschlas/globals.c
-+++ b/gschlas/globals.c
-@@ -44,7 +44,6 @@ GdkColor black;
- #endif
-
- int logfile_fd=-1;
--int do_logging=TRUE;
- int logging_dest=LOG_WINDOW;
-
- /* these are required by libgeda */
diff --git a/patches/libgeda/0001-MinGW-does-not-have-getlogin.patch b/patches/libgeda/0001-MinGW-does-not-have-getlogin.patch
deleted file mode 100644
index c10364e..0000000
--- a/patches/libgeda/0001-MinGW-does-not-have-getlogin.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 33869db394762f1edf85f541a6c61d162c13c0cc Mon Sep 17 00:00:00 2001
-From: Cesar Strauss <cstrauss@cesar.(none)>
-Date: Fri, 24 Oct 2008 22:14:59 -0200
-Subject: [PATCH] MinGW does not have getlogin.
-
----
- configure.ac.in | 2 +-
- src/f_print.c | 4 ++++
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac.in b/configure.ac.in
-index 6a3c02c..e701501 100644
---- a/configure.ac.in
-+++ b/configure.ac.in
-@@ -352,7 +352,7 @@ AC_C_CONST
-
- # Checks for library functions.
- AC_TYPE_SIGNAL
--AC_CHECK_FUNCS(getcwd strstr vsnprintf snprintf chown)
-+AC_CHECK_FUNCS(getcwd strstr vsnprintf snprintf chown getlogin)
-
- #
- # Checks for header files end
-diff --git a/src/f_print.c b/src/f_print.c
-index 1820544..ce4b584 100644
---- a/src/f_print.c
-+++ b/src/f_print.c
-@@ -114,7 +114,9 @@ int f_print_header(TOPLEVEL *toplevel, FILE *fp,
- fprintf(fp, "%%%%Creator: gEDA gschem %s\n"
- "%%%%CreationDate: %s"
- "%%%%Title: %s\n"
-+#ifdef HAVE_GETLOGIN
- "%%%%Author: %s\n"
-+#endif
- "%%%%BoundingBox: %d %d %d %d\n"
- "%%%%Orientation: %s\n"
- "%%%%Pages: 1\n"
-@@ -123,7 +125,9 @@ int f_print_header(TOPLEVEL *toplevel, FILE *fp,
- DATE_VERSION,
- ctime(¤t_time),
- toplevel->page_current->page_filename,
-+#ifdef HAVE_GETLOGIN
- getlogin(),
-+#endif
- llx, lly, urx, ury,
- ((toplevel->print_orientation == LANDSCAPE)
- ? "Landscape" : "Portrait")
---
-1.5.4.3
-
diff --git a/patches/libgeda/0002-MinGW-does-not-have-sys-wait.h.patch b/patches/libgeda/0002-MinGW-does-not-have-sys-wait.h.patch
deleted file mode 100644
index 8470a62..0000000
--- a/patches/libgeda/0002-MinGW-does-not-have-sys-wait.h.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 343d54becf789229bdc718dcf7a002a48817f01a Mon Sep 17 00:00:00 2001
-From: Cesar Strauss <cstrauss@cesar.(none)>
-Date: Fri, 24 Oct 2008 22:17:33 -0200
-Subject: [PATCH] MinGW does not have sys/wait.h
-
----
- src/s_clib.c | 7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/src/s_clib.c b/src/s_clib.c
-index f3057c7..1fa3ca1 100644
---- a/src/s_clib.c
-+++ b/src/s_clib.c
-@@ -123,7 +123,14 @@
- #include <dmalloc.h>
- #endif
-
-+#ifdef HAVE_SYS_WAIT_H
- #include <sys/wait.h>
-+#else
-+#define WIFSIGNALED(x) 0
-+#define WTERMSIG(x) 0
-+#define WIFEXITED(x) 1
-+#define WEXITSTATUS(x) 0
-+#endif
-
- #include <time.h>
-
---
-1.5.4.3
-
diff --git a/patches/libgeda/0003-Use-pkg-config-support-for-Guile-if-present.patch b/patches/libgeda/0003-Use-pkg-config-support-for-Guile-if-present.patch
deleted file mode 100644
index 6eab74d..0000000
--- a/patches/libgeda/0003-Use-pkg-config-support-for-Guile-if-present.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From fd758bbfd66aacea304cb56d96904d2b865e5a4f Mon Sep 17 00:00:00 2001
-From: Cesar Strauss <cstrauss@cesar.(none)>
-Date: Fri, 24 Oct 2008 22:21:36 -0200
-Subject: [PATCH] Use pkg-config support for Guile if present.
-
----
- configure.ac.in | 32 ++++++++++++++++++++++----------
- 1 files changed, 22 insertions(+), 10 deletions(-)
-
-diff --git a/configure.ac.in b/configure.ac.in
-index e701501..9954fd8 100644
---- a/configure.ac.in
-+++ b/configure.ac.in
-@@ -97,9 +97,28 @@ IT_PROG_INTLTOOL(0.35.0)
- # Check for guile start
- #
-
--# Find about the installed guile
--AC_GEDA_MACRO_CHECK([GUILE_FLAGS], [guile.m4])
--GUILE_FLAGS
-+# Check for pkg-config
-+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+if test $PKG_CONFIG = no; then
-+ AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
-+fi
-+
-+PKG_CHECK_MODULES(GUILE, guile-1.8, GUILE_PC="yes", no_GUILE_PC="yes")
-+
-+if test "$GUILE_PC" = "yes"
-+then
-+
-+ GUILE_LDFLAGS=$GUILE_LIBS
-+ GUILE_VERSION=`$PKG_CONFIG guile-1.8 --modversion`
-+
-+else
-+
-+ # Find about the installed guile
-+ AC_GEDA_MACRO_CHECK([GUILE_FLAGS], [guile.m4])
-+ GUILE_FLAGS
-+ GUILE_VERSION=`$GUILE_CONFIG info guileversion`
-+
-+fi
-
- # Check Guile version
- guile_need_major=1
-@@ -107,7 +126,6 @@ guile_need_minor=6
- guile_need_version="$guile_need_major[].$guile_need_minor.0"
-
- AC_MSG_CHECKING([Guile version >= $guile_need_version])
--GUILE_VERSION=`$GUILE_CONFIG info guileversion`
-
- guile_major=`echo "$GUILE_VERSION" | sed 's/\([[^.]][[^.]]*\).*/\1/'`
- guile_minor=`echo "$GUILE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
-@@ -177,12 +195,6 @@ fi
- # Check for gtk+ 2.4 start
- #
-
--# Check for pkg-config
--AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
--if test $PKG_CONFIG = no; then
-- AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
--fi
--
- PKG_CHECK_MODULES(GTK24, gtk+-2.0 >= 2.4.0, GTK24="yes", no_GTK24="yes")
-
- # This next bit of code figures out what gtk we need to use.
---
-1.5.4.3
-
diff --git a/patches/libgeda/0004-MinGW-does-not-have-realpath.patch b/patches/libgeda/0004-MinGW-does-not-have-realpath.patch
deleted file mode 100644
index 2247615..0000000
--- a/patches/libgeda/0004-MinGW-does-not-have-realpath.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 7d1e495d9b98f95c8b18c61799d10d7ac72ad2bc Mon Sep 17 00:00:00 2001
-From: Cesar Strauss <cstrauss@cesar.(none)>
-Date: Fri, 24 Oct 2008 22:26:25 -0200
-Subject: [PATCH] MinGW does not have realpath.
-
----
- src/f_basic.c | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/src/f_basic.c b/src/f_basic.c
-index cfaf94b..2a8da4d 100644
---- a/src/f_basic.c
-+++ b/src/f_basic.c
-@@ -479,9 +479,12 @@ char* f_normalize_filename(const gchar *filename)
- return NULL;
- }
-
-+#ifndef __MINGW32__
- realpath(filename, filename_buffer); /* places reult in filename_buffer */
- full_filename = g_strdup (filename_buffer);
--
-+#else
-+ full_filename = g_strdup (filename);
-+#endif
- #ifdef DEBUG
- printf("In f_normalize_filename, returning full_filename= %s \n", full_filename);
- #endif
---
-1.5.4.3
-
diff --git a/patches/libgeda/0005-Draw-func-cleanup.patch b/patches/libgeda/0005-Draw-func-cleanup.patch
deleted file mode 100644
index 059ec39..0000000
--- a/patches/libgeda/0005-Draw-func-cleanup.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-diff --git a/src/f_basic.c b/src/f_basic.c
-index 0127571..ac7f492 100644
---- a/src/f_basic.c
-+++ b/src/f_basic.c
-@@ -45,6 +45,9 @@
- #include <dmalloc.h>
- #endif
-
-+/*! Default setting for arc draw function. */
-+int (*load_newer_backup_func)() = NULL;
-+
- /*! \brief Get the autosave filename for a file
- * \par Function description
- * Returns the expected autosave filename for the \a filename passed.
-diff --git a/src/o_arc_basic.c b/src/o_arc_basic.c
-index 2da8ad5..fb34f8f 100644
---- a/src/o_arc_basic.c
-+++ b/src/o_arc_basic.c
-@@ -28,6 +28,9 @@
- #include <dmalloc.h>
- #endif
-
-+/*! Default setting for arc draw function. */
-+void (*arc_draw_func)() = NULL;
-+
- /*! \brief
- * \par Function Description
- * The function creates a new object of type arc and links it
-diff --git a/src/o_basic.c b/src/o_basic.c
-index d617165..f0d7fa5 100644
---- a/src/o_basic.c
-+++ b/src/o_basic.c
-@@ -33,6 +33,9 @@
- #include <dmalloc.h>
- #endif
-
-+/*! Default setting for object selection function. */
-+void (*select_func)() = NULL;
-+
- /* \todo
- * Lots of Gross code... needs lots of cleanup
- * mainly readability issues
-diff --git a/src/o_box_basic.c b/src/o_box_basic.c
-index b4ca8d8..b61fa8c 100644
---- a/src/o_box_basic.c
-+++ b/src/o_box_basic.c
-@@ -49,6 +49,9 @@
- #define GET_BOX_TOP(w) \
- min((w)->start_y, (w)->last_y);
-
-+/*! Default setting for draw function. */
-+void (*box_draw_func)() = NULL;
-+
- /*! \brief Create a BOX and add it to a list.
- * \par Function Description
- * This function creates a new object representing a box.
-diff --git a/src/o_bus_basic.c b/src/o_bus_basic.c
-index ece05e0..3f92618 100644
---- a/src/o_bus_basic.c
-+++ b/src/o_bus_basic.c
-@@ -31,6 +31,9 @@
- #include <dmalloc.h>
- #endif
-
-+/*! Default setting for bus draw function. */
-+void (*bus_draw_func)() = NULL;
-+
- /* \brief
- * \par Function Description
- *
-diff --git a/src/o_circle_basic.c b/src/o_circle_basic.c
-index 43891b4..7a6f31e 100644
---- a/src/o_circle_basic.c
-+++ b/src/o_circle_basic.c
-@@ -27,6 +27,9 @@
- #include <dmalloc.h>
- #endif
-
-+/*! Default setting for circle draw function. */
-+void (*circle_draw_func)() = NULL;
-+
- /*! \brief
- * \par Function Description
- *
-diff --git a/src/o_complex_basic.c b/src/o_complex_basic.c
-index 1839742..966a228 100644
---- a/src/o_complex_basic.c
-+++ b/src/o_complex_basic.c
-@@ -34,6 +34,9 @@
- #include <dmalloc.h>
- #endif
-
-+/*! Default setting for complex draw function. */
-+void (*complex_draw_func)() = NULL;
-+
- /*! \brief Return the bounds of the given object.
- * \par Given an object, calculate the bounds coordinates.
- * \param [in] toplevel The toplevel structure.
-diff --git a/src/o_line_basic.c b/src/o_line_basic.c
-index dde4956..c97bf3b 100644
---- a/src/o_line_basic.c
-+++ b/src/o_line_basic.c
-@@ -28,6 +28,9 @@
- #include <dmalloc.h>
- #endif
-
-+/*! Default setting for line draw function. */
-+void (*line_draw_func)() = NULL;
-+
- /*! \brief Create and add line OBJECT to list.
- * \par Function Description
- * This function creates a new object representing a line.
-diff --git a/src/o_net_basic.c b/src/o_net_basic.c
-index 6f62dce..caf49ac 100644
---- a/src/o_net_basic.c
-+++ b/src/o_net_basic.c
-@@ -28,6 +28,9 @@
- #include <dmalloc.h>
- #endif
-
-+/*! Default setting for net draw function. */
-+void (*net_draw_func)() = NULL;
-+
- /*! \todo Finish function documentation!!!
- * \brief
- * \par Function Description
-diff --git a/src/o_picture.c b/src/o_picture.c
-index a1b981b..faff205 100644
---- a/src/o_picture.c
-+++ b/src/o_picture.c
-@@ -40,6 +40,9 @@
-
- #include "libgeda_priv.h"
-
-+/*! Default setting for picture draw function. */
-+void (*picture_draw_func)() = NULL;
-+
- /*! \brief Create picture OBJECT from character string.
- * \par Function Description
- * This function will get the description of a picture from the
-diff --git a/src/o_pin_basic.c b/src/o_pin_basic.c
-index f08584d..65b47ea 100644
---- a/src/o_pin_basic.c
-+++ b/src/o_pin_basic.c
-@@ -28,6 +28,9 @@
- #include <dmalloc.h>
- #endif
-
-+/*! Default setting for pin draw function. */
-+void (*pin_draw_func)() = NULL;
-+
- /*! \todo Finish function documentation!!!
- * \brief
- * \par Function Description
-diff --git a/src/o_text_basic.c b/src/o_text_basic.c
-index 7ff723f..f0d1124 100644
---- a/src/o_text_basic.c
-+++ b/src/o_text_basic.c
-@@ -35,6 +35,9 @@
- #include <dmalloc.h>
- #endif
-
-+/*! Default setting for text draw function. */
-+void (*text_draw_func)() = NULL;
-+
- #define WINONLY 1
- #define BACKING 2
-
-diff --git a/src/s_log.c b/src/s_log.c
-index d28f3eb..1ff475a 100644
---- a/src/s_log.c
-+++ b/src/s_log.c
-@@ -46,6 +46,9 @@
- #include <dmalloc.h>
- #endif
-
-+/*! Default setting for log update callback function. */
-+void (*x_log_update_func)() = NULL;
-+
- #define CATCH_LOG_LEVELS (G_LOG_LEVEL_MASK ^ \
- (G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_INFO))
- #define PRINT_LOG_LEVELS (CATCH_LOG_LEVELS ^ \
-
diff --git a/patches/libgeda/0006-Add-no-undefined-to-libtool-flags.patch b/patches/libgeda/0006-Add-no-undefined-to-libtool-flags.patch
deleted file mode 100644
index 70ebd4b..0000000
--- a/patches/libgeda/0006-Add-no-undefined-to-libtool-flags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac.in b/configure.ac.in
-index 39af36e..8585d5d 100644
---- a/configure.ac.in
-+++ b/configure.ac.in
-@@ -506,7 +506,7 @@ fi
- # Finally create the final CFLAGS and LDFLAGS for use in the makefiles
- LIBGEDA_CFLAGS="$MINGW_CFLAGS $GUILE_CFLAGS $GTK_CFLAGS $X_CFLAGS $GDK_PIXBUF_CFLAGS $GDK_CFLAGS"
- LIBGEDA_LDFLAGS="$GUILE_LDFLAGS $GLIB_LIBS $DMALLOC_LIBS $GDK_PIXBUF_LIBS $GDK_LIBS"
--LIBTOOL_FLAGS="-version-info $SHARED_LIBRARY_VERSION"
-+LIBTOOL_FLAGS="-version-info $SHARED_LIBRARY_VERSION -no-undefined"
-
- # Makefile.in variable substitution
- AC_SUBST(DATE_VERSION)
diff --git a/patches/libgeda/0007-Provide-definition-for-do-logging.patch b/patches/libgeda/0007-Provide-definition-for-do-logging.patch
deleted file mode 100644
index add675f..0000000
--- a/patches/libgeda/0007-Provide-definition-for-do-logging.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/s_log.c b/src/s_log.c
-index 1ff475a..959cfcd 100644
---- a/src/s_log.c
-+++ b/src/s_log.c
-@@ -49,6 +49,9 @@
- /*! Default setting for log update callback function. */
- void (*x_log_update_func)() = NULL;
-
-+/*! Default setting for log enable. */
-+int do_logging = 0;
-+
- #define CATCH_LOG_LEVELS (G_LOG_LEVEL_MASK ^ \
- (G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_INFO))
- #define PRINT_LOG_LEVELS (CATCH_LOG_LEVELS ^ \
diff --git a/patches/libgeda/0008-Remove-duplicate-definitions-of-do-logging.patch b/patches/libgeda/0008-Remove-duplicate-definitions-of-do-logging.patch
deleted file mode 100644
index 17b8278..0000000
--- a/patches/libgeda/0008-Remove-duplicate-definitions-of-do-logging.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/s_log.c b/src/s_log.c
-index 959cfcd..552a079 100644
---- a/src/s_log.c
-+++ b/src/s_log.c
-@@ -50,7 +50,7 @@
- void (*x_log_update_func)() = NULL;
-
- /*! Default setting for log enable. */
--int do_logging = 0;
-+int do_logging = TRUE;
-
- #define CATCH_LOG_LEVELS (G_LOG_LEVEL_MASK ^ \
- (G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_INFO))
-
diff --git a/recipes/cairo.recipe b/recipes/cairo.recipe
index 60a5ffd..b7f8a10 100644
--- a/recipes/cairo.recipe
+++ b/recipes/cairo.recipe
@@ -2,5 +2,4 @@ name=cairo
version=1.8.6
release=1
download=http://www.cairographics.org/releases
-configure_opt=--without-x
-
+configure_opt="--without-x --enable-ft=no"
diff --git a/recipes/geda-docs.recipe b/recipes/geda-docs.recipe
index 0a1953b..fa188db 100644
--- a/recipes/geda-docs.recipe
+++ b/recipes/geda-docs.recipe
@@ -1,4 +1,4 @@
name=geda-docs
-version=1.4.3
+version=1.5.1
release=1
-download=http://geda.seul.org/release/v1.4/$version
+download=http://geda.seul.org/devel/v1.5/$version
diff --git a/recipes/geda-examples.recipe b/recipes/geda-examples.recipe
index 2bbc622..4303225 100644
--- a/recipes/geda-examples.recipe
+++ b/recipes/geda-examples.recipe
@@ -1,4 +1,4 @@
name=geda-examples
-version=1.4.3
+version=1.5.1
release=1
-download=http://geda.seul.org/release/v1.4/$version
+download=http://geda.seul.org/devel/v1.5/$version
diff --git a/recipes/geda-gattrib.recipe b/recipes/geda-gattrib.recipe
index 6ff8a54..def936d 100644
--- a/recipes/geda-gattrib.recipe
+++ b/recipes/geda-gattrib.recipe
@@ -1,11 +1,11 @@
name=geda-gattrib
-version=1.4.3
+version=1.5.1
release=1
-download=http://geda.seul.org/release/v1.4/$version
+download=http://geda.seul.org/devel/v1.5/$version
configure_opt="--disable-update-desktop-database"
-src_prep()
-{
- ./autogen.sh
-}
+#src_prep()
+#{
+# ./autogen.sh
+#}
diff --git a/recipes/geda-gnetlist.recipe b/recipes/geda-gnetlist.recipe
index 2729604..27f7f2e 100644
--- a/recipes/geda-gnetlist.recipe
+++ b/recipes/geda-gnetlist.recipe
@@ -1,9 +1,9 @@
name=geda-gnetlist
-version=1.4.3
+version=1.5.1
release=1
-download=http://geda.seul.org/release/v1.4/$version
+download=http://geda.seul.org/devel/v1.5/$version
-src_prep()
-{
- ./autogen.sh
-}
+#src_prep()
+#{
+# ./autogen.sh
+#}
diff --git a/recipes/geda-gschem.recipe b/recipes/geda-gschem.recipe
index faa031d..da24e1b 100644
--- a/recipes/geda-gschem.recipe
+++ b/recipes/geda-gschem.recipe
@@ -1,11 +1,11 @@
name=geda-gschem
-version=1.4.3
+version=1.5.1
release=1
-download=http://geda.seul.org/release/v1.4/$version
+download=http://geda.seul.org/devel/v1.5/$version
configure_opt="--disable-update-desktop-database"
-src_prep()
-{
- ./autogen.sh
-}
+#src_prep()
+#{
+# ./autogen.sh
+#}
diff --git a/recipes/geda-gsymcheck.recipe b/recipes/geda-gsymcheck.recipe
index 420e91b..7bde37f 100644
--- a/recipes/geda-gsymcheck.recipe
+++ b/recipes/geda-gsymcheck.recipe
@@ -1,9 +1,9 @@
name=geda-gsymcheck
-version=1.4.3
+version=1.5.1
release=1
-download=http://geda.seul.org/release/v1.4/$version
+download=http://geda.seul.org/devel/v1.5/$version
-src_prep()
-{
- ./autogen.sh
-}
+#src_prep()
+#{
+# ./autogen.sh
+#}
diff --git a/recipes/geda-symbols.recipe b/recipes/geda-symbols.recipe
index 7aa4b1f..3a2ce37 100644
--- a/recipes/geda-symbols.recipe
+++ b/recipes/geda-symbols.recipe
@@ -1,4 +1,4 @@
name=geda-symbols
-version=1.4.3
+version=1.5.1
release=1
-download=http://geda.seul.org/release/v1.4/$version
+download=http://geda.seul.org/devel/v1.5/$version
diff --git a/recipes/geda-utils.recipe b/recipes/geda-utils.recipe
index 786fa8e..0ab516c 100644
--- a/recipes/geda-utils.recipe
+++ b/recipes/geda-utils.recipe
@@ -1,8 +1,9 @@
name=geda-utils
-version=1.4.3
+version=1.5.1
release=1
-download=http://geda.seul.org/release/v1.4/$version
-src_prep()
-{
- ./autogen.sh
-}
+download=http://geda.seul.org/devel/v1.5/$version
+
+#src_prep()
+#{
+# ./autogen.sh
+#}
diff --git a/recipes/libgeda.recipe b/recipes/libgeda.recipe
index 8a2596e..6e72311 100644
--- a/recipes/libgeda.recipe
+++ b/recipes/libgeda.recipe
@@ -1,7 +1,7 @@
name=libgeda
-version=1.4.3
+version=1.5.1
release=1
-download=http://geda.seul.org/release/v1.4/$version
+download=http://geda.seul.org/devel/v1.5/1.5.1
configure_opt="--disable-update-mime-database"
--
1.6.3.3
_______________________________________________
geda-user mailing list
geda-user@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-user