[oe-commits] Koen Kooi : gnumeric: add 1.9.14

Fri Oct 30 10:56:54 UTC 2009

Module: openembedded.git
Branch: shr/merge
Commit: 7767c7c6d21cb731b15c3a8277f2fa316d24308f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=7767c7c6d21cb731b15c3a8277f2fa316d24308f

Author: Koen Kooi <koen at openembedded.org>
Date:   Wed Oct 28 21:03:04 2009 +0100

gnumeric: add 1.9.14
libgsf: add 1.14.16
goffice: add 0.7.14

---

 conf/checksums.ini                                 |   12 +++++++++++
 .../files => gnome/gnumeric}/remove-docs.patch     |    0 
 recipes/{gnumeric => gnome}/gnumeric_1.8.4.bb      |    0 
 .../gnumeric_1.8.4.bb => gnome/gnumeric_1.9.14.bb} |   11 ++++-----
 recipes/gnome/goffice_0.7.14.bb                    |   21 ++++++++++++++++++++
 recipes/{libgsf => gnome}/libgsf_1.10.0.bb         |    0 
 recipes/{libgsf => gnome}/libgsf_1.12.0.bb         |    0 
 recipes/{libgsf => gnome}/libgsf_1.12.1.bb         |    0 
 recipes/{libgsf => gnome}/libgsf_1.12.2.bb         |    0 
 recipes/{libgsf => gnome}/libgsf_1.13.2.bb         |    0 
 recipes/{libgsf => gnome}/libgsf_1.13.3.bb         |    0 
 .../libgsf_1.14.8.bb => gnome/libgsf_1.14.16.bb}   |    6 +---
 recipes/{libgsf => gnome}/libgsf_1.14.8.bb         |    0 
 13 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 0df37fc..30a15b3 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -9298,6 +9298,10 @@ sha256=173df749482f7391e50a6eb8339107b2b201582978637c63190c4a79f8e66d07
 md5=338f0084f04a16f78797ad01f85d3251
 sha256=a3c7fdbbafa6c9cfee7f16c067b043c3041cd0240292aa92b653a2221ae04503
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.9/gnumeric-1.9.14.tar.bz2]
+md5=6781d0df02e603c556758d90e96e37f6
+sha256=0f934eddd2204f938f0359d8c39ef590ab4fec60d6922853e6c8c23e3069d7f4
+
 [ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-1.4.2.2.tar.bz2]
 md5=c34736eb7cb687f9e5b6d4df48aaf7c8
 sha256=174e7f78c670d76984c4c4bd6077a0b9fec7b4be700b9f3e40c6889b78110c57
@@ -9406,6 +9410,10 @@ sha256=b126902259875a24ece29bdf1f93cc7fd4fd7b83508cae1c15dabd10b4d537cd
 md5=3d8d3357f9d58af901cd1d6eb42e2973
 sha256=a252aff88d801175b27fd7c20e00b0b5f674a5a70e64cd95091abdcab87db35c
 
