diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-06-04 12:40:16 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-06-04 12:40:16 +0000 |
| commit | e507c73e30a9268d76d6a9c0aa215ab45d8fa81a (patch) | |
| tree | 417dba01a7f20236a51de253947e281d041b34c2 | |
| parent | 7f84f3dd033aa351893bb5282816ca7e465217f2 (diff) | |
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
| -rw-r--r-- | packages/gnutls/gnutls-1.0.23/export-symbols.patch | 0 | ||||
| -rw-r--r-- | packages/gnutls/gnutls_1.0.23.bb | 5 | ||||
| -rw-r--r-- | packages/sylpheed/sylpheed_1.0.0-gtk2-20041224.bb | 4 | ||||
| -rw-r--r-- | packages/sylpheed/sylpheed_1.9.12.bb | 30 |
4 files changed, 35 insertions, 4 deletions
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 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gnutls/gnutls-1.0.23/export-symbols.patch diff --git a/packages/gnutls/gnutls_1.0.23.bb b/packages/gnutls/gnutls_1.0.23.bb index 521900d750..1e22617806 100644 --- 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 7d88eb07ce..3ee58453e5 100644 --- 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 e69de29bb2..00da7907a7 100644 --- 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/ +} + |