Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/06/04 14:37:56+02:00 dyndns.org!reenoo
sylpheed: some gpgme m4 macros are necessary at configure time. thanks to pb_ for pointing this out.

2005/06/04 14:20:26+02:00 dyndns.org!reenoo
sylpheed: actually enable gnutls. remove gpgme from DEPENDS for now since it's not enabled and doesn't work either ATM.

2005/06/04 14:11:46+02:00 dyndns.org!reenoo
gnutls: export asn1_* functions from libgnutls.so. fixes bug #57.

BKrev: 42a1a130bcszKNK9Vo8WaspfQ9KjKw

diff --git a/packages/gnutls/gnutls-1.0.23/export-symbols.patch b/packages/gnutls/gnutls-1.0.23/export-symbols.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/gnutls/gnutls_1.0.23.bb b/packages/gnutls/gnutls_1.0.23.bb
index 521900d..1e22617 100644 (file)
--- a/packages/gnutls/gnutls_1.0.23.bb
+++ b/packages/gnutls/gnutls_1.0.23.bb
@@ -1,11 +1,12 @@
 DESCRIPTION = "GNU Transport Layer Security Library"
 DEPENDS = "zlib libgcrypt"
-PR = "r4"
+PR = "r5"
 
 LICENSE = "LGPL"
 
 SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/attic/gnutls-${PV}.tar.gz \
-       file://gnutls-openssl.patch;patch=1"
+       file://gnutls-openssl.patch;patch=1 \
+       file://export-symbols.patch;patch=1"
 
 inherit autotools
 inherit binconfig

diff --git a/packages/sylpheed/sylpheed_1.0.0-gtk2-20041224.bb b/packages/sylpheed/sylpheed_1.0.0-gtk2-20041224.bb
index 7d88eb0..3ee5845 100644 (file)
--- a/packages/sylpheed/sylpheed_1.0.0-gtk2-20041224.bb
+++ b/packages/sylpheed/sylpheed_1.0.0-gtk2-20041224.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Mail user agent"
 DEPENDS = "gtk+ gpgme gnutls"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/sylpheed-gtk2/sylpheed-${PV}.tar.gz \
        file://sylpheed-gnutls.patch;patch=1"
@@ -11,7 +11,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/sylpheed-gtk2/sylpheed-${PV}.tar.gz \
 FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
 FILES_${PN}-doc += "${datadir}"
 
-EXTRA_OECONF = "--with-gnutls"
+EXTRA_OECONF = "--enable-gnutls"
 
 CFLAGS += "-D_GNU_SOURCE"
 

diff --git a/packages/sylpheed/sylpheed_1.9.12.bb b/packages/sylpheed/sylpheed_1.9.12.bb
index e69de29..00da790 100644 (file)
--- a/packages/sylpheed/sylpheed_1.9.12.bb
+++ b/packages/sylpheed/sylpheed_1.9.12.bb
@@ -0,0 +1,30 @@
+SECTION = "x11/network"
+DESCRIPTION = "Mail user agent"
+DEPENDS = "gtk+ gpgme gnutls"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+LICENSE = "GPL"
+PR = "r2"
+
+SRC_URI = "http://sylpheed.good-day.net/sylpheed/v1.9/sylpheed-1.9.12.tar.bz2 \
+       file://sylpheed-gnutls.patch;patch=1"
+
+FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
+FILES_${PN}-doc += "${datadir}"
+
+EXTRA_OECONF = "--enable-gnutls"
+
+CFLAGS += "-D_GNU_SOURCE"
+
+do_configure_prepend() {
+       mkdir -p m4
+}
+
+inherit autotools 
+
+do_install_append() {
+       install -d ${D}${datadir}/applications
+       install -m 0644 sylpheed.desktop ${D}${datadir}/applications/
+       install -d ${D}${datadir}/pixmaps
+       install -m 0644 sylpheed.png ${D}${datadir}/pixmaps/
+}
+