Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

16 files changed, 84 insertions, 68 deletions

diff --git a/packages/geda/files/bad-include.patch b/packages/geda/files/bad-include.patch
new file mode 100644
index 0000000000..b64f351950
--- /dev/null
+++ b/packages/geda/files/bad-include.patch
@@ -0,0 +1,13 @@
+Index: geda-gschem-1.4.1/src/Makefile.am
+===================================================================
+--- geda-gschem-1.4.1.orig/src/Makefile.am	2008-09-28 20:59:54.000000000 +0000
++++ geda-gschem-1.4.1/src/Makefile.am	2008-12-02 17:06:43.000000000 +0000
+@@ -30,7 +30,7 @@
+ AM_CFLAGS = -Wall
+ endif
+ 
+-INCLUDES = -I$(prefix)/include -I$(top_srcdir)/intl -I$(top_srcdir)/include @GSCHEM_CFLAGS@
++INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/include @GSCHEM_CFLAGS@
+ gschem_LDADD = -L$(prefix)/lib @GSCHEM_LDFLAGS@ @LIBINTL@
+ 
+ localedir = @datadir@/locale
diff --git a/packages/geda/files/gEDA.desktop b/packages/geda/files/gEDA.desktop
deleted file mode 100644
index 6f6f0c6e38..0000000000
--- a/packages/geda/files/gEDA.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=gEDA
-Comment=GPL suite of Electronic Design Automation tools
-Exec=geda
-Terminal=0
-Type=Application
-Icon=/usr/share/gEDA/bitmap/gschem-net.xpm
-Categories=Utility
diff --git a/packages/geda/geda-gnetlist_20050820.bb b/packages/geda/geda-docs_1.4.1.bb
index a0f7d60fb6..a35d41514b 100644
--- a/packages/geda/geda-gnetlist_20050820.bb
+++ b/packages/geda/geda-docs_1.4.1.bb
@@ -1,11 +1,8 @@
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
-PR = "r0"
-FILES_${PN} += "${datadir}/gEDA"
 
 DEPENDS = "gtk+ libgeda"
 
-SRC_URI = "http://www.geda.seul.org/devel/${PV}/${P}.tar.gz"
+SRC_URI = "http://geda.seul.org/release/v1.4/${PV}/${P}.tar.gz"
 
 inherit autotools pkgconfig
-
diff --git a/packages/geda/geda-gschem_20050820.bb b/packages/geda/geda-examples_1.4.1.bb
index 6ca5e4f77a..a35d41514b 100644
--- a/packages/geda/geda-gschem_20050820.bb
+++ b/packages/geda/geda-examples_1.4.1.bb
@@ -1,11 +1,8 @@
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
-PR = "r1"
-FILES_${PN} += "${datadir}/gEDA"
 
 DEPENDS = "gtk+ libgeda"
 
-SRC_URI = "http://www.geda.seul.org/devel/${PV}/${P}.tar.gz"
+SRC_URI = "http://geda.seul.org/release/v1.4/${PV}/${P}.tar.gz"
 
 inherit autotools pkgconfig
-
diff --git a/packages/geda/geda-gattrib_1.4.1.bb b/packages/geda/geda-gattrib_1.4.1.bb
new file mode 100644
index 0000000000..463da2de99
--- /dev/null
+++ b/packages/geda/geda-gattrib_1.4.1.bb
@@ -0,0 +1,9 @@
+LICENSE = "GPLv2"
+HOMEPAGE = "http://geda.seul.org"
+FILES_${PN} += "${datadir}/gEDA ${datadir}/icons"
+
+DEPENDS = "gtk+ libgeda"
+
+SRC_URI = "http://geda.seul.org/release/v1.4/${PV}/${P}.tar.gz"
+
+inherit autotools pkgconfig
diff --git a/packages/geda/geda-gattrib_20050820.bb b/packages/geda/geda-gnetlist_1.4.1.bb
index 74c19718f2..4f560d3d37 100644
--- a/packages/geda/geda-gattrib_20050820.bb
+++ b/packages/geda/geda-gnetlist_1.4.1.bb
@@ -4,7 +4,6 @@ FILES_${PN} += "${datadir}/gEDA"
 
 DEPENDS = "gtk+ libgeda"
 