+[http://ftp.gnome.org/pub/GNOME/sources/goffice/0.7/goffice-0.7.14.tar.bz2]
+md5=c48a89bfceeb604f163aa55540088021
+sha256=0fe2f4d7c39e85b5b577c6fa7a88c9a135ae5819cc521083af888e4c23deaacd
+
 [http://downloads.sourceforge.net/gparted/gparted-0.3.3.tar.bz2]
 md5=f3d16ccfda72fa1dac9fa1ff9ded2c42
 sha256=c7c86abd344055bdf1f840a037d04064759f52039cb075260b60369b721f245c
@@ -14746,6 +14754,10 @@ sha256=ef7833047caf66ed3de7b0195223911d28e45c78617d25c6bd05a53fd6c30a0c
 md5=b35e95f6bd7b8add9981b6cf6336674a
 sha256=458e7b2ca26f0d212f91b445f0a93db62a679ec671bd3cc980f3c1ac65f06b96
 
+[http://ftp.gnome.org/pub/GNOME/sources/libgsf/1.14/libgsf-1.14.16.tar.bz2]
+md5=8478d83fda0b6e57f36550c11a693ee1
+sha256=11fd8fca1bdbcfa426276a124ad083cca9632f03cf766523bcdfb2fca0b08908
+
 [http://ftp.gnome.org/pub/GNOME/sources/libgsf/1.14/libgsf-1.14.2.tar.bz2]
 md5=aea16a8408b65f95c308b0db3e3d3d47
 sha256=8b78905b3c61f67dbe9b50782b7005ee5a44cdb48dd0f654f42732b4807c829d
diff --git a/recipes/gnumeric/files/remove-docs.patch b/recipes/gnome/gnumeric/remove-docs.patch
similarity index 100%
rename from recipes/gnumeric/files/remove-docs.patch
rename to recipes/gnome/gnumeric/remove-docs.patch
diff --git a/recipes/gnumeric/gnumeric_1.8.4.bb b/recipes/gnome/gnumeric_1.8.4.bb
similarity index 100%
copy from recipes/gnumeric/gnumeric_1.8.4.bb
copy to recipes/gnome/gnumeric_1.8.4.bb
diff --git a/recipes/gnumeric/gnumeric_1.8.4.bb b/recipes/gnome/gnumeric_1.9.14.bb
similarity index 86%
rename from recipes/gnumeric/gnumeric_1.8.4.bb
rename to recipes/gnome/gnumeric_1.9.14.bb
index e375f27..8c7023e 100644
--- a/recipes/gnumeric/gnumeric_1.8.4.bb
+++ b/recipes/gnome/gnumeric_1.9.14.bb
@@ -1,23 +1,22 @@
 LICENSE = "GPL"
 SECTION = "x11/utils"
-S = "${WORKDIR}/gnumeric-${PV}"
 DEPENDS = "gdk-pixbuf-csource-native libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui orbit2-native"
 DESCRIPTION = "Gnumeric spreadsheet for GNOME"
 
-PR = "r0"
-
 PARALLEL_MAKE = ""
 
 inherit gnome flow-lossage
 
-SRC_URI += "file://remove-docs.patch;patch=1"
-
 EXTRA_OECONF=" --without-perl "
 
 PACKAGES_DYNAMIC += "gnumeric-plugin-*"
 
 FILES_${PN}-dbg += "${libdir}/gnumeric/${PV}/plugins/*/.debug"
-FILES_gnumeric_append = " /usr/lib/libspreadsheet-${PV}.so "
+FILES_${PN} += "${libdir}/libspreadsheet-${PV}.so "
+
+do_configure_prepend() {
+	sed -i -e s:doc\ tools:tools: ${S}/Makefile.am
+}
 
 # We need native orbit-idl with target idl files. No way to say it in a clean way:
 do_configure_append () {
diff --git a/recipes/gnome/goffice_0.7.14.bb b/recipes/gnome/goffice_0.7.14.bb
new file mode 100644
index 0000000..9fff0b4
--- /dev/null
+++ b/recipes/gnome/goffice_0.7.14.bb
@@ -0,0 +1,21 @@
+DESCRIPTION="Gnome Office Library"
+LICENSE="GPLv2"
+
+DEPENDS="glib-2.0 gtk+ pango cairo libgnomeprint libgsf libglade libpcre libxml2 libart-lgpl"
+
+FILES_${PN}-dbg += "${libdir}/goffice/${PV}/plugins/*/.debug"
+
+inherit gnome pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
+
+PACKAGES_DYNAMIC = "goffice-plugin-*"
+
+python populate_packages_prepend () {
+        goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d)
+
+        do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True)
+}
+
diff --git a/recipes/libgsf/libgsf_1.10.0.bb b/recipes/gnome/libgsf_1.10.0.bb
similarity index 100%
rename from recipes/libgsf/libgsf_1.10.0.bb
rename to recipes/gnome/libgsf_1.10.0.bb
diff --git a/recipes/libgsf/libgsf_1.12.0.bb b/recipes/gnome/libgsf_1.12.0.bb
similarity index 100%
rename from recipes/libgsf/libgsf_1.12.0.bb
rename to recipes/gnome/libgsf_1.12.0.bb
diff --git a/recipes/libgsf/libgsf_1.12.1.bb b/recipes/gnome/libgsf_1.12.1.bb
similarity index 100%
rename from recipes/libgsf/libgsf_1.12.1.bb
rename to recipes/gnome/libgsf_1.12.1.bb
diff --git a/recipes/libgsf/libgsf_1.12.2.bb b/recipes/gnome/libgsf_1.12.2.bb
similarity index 100%
rename from recipes/libgsf/libgsf_1.12.2.bb
rename to recipes/gnome/libgsf_1.12.2.bb
diff --git a/recipes/libgsf/libgsf_1.13.2.bb b/recipes/gnome/libgsf_1.13.2.bb
similarity index 100%
rename from recipes/libgsf/libgsf_1.13.2.bb
rename to recipes/gnome/libgsf_1.13.2.bb
diff --git a/recipes/libgsf/libgsf_1.13.3.bb b/recipes/gnome/libgsf_1.13.3.bb
similarity index 100%
rename from recipes/libgsf/libgsf_1.13.3.bb
rename to recipes/gnome/libgsf_1.13.3.bb
diff --git a/recipes/libgsf/libgsf_1.14.8.bb b/recipes/gnome/libgsf_1.14.16.bb
similarity index 84%
copy from recipes/libgsf/libgsf_1.14.8.bb
copy to recipes/gnome/libgsf_1.14.16.bb
index 43fd3ab..5697275 100644
--- a/recipes/libgsf/libgsf_1.14.8.bb
+++ b/recipes/gnome/libgsf_1.14.16.bb
@@ -1,17 +1,15 @@
 LICENSE = "GPL"
 SECTION = "libs"
-PR = "r0"
 
 DEPENDS= "libxml2 bzip2 glib-2.0 zlib gtk-doc libbonobo gnome-vfs"
 RDEPENDS = "gconf gnome-vfs"
 
-
 PACKAGES =+ "${PN}-gnome ${PN}-gnome-dev "
 
 FILES_${PN}-gnome = "${libdir}/libgsf-gnome-1.so.*"
 FILES_${PN}-gnome-dev = "${libdir}/libgsf-gnome-1.* ${includedir}/libgsf-1/gsf-gnome"
 
-inherit autotools pkgconfig gnome gconf
+inherit gnome
 
 EXTRA_OECONF = "\
 		--without-python \
@@ -19,5 +17,5 @@ EXTRA_OECONF = "\
 		--with-bz2"
 
 do_stage() {
-autotools_stage_all
+	autotools_stage_all
 }
diff --git a/recipes/libgsf/libgsf_1.14.8.bb b/recipes/gnome/libgsf_1.14.8.bb
similarity index 100%
rename from recipes/libgsf/libgsf_1.14.8.bb
rename to recipes/gnome/libgsf_1.14.8.bb



