geda: Updated and packaged complete toolchain version 1.4.1.

diff --git a/packages/geda/files/bad-include.patch b/packages/geda/files/bad-include.patch
new file mode 100644 (file)
index 0000000..b64f351
--- /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 (file)
index 6f6f0c6..0000000
--- 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
similarity index 50%
rename from packages/geda/geda-gnetlist_20050820.bb
rename to packages/geda/geda-docs_1.4.1.bb
index a0f7d60..a35d415 100644 (file)
--- 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
similarity index 50%
rename from packages/geda/geda-gschem_20050820.bb
rename to packages/geda/geda-examples_1.4.1.bb
index 6ca5e4f..a35d415 100644 (file)
--- 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 (file)
index 0000000..463da2d
--- /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
similarity index 68%
rename from packages/geda/geda-gattrib_20050820.bb
rename to packages/geda/geda-gnetlist_1.4.1.bb
index 74c1971..4f560d3 100644 (file)
--- 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 (file)
index 0000000..2ed828c
--- /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 (file)
index 0000000..463da2d
--- /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
similarity index 66%
rename from packages/geda/geda-gsymcheck_20050820.bb
rename to packages/geda/geda-symbols_1.4.1.bb
index a0f7d60..4f560d3 100644 (file)
--- 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 (file)
index a0f7d60..0000000
--- 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
similarity index 70%
rename from packages/geda/geda-utils_20050820.bb
rename to packages/geda/geda-utils_1.4.1.bb
index d5b71b3..ea61665 100644 (file)
--- 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 (file)
index 0000000..b3c0e99
--- /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 (file)
index 0ca490a..0000000
--- 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 (file)
index 0000000..f438f54
--- /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 (file)
index e27e6f6..0000000
--- 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
-}