-SRC_URI = "http://www.geda.seul.org/devel/${PV}/${P}.tar.gz"
+SRC_URI = "http://geda.seul.org/release/v1.4/${PV}/${P}.tar.gz"
 
 inherit autotools pkgconfig
-
diff --git a/packages/geda/geda-gschem_1.4.1.bb b/packages/geda/geda-gschem_1.4.1.bb
new file mode 100644
index 0000000000..2ed828c449
--- /dev/null
+++ b/packages/geda/geda-gschem_1.4.1.bb
@@ -0,0 +1,10 @@
+LICENSE = "GPLv2"
+HOMEPAGE = "http://geda.seul.org"
+FILES_${PN} += "${datadir}/gEDA ${datadir}/icons"
+
+DEPENDS = "gtk+ libgeda"
+
+SRC_URI = "http://geda.seul.org/release/v1.4/${PV}/${P}.tar.gz \
+	   file://bad-include.patch;patch=1"
+
+inherit autotools pkgconfig
diff --git a/packages/geda/geda-gsymcheck_1.4.1.bb b/packages/geda/geda-gsymcheck_1.4.1.bb
new file mode 100644
index 0000000000..463da2de99
--- /dev/null
+++ b/packages/geda/geda-gsymcheck_1.4.1.bb
@@ -0,0 +1,9 @@
+LICENSE = "GPLv2"
+HOMEPAGE = "http://geda.seul.org"
+FILES_${PN} += "${datadir}/gEDA ${datadir}/icons"
+
+DEPENDS = "gtk+ libgeda"
+
+SRC_URI = "http://geda.seul.org/release/v1.4/${PV}/${P}.tar.gz"
+
+inherit autotools pkgconfig
diff --git a/packages/geda/geda-gsymcheck_20050820.bb b/packages/geda/geda-symbols_1.4.1.bb
index a0f7d60fb6..4f560d3d37 100644
--- a/packages/geda/geda-gsymcheck_20050820.bb
+++ b/packages/geda/geda-symbols_1.4.1.bb
@@ -1,11 +1,9 @@
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
-PR = "r0"
 FILES_${PN} += "${datadir}/gEDA"
 
 DEPENDS = "gtk+ libgeda"
 
-SRC_URI = "http://www.geda.seul.org/devel/${PV}/${P}.tar.gz"
+SRC_URI = "http://geda.seul.org/release/v1.4/${PV}/${P}.tar.gz"
 
 inherit autotools pkgconfig
-
diff --git a/packages/geda/geda-symbols_20050820.bb b/packages/geda/geda-symbols_20050820.bb
deleted file mode 100644
index a0f7d60fb6..0000000000
--- a/packages/geda/geda-symbols_20050820.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-LICENSE = "GPLv2"
-HOMEPAGE = "http://geda.seul.org"
-PR = "r0"
-FILES_${PN} += "${datadir}/gEDA"
-
-DEPENDS = "gtk+ libgeda"
-
-SRC_URI = "http://www.geda.seul.org/devel/${PV}/${P}.tar.gz"
-
-inherit autotools pkgconfig
-
diff --git a/packages/geda/geda-utils_20050820.bb b/packages/geda/geda-utils_1.4.1.bb
index d5b71b3cf7..ea61665d9d 100644
--- a/packages/geda/geda-utils_20050820.bb
+++ b/packages/geda/geda-utils_1.4.1.bb
@@ -2,10 +2,9 @@ DESCRIPTION = "gEDA/gaf's Utilities"
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
 FILES_${PN} += "${datadir}/gEDA"
-PR = "r1"
 
 DEPENDS = "libgeda"
 
-SRC_URI = "http://www.geda.seul.org/devel/${PV}/${P}.tar.gz"
+SRC_URI = "http://geda.seul.org/release/v1.4/${PV}/${P}.tar.gz"
 
 inherit autotools pkgconfig
diff --git a/packages/geda/geda_1.4.1.bb b/packages/geda/geda_1.4.1.bb
new file mode 100644
index 0000000000..b3c0e994b4
--- /dev/null
+++ b/packages/geda/geda_1.4.1.bb
@@ -0,0 +1,6 @@
+DESCRIPTION = "GUI/Project Manager for teh gEDA suite"
+LICENSE = "GPLv2"
+HOMEPAGE = "http://geda.seul.org"
+
+DEPENDS = "libgeda gtk+"
+RRECOMMENDS = "geda-utils geda-gattrib geda-gnetlist geda-gschem geda-gsymcheck geda-symbols geda-docs geda-examples"
diff --git a/packages/geda/geda_20050820.bb b/packages/geda/geda_20050820.bb
deleted file mode 100644
index 0ca490a664..0000000000
--- a/packages/geda/geda_20050820.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "GUI/Project Manager for teh gEDA suite"
-LICENSE = "GPLv2"
-HOMEPAGE = "http://geda.seul.org"
-FILES_${PN} += "${datadir}/gEDA"
-PR ="r2"
-
-DEPENDS = "libgeda gtk+"
-RRECOMMENDS = "geda-utils geda-gattrib geda-gnetlist geda-gschem geda-gsymcheck geda-symbols"
-
-SRC_URI = "http://www.geda.seul.org/devel/${PV}/${P}.tar.gz \
-	   file://gEDA.desktop"
-
-inherit autotools pkgconfig
-
-do_install_append() {
-install -d ${D}${datadir}/applications/
-install -m 644 ${WORKDIR}/gEDA.desktop ${D}${datadir}/applications/
-}
diff --git a/packages/geda/libgeda_1.4.1.bb b/packages/geda/libgeda_1.4.1.bb
new file mode 100644
index 0000000000..f438f54553
--- /dev/null
+++ b/packages/geda/libgeda_1.4.1.bb
@@ -0,0 +1,20 @@
+LICENSE = "GPLv2"
+HOMEPAGE = "http://geda.seul.org"
+FILES_${PN} += "${datadir}/gEDA ${datadir}/icons ${datadir}/mime"
+# NOTE: Old KDE integration ${datadir}/mimelnk/application/*.desktop are ignored intentionally (utx)
+
+DEPENDS = "zlib gtk+ guile libpng"
+
+SRC_URI = "http://geda.seul.org/release/v1.4/${PV}/${P}.tar.gz"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-update-mime-database"
+
+do_install_prepend() {
+	sed -i 's:${STAGING_DIR_HOST}::g' libgeda.pc
+}
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/geda/libgeda_20050820.bb b/packages/geda/libgeda_20050820.bb
deleted file mode 100644
index e27e6f65ae..0000000000
--- a/packages/geda/libgeda_20050820.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-LICENSE = "GPLv2"
-HOMEPAGE = "http://geda.seul.org"
-PR = "r1"
-
-DEPENDS = "zlib gtk+ guile libpng"
-
-SRC_URI = "http://www.geda.seul.org/devel/${PV}/${P}.tar.gz"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/guile/guile_1.8.5.bb b/packages/guile/guile_1.8.5.bb
index fe5ebbc154..6d320d8158 100644
--- a/packages/guile/guile_1.8.5.bb
+++ b/packages/guile/guile_1.8.5.bb
@@ -4,13 +4,16 @@ HOMEPAGE = "http://www.gnu.org/software/guile/guile.html"
 SECTION = "devel/scheme"
 DEPENDS = "guile-native gmp libtool"
 LICENSE = "GPL"
+PACKAGES =+ "${PN}-el"
+FILES_${PN}-el = "${datadir}/emacs"
+DESCRIPTION_${PN}-el = "Emacs lisp files for Guile"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
            file://configure-fix.patch;patch=1 "
 
-inherit autotools binconfig
+inherit autotools
 
 acpaths = "-I ${S}/guile-config"
 
@@ -33,5 +36,11 @@ do_compile() {
 
 do_stage() {
 	autotools_stage_all
+	# Create guile-config returning target values instead of native values
+	install -d ${STAGING_BINDIR_CROSS}
+	echo '#!'`which guile`$' \\\n-e main -s\n!#\n(define %guile-build-info '\'\( >guile-config.cross
+	sed -n $'s:-isystem[^ ]* ::;s:-Wl,-rpath-link,[^ ]* ::;s:^[ \t]*{[ \t]*":  (:;s:",[ \t]*": . ":;s:" *}, *\\\\:"):;/^  (/p' <libguile/libpath.h >>guile-config.cross
+	echo '))' >>guile-config.cross
+	cat guile-config/guile-config >>guile-config.cross
+	install guile-config.cross ${STAGING_BINDIR_CROSS}/guile-config
 }
-