diff options
author | Saul Wold <Saul.Wold@intel.com> | 2010-11-22 13:57:13 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-11-22 13:57:13 +0000 |
commit | cfe12efb5ec9586dab6961f141d52b103bd8b1d1 (patch) | |
tree | 7108e22aa7ddf6cfc2f1b6c6b73a811187706ecb /meta/recipes-connectivity | |
parent | 762fd6b7b3b22d7a8cb80ef9e9ba62e7ef21af3e (diff) | |
download | poky-cfe12efb5ec9586dab6961f141d52b103bd8b1d1.tar.gz |
Meta: Recipe Reogranization
This is the next stage of recipe reorganization, in this stage
many recipes where moved to a new meta-demoapps layer since this
is more appropriate for demo usage then the core. Additional some
recipes were moved to meta-extras to indicate they may be depercated
at a future time.
A number of recipes were modified since dependencies need to be
corrected.
Signed-off-by: Saul Wold <Saul.Wold@intel.com>
Diffstat (limited to 'meta/recipes-connectivity')
37 files changed, 1 insertions, 1017 deletions
diff --git a/meta/recipes-connectivity/bluez/bluez4_4.79.bb b/meta/recipes-connectivity/bluez/bluez4_4.79.bb index ee4ee45d3c..c9ef38f655 100644 --- a/meta/recipes-connectivity/bluez/bluez4_4.79.bb +++ b/meta/recipes-connectivity/bluez/bluez4_4.79.bb | |||
@@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ | |||
9 | file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \ | 9 | file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \ |
10 | file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191" | 10 | file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191" |
11 | DEPENDS = "gst-plugins-base alsa-lib libusb dbus-glib libnl" | 11 | DEPENDS = "gst-plugins-base alsa-lib libusb dbus-glib libnl" |
12 | RDEPENDS_${PN}-dev = "bluez-hcidump" | ||
12 | 13 | ||
13 | # For angstrom we want this to replace at least bluez-libs | 14 | # For angstrom we want this to replace at least bluez-libs |
14 | PROVIDES_append_angstrom = " bluez-utils bluez-libs" | 15 | PROVIDES_append_angstrom = " bluez-utils bluez-libs" |
diff --git a/meta/recipes-connectivity/farsight/farsight2_0.0.9.bb b/meta/recipes-connectivity/farsight/farsight2_0.0.9.bb deleted file mode 100644 index e20ec33d64..0000000000 --- a/meta/recipes-connectivity/farsight/farsight2_0.0.9.bb +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | DESCRIPTION = "FarSight is an audio/video conferencing framework specifically designed for Instant Messengers." | ||
2 | HOMEPAGE = "http://farsight.sf.net" | ||
3 | SRC_URI = "http://farsight.freedesktop.org/releases/farsight2/${P}.tar.gz" | ||
4 | LICENSE = "GPLv2.1" | ||
5 | DEPENDS = "libnice glib-2.0 libxml2 zlib dbus gstreamer gst-plugins-base" | ||
6 | |||
7 | inherit autotools | ||
8 | AUTOTOOLS_STAGE_PKGCONFIG = "1" | ||
9 | |||
10 | PR = "r1" | ||
11 | |||
12 | EXTRA_OECONF = " \ | ||
13 | --disable-debug \ | ||
14 | --disable-gtk-doc \ | ||
15 | --disable-python \ | ||
16 | " | ||
17 | |||
18 | FILES_${PN} += "${libdir}/*/*.so" | ||
19 | FILES_${PN}-dev += "${libdir}/f*/*a ${libdir}/g*/*a" | ||
20 | FILES_${PN}-dbg += "${libdir}/*/.debug" | ||
21 | |||
22 | |||
23 | |||
24 | |||
diff --git a/meta/recipes-connectivity/farsight/libnice_0.0.6.bb b/meta/recipes-connectivity/farsight/libnice_0.0.6.bb deleted file mode 100644 index a837cadee0..0000000000 --- a/meta/recipes-connectivity/farsight/libnice_0.0.6.bb +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | SUMMARY = "IETF draft Interactice Connectivity Establishment standard" | ||
2 | DESCRIPTION = "Libnice is an implementation of the IETF's draft Interactice Connectivity Establishment standard (ICE)." | ||
3 | HOMEPAGE = "http://nice.freedesktop.org/wiki/" | ||
4 | SRC_URI = "http://nice.freedesktop.org/releases/libnice-${PV}.tar.gz" | ||
5 | |||
6 | LICENSE = "LGPL/MPL" | ||
7 | DEPENDS = "glib-2.0 gstreamer" | ||
8 | |||
9 | inherit autotools | ||
10 | AUTOTOOLS_STAGE_PKGCONFIG = "1" | ||
11 | |||
12 | FILES_${PN} += "${libdir}/gstreamer-0.10/*.so" | ||
13 | FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*a" | ||
14 | FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" | ||
15 | |||
16 | do_compile_append() { | ||
17 | for i in $(find ${S} -name "*.pc") ; do | ||
18 | sed -i -e s:${STAGING_DIR_TARGET}::g \ | ||
19 | -e s:/${TARGET_SYS}::g \ | ||
20 | $i | ||
21 | done | ||
22 | } | ||
23 | |||
24 | |||
diff --git a/meta/recipes-connectivity/libetpan/files/cxx-is-here.patch b/meta/recipes-connectivity/libetpan/files/cxx-is-here.patch deleted file mode 100644 index d910daab17..0000000000 --- a/meta/recipes-connectivity/libetpan/files/cxx-is-here.patch +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | --- | ||
2 | configure.ac | 1 + | ||
3 | 1 file changed, 1 insertion(+) | ||
4 | |||
5 | --- libetpan-0.54.orig/configure.ac | ||
6 | +++ libetpan-0.54/configure.ac | ||
7 | @@ -104,10 +104,11 @@ if test "$have_w32_system" = yes; then | ||
8 | fi | ||
9 | AM_CONDITIONAL(HAVE_MINGW32_SYSTEM, test "$have_w32_system" = yes) | ||
10 | |||
11 | # Check the C compiler. | ||
12 | AC_PROG_CC | ||
13 | +AC_PROG_CXX | ||
14 | |||
15 | # Compiler flags. | ||
16 | AC_ARG_ENABLE(debug, [ --enable-debug setup flags (gcc) for debugging (default=no)], | ||
17 | if test "x$GCC" = xyes; then | ||
18 | CFLAGS="$CFLAGS -O2 -g" | ||
diff --git a/meta/recipes-connectivity/libetpan/libetpan_0.54.bb b/meta/recipes-connectivity/libetpan/libetpan_0.54.bb deleted file mode 100644 index 9b69471753..0000000000 --- a/meta/recipes-connectivity/libetpan/libetpan_0.54.bb +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | SUMMARY = "Library for communicating with mail and news services" | ||
2 | DESCRIPTION = "libetpan is a library for communicating with mail and news servers. \ | ||
3 | It supports the protocols SMTP, POP3, IMAP and NNTP." | ||
4 | HOMEPAGE = "http://www.etpan.org" | ||
5 | SECTION = "libs" | ||
6 | DEPENDS = "curl expat gnutls" | ||
7 | LICENSE = "BSD" | ||
8 | PR = "r1" | ||
9 | |||
10 | SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \ | ||
11 | file://cxx-is-here.patch;patch=1" | ||
12 | |||
13 | inherit autotools pkgconfig gettext binconfig | ||
14 | |||
15 | EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db" | ||
16 | |||
17 | PARALLEL_MAKE = "" | ||
18 | |||
19 | FILES_${PN} = "${libdir}/lib*.so.*" | ||
20 | FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig" | ||
diff --git a/meta/recipes-connectivity/loudmouth/loudmouth_1.4.0.bb b/meta/recipes-connectivity/loudmouth/loudmouth_1.4.0.bb deleted file mode 100644 index e20c41709a..0000000000 --- a/meta/recipes-connectivity/loudmouth/loudmouth_1.4.0.bb +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | SUMMARY = "XMPP/Jabber library" | ||
2 | DESCRIPTION = "Loudmouth is a lightweight and easy-to-use C library for programming with the XMPP/Jabber protocol." | ||
3 | HOMEPAGE = "http://www.loudmouth-project.org/" | ||
4 | LICENSE = "LGPL" | ||
5 | DEPENDS = "glib-2.0 gnutls libcheck" | ||
6 | PR = "r2" | ||
7 | |||
8 | SRC_URI = "http://ftp.imendio.com/pub/imendio/${PN}/src/${PN}-${PV}.tar.bz2" | ||
9 | |||
10 | inherit autotools pkgconfig | ||
diff --git a/meta/recipes-connectivity/network-suspend-scripts/network-suspend-scripts.bb b/meta/recipes-connectivity/network-suspend-scripts/network-suspend-scripts.bb deleted file mode 100644 index dc22ed85f6..0000000000 --- a/meta/recipes-connectivity/network-suspend-scripts/network-suspend-scripts.bb +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | DESCRIPTION = "Network suspend/resume scripts" | ||
2 | SECTION = "base" | ||
3 | LICENSE = "GPLv2" | ||
4 | PV = "1.1" | ||
5 | PR = "r2" | ||
6 | |||
7 | SRC_URI = "file://ifupdown \ | ||
8 | file://usbnet" | ||
9 | |||
10 | do_install() { | ||
11 | install -d ${D}${sysconfdir}/apm/scripts.d | ||
12 | install -m 0755 ${WORKDIR}/ifupdown ${D}${sysconfdir}/apm/scripts.d | ||
13 | install -m 0755 ${WORKDIR}/usbnet ${D}${sysconfdir}/apm/scripts.d | ||
14 | install -d ${D}${sysconfdir}/apm/suspend.d | ||
15 | ln -s ../scripts.d/ifupdown ${D}${sysconfdir}/apm/suspend.d/05ifupdown | ||
16 | ln -s ../scripts.d/usbnet ${D}${sysconfdir}/apm/suspend.d/10usbnet | ||
17 | install -d ${D}${sysconfdir}/apm/resume.d | ||
18 | ln -sf ../scripts.d/ifupdown ${D}${sysconfdir}/apm/resume.d/30ifupdown | ||
19 | ln -sf ../scripts.d/usbnet ${D}${sysconfdir}/apm/resume.d/20usbnet | ||
20 | } | ||
21 | |||
22 | FILES = "${sysconfdir}/apm" | ||
diff --git a/meta/recipes-connectivity/network-suspend-scripts/network-suspend-scripts/ifupdown b/meta/recipes-connectivity/network-suspend-scripts/network-suspend-scripts/ifupdown deleted file mode 100644 index d458da6866..0000000000 --- a/meta/recipes-connectivity/network-suspend-scripts/network-suspend-scripts/ifupdown +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # Unloads/loads all interface that are up at time of suspend | ||
3 | |||
4 | if [ "$1" = suspend ]; then | ||
5 | rm -f /var/run/ifstate-suspend | ||
6 | rm -f /var/run/ifstate-old | ||
7 | cp /var/run/ifstate /var/run/ifstate-old | ||
8 | cat /var/run/ifstate-old | ( | ||
9 | IFS="=" | ||
10 | while read IFACE LOGICAL; do | ||
11 | ifdown $IFACE | ||
12 | echo "$IFACE=$LOGICAL" >>/var/run/ifstate-suspend | ||
13 | done | ||
14 | rm -f /var/run/ifstate-old | ||
15 | ) | ||
16 | elif [ "$1" = resume ] && [ "$2" != standby ] && [ -f /var/run/ifstate-suspend ]; then | ||
17 | cat /var/run/ifstate-suspend | ( | ||
18 | while read LINE; do | ||
19 | ifup $LINE | ||
20 | done | ||
21 | ) | ||
22 | rm -f /var/run/ifstate-suspend | ||
23 | fi | ||
24 | |||
25 | : exit 0 | ||
26 | |||
diff --git a/meta/recipes-connectivity/network-suspend-scripts/network-suspend-scripts/usbnet b/meta/recipes-connectivity/network-suspend-scripts/network-suspend-scripts/usbnet deleted file mode 100644 index 3731f6339f..0000000000 --- a/meta/recipes-connectivity/network-suspend-scripts/network-suspend-scripts/usbnet +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # Unloads/loads usb-eth so it always works | ||
3 | |||
4 | . /etc/default/usbd | ||
5 | |||
6 | if [ "$1" = suspend ]; then | ||
7 | rmmod usb-eth | ||
8 | rmmod sa1100usb_core | ||
9 | elif [ "$1" = resume ] && [ "$2" != standby ]; then | ||
10 | modprobe usb-eth | ||
11 | modprobe -r $usbdmodule | ||
12 | modprobe $usbdmodule | ||
13 | fi | ||
14 | |||
15 | : exit 0 | ||
16 | |||
diff --git a/meta/recipes-connectivity/openswan/openswan-2.4.7/installflags.patch b/meta/recipes-connectivity/openswan/openswan-2.4.7/installflags.patch deleted file mode 100644 index e6da2eaa5f..0000000000 --- a/meta/recipes-connectivity/openswan/openswan-2.4.7/installflags.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: openswan-2.4.7/Makefile.inc | ||
2 | =================================================================== | ||
3 | --- openswan-2.4.7.orig/Makefile.inc 2006-12-25 18:05:40.608503250 +0100 | ||
4 | +++ openswan-2.4.7/Makefile.inc 2006-12-25 18:06:39.028154250 +0100 | ||
5 | @@ -158,7 +158,7 @@ | ||
6 | # how backup names are composed. | ||
7 | # Note that the install procedures will never overwrite an existing config | ||
8 | # file, which is why -b is not specified for them. | ||
9 | -INSTBINFLAGS=-b --suffix=.old | ||
10 | +INSTBINFLAGS= | ||
11 | INSTSUIDFLAGS=--mode=u+rxs,g+rx,o+rx --group=root -b --suffix=.old | ||
12 | INSTMANFLAGS= | ||
13 | INSTCONFFLAGS= | ||
diff --git a/meta/recipes-connectivity/openswan/openswan-2.4.7/ld-library-path-breakage.patch b/meta/recipes-connectivity/openswan/openswan-2.4.7/ld-library-path-breakage.patch deleted file mode 100644 index e3cc8762cc..0000000000 --- a/meta/recipes-connectivity/openswan/openswan-2.4.7/ld-library-path-breakage.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | --- openswan-2.2.0.orig/programs/Makefile.program 2004-06-03 03:06:27.000000000 +0200 | ||
2 | +++ openswan-2.2.0/programs/Makefile.program 2005-03-05 13:50:19.000000000 +0100 | ||
3 | @@ -30,10 +30,6 @@ | ||
4 | |||
5 | CFLAGS+= ${WERROR} | ||
6 | |||
7 | -ifneq ($(LD_LIBRARY_PATH),) | ||
8 | -LDFLAGS=-L$(LD_LIBRARY_PATH) | ||
9 | -endif | ||
10 | - | ||
11 | MANDIR8=$(MANTREE)/man8 | ||
12 | MANDIR5=$(MANTREE)/man5 | ||
13 | |||
14 | --- openswan-2.2.0.orig/programs/pluto/Makefile 2005-01-03 20:40:45.000000000 +0100 | ||
15 | +++ openswan-2.2.0/programs/pluto/Makefile 2005-03-05 13:51:21.000000000 +0100 | ||
16 | @@ -234,10 +234,6 @@ | ||
17 | LIBSPLUTO+=${CURL_LIBS} | ||
18 | LIBSPLUTO+= -lgmp -lresolv # -lefence | ||
19 | |||
20 | -ifneq ($(LD_LIBRARY_PATH),) | ||
21 | -LDFLAGS=-L$(LD_LIBRARY_PATH) | ||
22 | -endif | ||
23 | - | ||
24 | LIBSADNS = $(OPENSWANLIB) | ||
25 | LIBSADNS += -lresolv # -lefence | ||
26 | |||
diff --git a/meta/recipes-connectivity/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch b/meta/recipes-connectivity/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch deleted file mode 100644 index b3863a584b..0000000000 --- a/meta/recipes-connectivity/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch +++ /dev/null | |||
@@ -1,377 +0,0 @@ | |||
1 | diff -Nru openswan-2.4.7.orig/doc/Makefile openswan-2.4.7/doc/Makefile | ||
2 | --- openswan-2.4.7.orig/doc/Makefile 2005-11-08 23:32:45.000000000 +0200 | ||
3 | +++ openswan-2.4.7/doc/Makefile 2006-12-06 22:46:54.732830840 +0200 | ||
4 | @@ -1,6 +1,6 @@ | ||
5 | # Makefile to generate various formats from HTML source | ||
6 | # | ||
7 | -# Assumes the htmldoc utility is available. | ||
8 | +# No longer cares if the htmldoc utility is available. | ||
9 | # This can be downloaded from www.easysw.com | ||
10 | # | ||
11 | # Also needs lynx(1) for HTML-to-text conversion | ||
12 | diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/crypt586.pl openswan-2.4.7/lib/libcrypto/libdes/asm/crypt586.pl | ||
13 | --- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/crypt586.pl 2004-07-16 03:24:45.000000000 +0300 | ||
14 | +++ openswan-2.4.7/lib/libcrypto/libdes/asm/crypt586.pl 2006-12-06 22:46:54.732830840 +0200 | ||
15 | @@ -1,4 +1,4 @@ | ||
16 | -#!/usr/local/bin/perl | ||
17 | +#!/usr/bin/perl | ||
18 | # | ||
19 | # The inner loop instruction sequence and the IP/FP modifications are from | ||
20 | # Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk> | ||
21 | diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/cbc.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/cbc.pl | ||
22 | --- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/cbc.pl 2004-07-10 11:07:06.000000000 +0300 | ||
23 | +++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/cbc.pl 2006-12-06 22:46:54.736831090 +0200 | ||
24 | @@ -1,4 +1,4 @@ | ||
25 | -#!/usr/local/bin/perl | ||
26 | +#!/usr/bin/perl | ||
27 | |||
28 | # void des_ncbc_encrypt(input, output, length, schedule, ivec, enc) | ||
29 | # des_cblock (*input); | ||
30 | diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86asm.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86asm.pl | ||
31 | --- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86asm.pl 2004-07-10 11:07:06.000000000 +0300 | ||
32 | +++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86asm.pl 2006-12-06 22:46:54.736831090 +0200 | ||
33 | @@ -1,4 +1,4 @@ | ||
34 | -#!/usr/local/bin/perl | ||
35 | +#!/usr/bin/perl | ||
36 | |||
37 | # require 'x86asm.pl'; | ||
38 | # &asm_init("cpp","des-586.pl"); | ||
39 | diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86ms.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86ms.pl | ||
40 | --- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86ms.pl 2004-07-10 11:07:07.000000000 +0300 | ||
41 | +++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86ms.pl 2006-12-06 22:46:54.736831090 +0200 | ||
42 | @@ -1,4 +1,4 @@ | ||
43 | -#!/usr/local/bin/perl | ||
44 | +#!/usr/bin/perl | ||
45 | |||
46 | package x86ms; | ||
47 | |||
48 | diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86unix.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86unix.pl | ||
49 | --- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86unix.pl 2004-07-10 11:07:07.000000000 +0300 | ||
50 | +++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86unix.pl 2006-12-06 22:46:54.736831090 +0200 | ||
51 | @@ -1,4 +1,4 @@ | ||
52 | -#!/usr/local/bin/perl | ||
53 | +#!/usr/bin/perl | ||
54 | |||
55 | package x86unix; | ||
56 | |||
57 | diff -Nru openswan-2.4.7.orig/lib/liblwres/Makefile openswan-2.4.7/lib/liblwres/Makefile | ||
58 | --- openswan-2.4.7.orig/lib/liblwres/Makefile 2004-12-18 20:13:34.000000000 +0200 | ||
59 | +++ openswan-2.4.7/lib/liblwres/Makefile 2006-12-06 22:46:54.736831090 +0200 | ||
60 | @@ -20,7 +20,7 @@ | ||
61 | CDEFINES = -g | ||
62 | CWARNINGS = -Werror | ||
63 | |||
64 | -CFLAGS=${CINCLUDES} ${CDEFINES} ${CWARNINGS} | ||
65 | +CFLAGS=${CINCLUDES} ${CDEFINES} ${CWARNINGS} $(USERCOMPILE) | ||
66 | |||
67 | VERSION="@(\#) openswan-hacking-9.3-for-osw2" | ||
68 | LIBINTERFACE=2 | ||
69 | diff -Nru openswan-2.4.7.orig/linux/net/ipsec/des/asm/des-586.pl openswan-2.4.7/linux/net/ipsec/des/asm/des-586.pl | ||
70 | --- openswan-2.4.7.orig/linux/net/ipsec/des/asm/des-586.pl 2004-07-10 11:06:50.000000000 +0300 | ||
71 | +++ openswan-2.4.7/linux/net/ipsec/des/asm/des-586.pl 2006-12-06 22:46:54.736831090 +0200 | ||
72 | @@ -1,4 +1,4 @@ | ||
73 | -#!/usr/local/bin/perl | ||
74 | +#!/usr/bin/perl | ||
75 | # | ||
76 | # The inner loop instruction sequence and the IP/FP modifications are from | ||
77 | # Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk> | ||
78 | diff -Nru openswan-2.4.7.orig/linux/net/ipsec/des/asm/des686.pl openswan-2.4.7/linux/net/ipsec/des/asm/des686.pl | ||
79 | --- openswan-2.4.7.orig/linux/net/ipsec/des/asm/des686.pl 2004-07-10 11:06:50.000000000 +0300 | ||
80 | +++ openswan-2.4.7/linux/net/ipsec/des/asm/des686.pl 2006-12-06 22:46:54.740831340 +0200 | ||
81 | @@ -1,4 +1,4 @@ | ||
82 | -#!/usr/local/bin/perl | ||
83 | +#!/usr/bin/perl | ||
84 | |||
85 | $prog="des686.pl"; | ||
86 | |||
87 | diff -Nru openswan-2.4.7.orig/linux/net/ipsec/des/asm/desboth.pl openswan-2.4.7/linux/net/ipsec/des/asm/desboth.pl | ||
88 | --- openswan-2.4.7.orig/linux/net/ipsec/des/asm/desboth.pl 2004-07-10 11:06:50.000000000 +0300 | ||
89 | +++ openswan-2.4.7/linux/net/ipsec/des/asm/desboth.pl 2006-12-06 22:46:54.740831340 +0200 | ||
90 | @@ -1,4 +1,4 @@ | ||
91 | -#!/usr/local/bin/perl | ||
92 | +#!/usr/bin/perl | ||
93 | |||
94 | $L="edi"; | ||
95 | $R="esi"; | ||
96 | diff -Nru openswan-2.4.7.orig/Makefile.inc openswan-2.4.7/Makefile.inc | ||
97 | --- openswan-2.4.7.orig/Makefile.inc 2006-11-14 19:56:09.000000000 +0200 | ||
98 | +++ openswan-2.4.7/Makefile.inc 2006-12-06 22:48:32.534943089 +0200 | ||
99 | @@ -46,7 +46,7 @@ | ||
100 | DESTDIR?= | ||
101 | |||
102 | # "local" part of tree, used in building other pathnames | ||
103 | -INC_USRLOCAL=/usr/local | ||
104 | +INC_USRLOCAL?=/usr | ||
105 | |||
106 | # PUBDIR is where the "ipsec" command goes; beware, many things define PATH | ||
107 | # settings which are assumed to include it (or at least, to include *some* | ||
108 | @@ -80,7 +80,7 @@ | ||
109 | MANPLACES=man3 man5 man8 | ||
110 | |||
111 | # where configuration files go | ||
112 | -FINALCONFFILE?=/etc/ipsec.conf | ||
113 | +FINALCONFFILE?=/etc/ipsec/ipsec.conf | ||
114 | CONFFILE=$(DESTDIR)$(FINALCONFFILE) | ||
115 | |||
116 | FINALCONFDIR?=/etc | ||
117 | @@ -91,7 +91,7 @@ | ||
118 | |||
119 | # sample configuration files go into | ||
120 | INC_DOCDIR?=share/doc | ||
121 | -FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan | ||
122 | +FINALEXAMPLECONFDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan | ||
123 | EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR} | ||
124 | |||
125 | FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan | ||
126 | @@ -239,7 +239,7 @@ | ||
127 | # installed one in RH 7.2, won't work - you wind up depending upon | ||
128 | # openssl. | ||
129 | |||
130 | -BIND9STATICLIBDIR?=/usr/local/lib | ||
131 | +BIND9STATICLIBDIR?=/usr/lib | ||
132 | |||
133 | # if you install elsewere, you may need to point the include files to it. | ||
134 | #BIND9STATICLIBDIR?=/sandel/lib | ||
135 | diff -Nru openswan-2.4.7.orig/programs/barf/barf.in openswan-2.4.7/programs/barf/barf.in | ||
136 | --- openswan-2.4.7.orig/programs/barf/barf.in 2006-11-07 05:49:18.000000000 +0200 | ||
137 | +++ openswan-2.4.7/programs/barf/barf.in 2006-12-06 22:46:54.740831340 +0200 | ||
138 | @@ -16,7 +16,7 @@ | ||
139 | |||
140 | LOGS=${LOGS-/var/log} | ||
141 | CONFS=${IPSEC_CONFS-/etc} | ||
142 | -CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec.d} | ||
143 | +CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec/ipsec.d} | ||
144 | me="ipsec barf" | ||
145 | # Max lines to use for things like 'route -n' | ||
146 | maxlines=100 | ||
147 | @@ -238,13 +238,13 @@ | ||
148 | done | ||
149 | fi | ||
150 | _________________________ ipsec/ls-libdir | ||
151 | -ls -l ${IPSEC_LIBDIR-/usr/local/lib/ipsec} | ||
152 | +ls -l ${IPSEC_LIBDIR-/usr/lib/ipsec} | ||
153 | _________________________ ipsec/ls-execdir | ||
154 | -ls -l ${IPSEC_EXECDIR-/usr/local/libexec/ipsec} | ||
155 | +ls -l ${IPSEC_EXECDIR-/usr/libexec/ipsec} | ||
156 | _________________________ ipsec/updowns | ||
157 | -for f in `ls ${IPSEC_EXECDIR-/usr/local/libexec/ipsec} | egrep updown` | ||
158 | +for f in `ls ${IPSEC_EXECDIR-/usr/libexec/ipsec} | egrep updown` | ||
159 | do | ||
160 | - cat ${IPSEC_EXECDIR-/usr/local/libexec/ipsec}/$f | ||
161 | + cat ${IPSEC_EXECDIR-/usr/libexec/ipsec}/$f | ||
162 | done | ||
163 | _________________________ /proc/net/dev | ||
164 | cat /proc/net/dev | ||
165 | diff -Nru openswan-2.4.7.orig/programs/eroute/eroute.5 openswan-2.4.7/programs/eroute/eroute.5 | ||
166 | --- openswan-2.4.7.orig/programs/eroute/eroute.5 2006-10-26 23:40:43.000000000 +0300 | ||
167 | +++ openswan-2.4.7/programs/eroute/eroute.5 2006-12-06 22:57:19.307864340 +0200 | ||
168 | @@ -168,7 +168,7 @@ | ||
169 | .SH "FILES" | ||
170 | |||
171 | .PP | ||
172 | -/proc/net/ipsec_eroute, /usr/local/bin/ipsec | ||
173 | +/proc/net/ipsec_eroute, /usr/bin/ipsec | ||
174 | |||
175 | .SH "SEE ALSO" | ||
176 | |||
177 | diff -Nru openswan-2.4.7.orig/programs/eroute/eroute.8 openswan-2.4.7/programs/eroute/eroute.8 | ||
178 | --- openswan-2.4.7.orig/programs/eroute/eroute.8 2003-10-31 04:32:27.000000000 +0200 | ||
179 | +++ openswan-2.4.7/programs/eroute/eroute.8 2006-12-06 22:46:54.740831340 +0200 | ||
180 | @@ -308,7 +308,7 @@ | ||
181 | .br | ||
182 | .LP | ||
183 | .SH FILES | ||
184 | -/proc/net/ipsec_eroute, /usr/local/bin/ipsec | ||
185 | +/proc/net/ipsec_eroute, /usr/bin/ipsec | ||
186 | .SH "SEE ALSO" | ||
187 | ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_spi(8), | ||
188 | ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_eroute(5) | ||
189 | diff -Nru openswan-2.4.7.orig/programs/_include/_include.in openswan-2.4.7/programs/_include/_include.in | ||
190 | --- openswan-2.4.7.orig/programs/_include/_include.in 2003-01-06 23:44:04.000000000 +0200 | ||
191 | +++ openswan-2.4.7/programs/_include/_include.in 2006-12-06 22:46:54.740831340 +0200 | ||
192 | @@ -47,10 +47,10 @@ | ||
193 | do | ||
194 | if test ! -r "$f" | ||
195 | then | ||
196 | - if test ! "$f" = "/etc/ipsec.conf" | ||
197 | + if test ! "$f" = "/etc/ipsec/ipsec.conf" | ||
198 | then | ||
199 | echo "#:cannot open configuration file \'$f\'" | ||
200 | - if test "$f" = "/etc/ipsec.secrets" | ||
201 | + if test "$f" = "/etc/ipsec/ipsec.secrets" | ||
202 | then | ||
203 | echo "#:Your secrets file will be created when you start FreeS/WAN for the first time." | ||
204 | fi | ||
205 | diff -Nru openswan-2.4.7.orig/programs/ipsec/ipsec.8 openswan-2.4.7/programs/ipsec/ipsec.8 | ||
206 | --- openswan-2.4.7.orig/programs/ipsec/ipsec.8 2003-02-27 18:51:54.000000000 +0200 | ||
207 | +++ openswan-2.4.7/programs/ipsec/ipsec.8 2006-12-06 22:46:54.744831590 +0200 | ||
208 | @@ -81,7 +81,7 @@ | ||
209 | .I ipsec | ||
210 | thinks the IPsec configuration files are stored. | ||
211 | .SH FILES | ||
212 | -/usr/local/lib/ipsec usual utilities directory | ||
213 | +/usr/lib/ipsec usual utilities directory | ||
214 | .SH ENVIRONMENT | ||
215 | .PP | ||
216 | The following environment variables control where FreeS/WAN finds its | ||
217 | diff -Nru openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.5 openswan-2.4.7/programs/klipsdebug/klipsdebug.5 | ||
218 | --- openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.5 2006-10-27 01:21:25.000000000 +0300 | ||
219 | +++ openswan-2.4.7/programs/klipsdebug/klipsdebug.5 2006-12-06 22:58:04.150666840 +0200 | ||
220 | @@ -114,7 +114,7 @@ | ||
221 | .SH "FILES" | ||
222 | |||
223 | .PP | ||
224 | -/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec | ||
225 | +/proc/net/ipsec_klipsdebug, /usr/bin/ipsec | ||
226 | |||
227 | .SH "SEE ALSO" | ||
228 | |||
229 | diff -Nru openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.8 openswan-2.4.7/programs/klipsdebug/klipsdebug.8 | ||
230 | --- openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.8 2006-10-27 01:21:25.000000000 +0300 | ||
231 | +++ openswan-2.4.7/programs/klipsdebug/klipsdebug.8 2006-12-06 22:58:22.295800840 +0200 | ||
232 | @@ -111,7 +111,7 @@ | ||
233 | .SH "FILES" | ||
234 | |||
235 | .PP | ||
236 | -/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec | ||
237 | +/proc/net/ipsec_klipsdebug, /usr/bin/ipsec | ||
238 | |||
239 | .SH "SEE ALSO" | ||
240 | |||
241 | diff -Nru openswan-2.4.7.orig/programs/mailkey/mailkey.in openswan-2.4.7/programs/mailkey/mailkey.in | ||
242 | --- openswan-2.4.7.orig/programs/mailkey/mailkey.in 2006-10-29 02:49:23.000000000 +0300 | ||
243 | +++ openswan-2.4.7/programs/mailkey/mailkey.in 2006-12-06 22:46:54.828836839 +0200 | ||
244 | @@ -60,7 +60,7 @@ | ||
245 | |||
246 | "$test1st" | ||
247 | |||
248 | -Common concerns: This account must be able to read /etc/ipsec.secrets. | ||
249 | +Common concerns: This account must be able to read /etc/ipsec/ipsec.secrets. | ||
250 | If you haven't generated your key yet, please run 'ipsec newhostkey'." | ||
251 | exit 0 | ||
252 | } | ||
253 | diff -Nru openswan-2.4.7.orig/programs/pluto/Makefile openswan-2.4.7/programs/pluto/Makefile | ||
254 | --- openswan-2.4.7.orig/programs/pluto/Makefile 2006-11-07 17:55:52.000000000 +0200 | ||
255 | +++ openswan-2.4.7/programs/pluto/Makefile 2006-12-06 22:46:54.832837088 +0200 | ||
256 | @@ -256,7 +256,7 @@ | ||
257 | -DPOLICYGROUPSDIR=\"${FINALCONFDDIR}/policies\" \ | ||
258 | -DPERPEERLOGDIR=\"${FINALLOGDIR}/pluto/peer\" | ||
259 | |||
260 | -ALLFLAGS = $(CPPFLAGS) $(CFLAGS) | ||
261 | +ALLFLAGS = $(CPPFLAGS) $(CFLAGS) $(USERCOMPILE) | ||
262 | |||
263 | # libefence is a free memory allocation debugger | ||
264 | # Solaris 2 needs -lsocket -lnsl | ||
265 | diff -Nru openswan-2.4.7.orig/programs/setup/Makefile openswan-2.4.7/programs/setup/Makefile | ||
266 | --- openswan-2.4.7.orig/programs/setup/Makefile 2004-12-18 20:13:43.000000000 +0200 | ||
267 | +++ openswan-2.4.7/programs/setup/Makefile 2006-12-06 22:46:54.832837088 +0200 | ||
268 | @@ -33,25 +33,10 @@ | ||
269 | @rm -f $(BINDIR)/setup | ||
270 | @$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec | ||
271 | @ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup | ||
272 | - -@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done | ||
273 | - -@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec | ||
274 | - -@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec | ||
275 | - -@cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec | ||
276 | - -@cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec | ||
277 | - -@cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec | ||
278 | - -@cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec | ||
279 | - -@cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K76ipsec | ||
280 | |||
281 | install_file_list:: | ||
282 | @echo $(RCDIR)/ipsec | ||
283 | @echo $(BINDIR)/setup | ||
284 | - @echo $(RCDIR)/../rc0.d/K76ipsec | ||
285 | - @echo $(RCDIR)/../rc1.d/K76ipsec | ||
286 | - @echo $(RCDIR)/../rc2.d/S47ipsec | ||
287 | - @echo $(RCDIR)/../rc3.d/S47ipsec | ||
288 | - @echo $(RCDIR)/../rc4.d/S47ipsec | ||
289 | - @echo $(RCDIR)/../rc5.d/S47ipsec | ||
290 | - @echo $(RCDIR)/../rc6.d/K76ipsec | ||
291 | |||
292 | clean:: | ||
293 | @rm -f setup | ||
294 | diff -Nru openswan-2.4.7.orig/programs/showhostkey/showhostkey.in openswan-2.4.7/programs/showhostkey/showhostkey.in | ||
295 | --- openswan-2.4.7.orig/programs/showhostkey/showhostkey.in 2004-11-14 15:40:41.000000000 +0200 | ||
296 | +++ openswan-2.4.7/programs/showhostkey/showhostkey.in 2006-12-06 22:46:54.844837840 +0200 | ||
297 | @@ -18,7 +18,7 @@ | ||
298 | usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id] | ||
299 | [--dhclient] [--ipseckey]" | ||
300 | |||
301 | -file=/etc/ipsec.secrets | ||
302 | +file=/etc/ipsec/ipsec.secrets | ||
303 | fmt="" | ||
304 | gw= | ||
305 | id= | ||
306 | diff -Nru openswan-2.4.7.orig/programs/spi/spi.5 openswan-2.4.7/programs/spi/spi.5 | ||
307 | --- openswan-2.4.7.orig/programs/spi/spi.5 2006-10-26 23:53:59.000000000 +0300 | ||
308 | +++ openswan-2.4.7/programs/spi/spi.5 2006-12-06 23:00:11.910340779 +0200 | ||
309 | @@ -157,7 +157,7 @@ | ||
310 | .SH "FILES" | ||
311 | |||
312 | .PP | ||
313 | -/proc/net/ipsec_spi, /usr/local/bin/ipsec | ||
314 | +/proc/net/ipsec_spi, /usr/bin/ipsec | ||
315 | |||
316 | .SH "SEE ALSO" | ||
317 | |||
318 | diff -Nru openswan-2.4.7.orig/programs/spi/spi.8 openswan-2.4.7/programs/spi/spi.8 | ||
319 | --- openswan-2.4.7.orig/programs/spi/spi.8 2006-10-30 22:00:04.000000000 +0200 | ||
320 | +++ openswan-2.4.7/programs/spi/spi.8 2006-12-06 23:00:27.043286530 +0200 | ||
321 | @@ -215,7 +215,7 @@ | ||
322 | .SH "FILES" | ||
323 | |||
324 | .PP | ||
325 | -/proc/net/ipsec_spi, /usr/local/bin/ipsec | ||
326 | +/proc/net/ipsec_spi, /usr/bin/ipsec | ||
327 | |||
328 | .SH "SEE ALSO" | ||
329 | |||
330 | diff -Nru openswan-2.4.7.orig/programs/spigrp/spigrp.5 openswan-2.4.7/programs/spigrp/spigrp.5 | ||
331 | --- openswan-2.4.7.orig/programs/spigrp/spigrp.5 2006-10-26 23:50:29.000000000 +0300 | ||
332 | +++ openswan-2.4.7/programs/spigrp/spigrp.5 2006-12-06 23:01:25.650949280 +0200 | ||
333 | @@ -67,7 +67,7 @@ | ||
334 | .SH "FILES" | ||
335 | |||
336 | .PP | ||
337 | -/proc/net/ipsec_spigrp, /usr/local/bin/ipsec | ||
338 | +/proc/net/ipsec_spigrp, /usr/bin/ipsec | ||
339 | |||
340 | .SH "SEE ALSO" | ||
341 | |||
342 | diff -Nru openswan-2.4.7.orig/programs/spigrp/spigrp.8 openswan-2.4.7/programs/spigrp/spigrp.8 | ||
343 | --- openswan-2.4.7.orig/programs/spigrp/spigrp.8 2006-10-26 23:50:29.000000000 +0300 | ||
344 | +++ openswan-2.4.7/programs/spigrp/spigrp.8 2006-12-06 23:01:39.079788532 +0200 | ||
345 | @@ -87,7 +87,7 @@ | ||
346 | .SH "FILES" | ||
347 | |||
348 | .PP | ||
349 | -/proc/net/ipsec_spigrp, /usr/local/bin/ipsec | ||
350 | +/proc/net/ipsec_spigrp, /usr/bin/ipsec | ||
351 | |||
352 | .SH "SEE ALSO" | ||
353 | |||
354 | diff -Nru openswan-2.4.7.orig/programs/tncfg/tncfg.5 openswan-2.4.7/programs/tncfg/tncfg.5 | ||
355 | --- openswan-2.4.7.orig/programs/tncfg/tncfg.5 2006-10-26 23:58:11.000000000 +0300 | ||
356 | +++ openswan-2.4.7/programs/tncfg/tncfg.5 2006-12-06 23:01:59.385057530 +0200 | ||
357 | @@ -101,7 +101,7 @@ | ||
358 | .SH "FILES" | ||
359 | |||
360 | .PP | ||
361 | -/proc/net/ipsec_tncfg, /usr/local/bin/ipsec | ||
362 | +/proc/net/ipsec_tncfg, /usr/bin/ipsec | ||
363 | |||
364 | .SH "SEE ALSO" | ||
365 | |||
366 | diff -Nru openswan-2.4.7.orig/programs/tncfg/tncfg.8 openswan-2.4.7/programs/tncfg/tncfg.8 | ||
367 | --- openswan-2.4.7.orig/programs/tncfg/tncfg.8 2006-10-26 23:58:11.000000000 +0300 | ||
368 | +++ openswan-2.4.7/programs/tncfg/tncfg.8 2006-12-06 23:02:09.245673780 +0200 | ||
369 | @@ -63,7 +63,7 @@ | ||
370 | .SH "FILES" | ||
371 | |||
372 | .PP | ||
373 | -/proc/net/ipsec_tncfg, /usr/local/bin/ipsec | ||
374 | +/proc/net/ipsec_tncfg, /usr/bin/ipsec | ||
375 | |||
376 | .SH "SEE ALSO" | ||
377 | |||
diff --git a/meta/recipes-connectivity/openswan/openswan_2.4.7.bb b/meta/recipes-connectivity/openswan/openswan_2.4.7.bb deleted file mode 100644 index 022f709f99..0000000000 --- a/meta/recipes-connectivity/openswan/openswan_2.4.7.bb +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | SECTION = "console/network" | ||
2 | SUMMARY = "IPsec implementation" | ||
3 | DESCRIPTION = "Openswan is an Open Source implementation of IPsec for the \ | ||
4 | Linux operating system." | ||
5 | HOMEPAGE = "http://www.openswan.org" | ||
6 | LICENSE = "GPLv2" | ||
7 | DEPENDS = "gmp flex-native" | ||
8 | RRECOMMENDS = "kernel-module-ipsec" | ||
9 | RDEPENDS_nylon = "perl" | ||
10 | PR = "r0" | ||
11 | |||
12 | SRC_URI = "http://www.openswan.org/download/old/openswan-${PV}.tar.gz \ | ||
13 | file://openswan-2.4.7-gentoo.patch;patch=1 \ | ||
14 | file://installflags.patch;patch=1 \ | ||
15 | file://ld-library-path-breakage.patch;patch=1" | ||
16 | S = "${WORKDIR}/openswan-${PV}" | ||
17 | |||
18 | PARALLEL_MAKE = "" | ||
19 | EXTRA_OEMAKE = "DESTDIR=${D} \ | ||
20 | USERCOMPILE="${CFLAGS}" \ | ||
21 | FINALCONFDIR=${sysconfdir}/ipsec \ | ||
22 | INC_RCDEFAULT=${sysconfdir}/init.d \ | ||
23 | INC_USRLOCAL=${prefix} \ | ||
24 | INC_MANDIR=share/man WERROR=''" | ||
25 | |||
26 | do_compile () { | ||
27 | oe_runmake programs | ||
28 | } | ||
29 | |||
30 | do_install () { | ||
31 | oe_runmake install | ||
32 | } | ||
33 | |||
34 | FILES_${PN} = "${sysconfdir} ${libdir}/ipsec/* ${sbindir}/* ${libexecdir}/ipsec/*" | ||
35 | FILES_${PN}-dbg += "${libdir}/ipsec/.debug ${libexecdir}/ipsec/.debug" | ||
36 | |||
37 | CONFFILES_${PN} = "${sysconfdir}/ipsec/ipsec.conf" | ||
diff --git a/meta/recipes-connectivity/opensync/libopensync-0.37/build-in-src.patch b/meta/recipes-connectivity/opensync/libopensync-0.37/build-in-src.patch deleted file mode 100644 index 1810b339a6..0000000000 --- a/meta/recipes-connectivity/opensync/libopensync-0.37/build-in-src.patch +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | --- | ||
2 | cmake/OpenSyncInternal.cmake.in | 1 - | ||
3 | 1 file changed, 1 deletion(-) | ||
4 | |||
5 | --- libopensync-0.36.orig/cmake/OpenSyncInternal.cmake.in | ||
6 | +++ libopensync-0.36/cmake/OpenSyncInternal.cmake.in | ||
7 | @@ -5,11 +5,10 @@ INCLUDE( OpenSyncTesting ) | ||
8 | INCLUDE( OpenSyncPackaging ) | ||
9 | INCLUDE( OpenSyncPlugin ) | ||
10 | INCLUDE( OpenSyncPlatforms ) | ||
11 | INCLUDE( MacroEnsureOutOfSourceBuild ) | ||
12 | |||
13 | -MACRO_ENSURE_OUT_OF_SOURCE_BUILD("${CMAKE_PROJECT_NAME} doesn't allow to build within the source directory. Please, create a seperate build directory and run 'cmake ${PROJECT_SOURCE_DIR} [options]'!") | ||
14 | |||
15 | |||
16 | SET( OPENSYNC_PLUGINDIR "@OPENSYNC_PLUGINDIR@" ) | ||
17 | SET( OPENSYNC_FORMATSDIR "@OPENSYNC_FORMATSDIR@" ) | ||
18 | SET( OPENSYNC_PYTHON_PLUGINDIR "@OPENSYNC_PYTHON_PLUGINDIR@" ) | ||
diff --git a/meta/recipes-connectivity/opensync/libopensync-0.37/cmake.patch b/meta/recipes-connectivity/opensync/libopensync-0.37/cmake.patch deleted file mode 100644 index 7ea4613548..0000000000 --- a/meta/recipes-connectivity/opensync/libopensync-0.37/cmake.patch +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | --- | ||
2 | opensync/CMakeLists.txt | 1 - | ||
3 | 1 file changed, 1 deletion(-) | ||
4 | |||
5 | Index: libopensync-0.37/opensync/CMakeLists.txt | ||
6 | =================================================================== | ||
7 | --- libopensync-0.37.orig/opensync/CMakeLists.txt 2008-10-15 13:56:45.000000000 +0100 | ||
8 | +++ libopensync-0.37/opensync/CMakeLists.txt 2008-10-15 13:59:03.000000000 +0100 | ||
9 | @@ -67,8 +67,6 @@ | ||
10 | SET_TARGET_PROPERTIES( opensync PROPERTIES VERSION ${OPENSYNC_LIBVERSION_VERSION} ) | ||
11 | SET_TARGET_PROPERTIES( opensync PROPERTIES SOVERSION ${OPENSYNC_LIBVERSION_SOVERSION} ) | ||
12 | |||
13 | -SET_TARGET_PROPERTIES( opensync PROPERTIES COMPILE_FLAGS ${SYMBOLS_VISIBILITY} ) | ||
14 | - | ||
15 | IF ( OPENSYNC_UNITTESTS ) | ||
16 | ADD_LIBRARY( opensync-testing SHARED ${libopensync_LIB_SRCS} ) | ||
17 | TARGET_LINK_LIBRARIES( opensync-testing ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${GMODULE2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${LIBEXSLT_LIBRARIES} ${SQLITE3_LIBRARIES} ) | ||
diff --git a/meta/recipes-connectivity/opensync/libopensync-0.37/no-python-check.patch b/meta/recipes-connectivity/opensync/libopensync-0.37/no-python-check.patch deleted file mode 100644 index 04257bc623..0000000000 --- a/meta/recipes-connectivity/opensync/libopensync-0.37/no-python-check.patch +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | --- | ||
2 | CMakeLists.txt | 1 - | ||
3 | 1 file changed, 1 deletion(-) | ||
4 | |||
5 | Index: libopensync-0.37/CMakeLists.txt | ||
6 | =================================================================== | ||
7 | --- libopensync-0.37.orig/CMakeLists.txt 2008-08-18 16:14:24.000000000 +0100 | ||
8 | +++ libopensync-0.37/CMakeLists.txt 2008-10-15 14:00:12.000000000 +0100 | ||
9 | @@ -65,7 +65,6 @@ | ||
10 | FIND_PACKAGE( LibXslt REQUIRED ) | ||
11 | FIND_PACKAGE( LibExslt REQUIRED ) | ||
12 | FIND_PACKAGE( SWIG ) | ||
13 | -FIND_PACKAGE( PythonLibs ) | ||
14 | FIND_PACKAGE( Check ) | ||
15 | |||
16 | ADD_SUBDIRECTORY( opensync ) | ||
diff --git a/meta/recipes-connectivity/opensync/libopensync-plugin-evolution2/0.37-fixes.patch b/meta/recipes-connectivity/opensync/libopensync-plugin-evolution2/0.37-fixes.patch deleted file mode 100644 index 4a1802ce17..0000000000 --- a/meta/recipes-connectivity/opensync/libopensync-plugin-evolution2/0.37-fixes.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | Index: libopensync-plugin-evolution2-0.36/cmake/modules/FindOpenSync.cmake | ||
2 | =================================================================== | ||
3 | --- libopensync-plugin-evolution2-0.36.orig/cmake/modules/FindOpenSync.cmake 2008-10-20 13:07:14.000000000 +0100 | ||
4 | +++ libopensync-plugin-evolution2-0.36/cmake/modules/FindOpenSync.cmake 2008-10-20 13:08:09.000000000 +0100 | ||
5 | @@ -23,15 +23,15 @@ | ||
6 | ENDIF ( OpenSync_FIND_REQUIRED ) | ||
7 | |||
8 | IF ( OPENSYNC_MIN_VERSION ) | ||
9 | - PKG_SEARCH_MODULE( OPENSYNC ${_pkgconfig_REQUIRED} opensync-1.0>=${OPENSYNC_MIN_VERSION} ) | ||
10 | + PKG_SEARCH_MODULE( OPENSYNC ${_pkgconfig_REQUIRED} libopensync>=${OPENSYNC_MIN_VERSION} ) | ||
11 | ELSE ( OPENSYNC_MIN_VERSION ) | ||
12 | - PKG_SEARCH_MODULE( OPENSYNC ${_pkgconfig_REQUIRED} opensync-1.0 ) | ||
13 | + PKG_SEARCH_MODULE( OPENSYNC ${_pkgconfig_REQUIRED} libopensync ) | ||
14 | ENDIF ( OPENSYNC_MIN_VERSION ) | ||
15 | |||
16 | FIND_PROGRAM( PKGCONFIG_EXECUTABLE NAMES pkg-config ) | ||
17 | |||
18 | IF ( PKGCONFIG_EXECUTABLE ) | ||
19 | - EXEC_PROGRAM( ${PKGCONFIG_EXECUTABLE} ARGS opensync-1.0 --variable=datadir OUTPUT_VARIABLE _opensync_data_DIR ) | ||
20 | + EXEC_PROGRAM( ${PKGCONFIG_EXECUTABLE} ARGS libopensync --variable=datadir OUTPUT_VARIABLE _opensync_data_DIR ) | ||
21 | STRING( REGEX REPLACE "[\r\n]" " " _opensync_data_DIR "${_opensync_data_DIR}" ) | ||
22 | ENDIF ( PKGCONFIG_EXECUTABLE ) | ||
23 | |||
diff --git a/meta/recipes-connectivity/opensync/libopensync-plugin-evolution2_0.36.bb b/meta/recipes-connectivity/opensync/libopensync-plugin-evolution2_0.36.bb deleted file mode 100644 index 6548c206a5..0000000000 --- a/meta/recipes-connectivity/opensync/libopensync-plugin-evolution2_0.36.bb +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | require libopensync-plugin_0.36.inc | ||
2 | LICENSE = "LGPL" | ||
3 | |||
4 | DEPENDS += " eds-dbus" | ||
5 | |||
6 | SRC_URI += "file://0.37-fixes.patch;patch=1" | ||
7 | |||
8 | PR = "r1" | ||
diff --git a/meta/recipes-connectivity/opensync/libopensync-plugin-file_0.37.bb b/meta/recipes-connectivity/opensync/libopensync-plugin-file_0.37.bb deleted file mode 100644 index 404c172490..0000000000 --- a/meta/recipes-connectivity/opensync/libopensync-plugin-file_0.37.bb +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | require libopensync-plugin_0.36.inc | ||
2 | LICENSE = "LGPL" | ||
diff --git a/meta/recipes-connectivity/opensync/libopensync-plugin-google-calendar_0.36.bb b/meta/recipes-connectivity/opensync/libopensync-plugin-google-calendar_0.36.bb deleted file mode 100644 index dbcb2aac12..0000000000 --- a/meta/recipes-connectivity/opensync/libopensync-plugin-google-calendar_0.36.bb +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | require libopensync-plugin_0.36.inc | ||
2 | LICENSE = "GPLv2" | ||
diff --git a/meta/recipes-connectivity/opensync/libopensync-plugin-irmc_0.36.bb b/meta/recipes-connectivity/opensync/libopensync-plugin-irmc_0.36.bb deleted file mode 100644 index cb601f2dc7..0000000000 --- a/meta/recipes-connectivity/opensync/libopensync-plugin-irmc_0.36.bb +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | require libopensync-plugin_0.36.inc | ||
2 | LICENSE = "GPLv2" | ||
3 | |||
4 | DEPENDS += "openobex bluez4" | ||
diff --git a/meta/recipes-connectivity/opensync/libopensync-plugin-syncml/fixerror.patch b/meta/recipes-connectivity/opensync/libopensync-plugin-syncml/fixerror.patch deleted file mode 100644 index 7dad889422..0000000000 --- a/meta/recipes-connectivity/opensync/libopensync-plugin-syncml/fixerror.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: libopensync-plugin-syncml-0.38/src/syncml_callbacks.c | ||
2 | =================================================================== | ||
3 | --- libopensync-plugin-syncml-0.38.orig/src/syncml_callbacks.c 2009-07-31 10:30:33.000000000 +0100 | ||
4 | +++ libopensync-plugin-syncml-0.38/src/syncml_callbacks.c 2009-07-31 10:30:39.000000000 +0100 | ||
5 | @@ -405,7 +405,7 @@ | ||
6 | } else { | ||
7 | /* This problem should be fixed with the next SLOW-SYNC. */ | ||
8 | osync_trace(TRACE_EXIT_ERROR, "%s - unexpected Add or Replace command", __func__); | ||
9 | - smlErrorSet(error, SML_ERROR_TEMPORARY, "Unwanted Add or Replace command on second OMA DS session."); | ||
10 | + smlErrorSet(error, SML_ERROR_GENERIC, "Unwanted Add or Replace command on second OMA DS session."); | ||
11 | return FALSE; | ||
12 | } | ||
13 | } | ||
diff --git a/meta/recipes-connectivity/opensync/libopensync-plugin-syncml_0.38.bb b/meta/recipes-connectivity/opensync/libopensync-plugin-syncml_0.38.bb deleted file mode 100644 index e33336f57e..0000000000 --- a/meta/recipes-connectivity/opensync/libopensync-plugin-syncml_0.38.bb +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | require libopensync-plugin_0.36.inc | ||
2 | LICENSE = "LGPL" | ||
3 | |||
4 | DEPENDS += " libsyncml (>= 0.4.7)" | ||
5 | |||
6 | SRC_URI += "file://fixerror.patch;patch=1" | ||
7 | |||
8 | PR = "r1" | ||
diff --git a/meta/recipes-connectivity/opensync/libopensync-plugin-vformat_0.37.bb b/meta/recipes-connectivity/opensync/libopensync-plugin-vformat_0.37.bb deleted file mode 100644 index a7d50dc615..0000000000 --- a/meta/recipes-connectivity/opensync/libopensync-plugin-vformat_0.37.bb +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | require libopensync-plugin_0.36.inc | ||
2 | LICENSE = "LGPL" | ||
3 | |||
4 | DEPENDS += "libcheck" | ||
diff --git a/meta/recipes-connectivity/opensync/libopensync-plugin_0.36.inc b/meta/recipes-connectivity/opensync/libopensync-plugin_0.36.inc deleted file mode 100644 index 147fcfb5ed..0000000000 --- a/meta/recipes-connectivity/opensync/libopensync-plugin_0.36.inc +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | DEPENDS = "libopensync (>= 0.36)" | ||
2 | |||
3 | DESCRIPTION ?= "OpenSync plugin" | ||
4 | |||
5 | SRC_URI = "http://opensync.org/download/releases/${PV}/${P}.tar.bz2" | ||
6 | |||
7 | inherit cmake | ||
8 | |||
9 | FILES_${PN} += "${libdir}/opensync*/plugins/*.so \ | ||
10 | ${libdir}/opensync*/formats/*.so \ | ||
11 | ${datadir}/opensync*/defaults/" | ||
diff --git a/meta/recipes-connectivity/opensync/libopensync_0.37.bb b/meta/recipes-connectivity/opensync/libopensync_0.37.bb deleted file mode 100644 index 437bdd2885..0000000000 --- a/meta/recipes-connectivity/opensync/libopensync_0.37.bb +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | LICENSE = "LGPL" | ||
2 | HOMEPAGE = "http://www.opensync.org/" | ||
3 | SUMMARY = "Synchronization framwork" | ||
4 | DESCRIPTION = "The OpenSync project is an ongoing effort to create a synchronization framework that will be a platform independent, general purpose synchronization engine utilizing modular plugins for content formats and different kind of connection types. OpenSync's modularity should allow it to be extended easily to new devices and purposes without radically changing the architecture itself, allowing it to support wide variety of devices used today and in the future." | ||
5 | DEPENDS = "sqlite3 libxml2 glib-2.0 libcheck zlib libxslt" | ||
6 | |||
7 | PR = "r1" | ||
8 | |||
9 | SRC_URI = "http://opensync.org/download/releases/${PV}/libopensync-${PV}.tar.bz2\ | ||
10 | file://cmake.patch;patch=1 \ | ||
11 | file://build-in-src.patch;patch=1 \ | ||
12 | file://no-python-check.patch;patch=1" | ||
13 | |||
14 | inherit cmake pkgconfig | ||
15 | |||
16 | LEAD_SONAME = "libopensync.so" | ||
17 | |||
18 | FILES_${PN} += " ${libdir}/opensync*/formats/*.so \ | ||
19 | ${libdir}/opensync*/osplugin \ | ||
20 | ${datadir}/opensync*/schemas \ | ||
21 | ${datadir}/opensync*/capabilities \ | ||
22 | ${datadir}/opensync*/descriptions \ | ||
23 | " | ||
24 | FILES_${PN}-dbg += " ${libdir}/opensync*/formats/.debug/*.so \ | ||
25 | ${libdir}/opensync*/.debug/osplugin " | ||
26 | |||
diff --git a/meta/recipes-connectivity/opensync/libsync_svn.bb b/meta/recipes-connectivity/opensync/libsync_svn.bb deleted file mode 100644 index 74ca752ad6..0000000000 --- a/meta/recipes-connectivity/opensync/libsync_svn.bb +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | SUMMARY = "GObject-based sync library" | ||
2 | DESCRIPTION = "LibSync is a GObject-based framework for more convenient use of \ | ||
3 | OpenSync in GLib applications." | ||
4 | LICENSE = "LGPL" | ||
5 | SECTION = "x11" | ||
6 | DEPENDS = "glib-2.0 gtk+ libglade libopensync avahi" | ||
7 | RRECOMMENDS = "\ | ||
8 | libopensync-plugin-file \ | ||
9 | " | ||
10 | PV = "0.0+svnr${SRCREV}" | ||
11 | |||
12 | SRC_URI = "svn://svn.o-hand.com/repos/sync/trunk;module=sync;proto=http" | ||
13 | |||
14 | inherit autotools pkgconfig | ||
15 | |||
16 | S = "${WORKDIR}/sync" | ||
17 | |||
18 | PACKAGES += "synctool" | ||
19 | FILES_${PN} = "${libdir}/lib*.so.*" | ||
20 | FILES_synctool = "${bindir} ${datadir}" | ||
diff --git a/meta/recipes-connectivity/opensync/libsyncml/build-in-src.patch b/meta/recipes-connectivity/opensync/libsyncml/build-in-src.patch deleted file mode 100644 index d8106bdfc7..0000000000 --- a/meta/recipes-connectivity/opensync/libsyncml/build-in-src.patch +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | --- | ||
2 | CMakeLists.txt | 4 ---- | ||
3 | 1 file changed, 4 deletions(-) | ||
4 | |||
5 | Index: libsyncml-0.5.4/CMakeLists.txt | ||
6 | =================================================================== | ||
7 | --- libsyncml-0.5.4.orig/CMakeLists.txt 2009-07-31 09:56:16.000000000 +0100 | ||
8 | +++ libsyncml-0.5.4/CMakeLists.txt 2009-07-31 09:57:33.000000000 +0100 | ||
9 | @@ -72,10 +72,6 @@ | ||
10 | CHECK_TYPE_SIZE( uint32_t UINT32_T ) | ||
11 | CHECK_TYPE_SIZE( uint8_t UINT8_T ) | ||
12 | |||
13 | -# ensure out od source build | ||
14 | -INCLUDE( MacroEnsureOutOfSourceBuild ) | ||
15 | -MACRO_ENSURE_OUT_OF_SOURCE_BUILD("${CMAKE_PROJECT_NAME} doesn't allow to build within the source directory. Please, create a seperate build directory and run 'cmake ${PROJECT_SOURCE_DIR} [options]'!") | ||
16 | - | ||
17 | # find requirements | ||
18 | SET ( GLIB2_MIN_VERSION "2.12" ) | ||
19 | SET ( OPENOBEX_MIN_VERSION "1.1" ) | ||
diff --git a/meta/recipes-connectivity/opensync/libsyncml_0.5.4.bb b/meta/recipes-connectivity/opensync/libsyncml_0.5.4.bb deleted file mode 100644 index c045698031..0000000000 --- a/meta/recipes-connectivity/opensync/libsyncml_0.5.4.bb +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | DESCRIPTION = "Libsyncml is a implementation of the SyncML protocol." | ||
2 | HOMEPAGE = "http://libsyncml.opensync.org/" | ||
3 | LICENSE = "LGPL" | ||
4 | DEPENDS = "sed-native wbxml2 libsoup libxml2 bluez4 openobex libcheck" | ||
5 | PR = "r1" | ||
6 | |||
7 | SRC_URI = "${SOURCEFORGE_MIRROR}/libsyncml/0.5.4/libsyncml-0.5.4.tar.bz2 \ | ||
8 | file://build-in-src.patch;patch=1" | ||
9 | |||
10 | inherit cmake pkgconfig | ||
11 | |||
12 | PACKAGES += "${PN}-tools" | ||
13 | |||
14 | FILES_${PN}-tools = "${bindir}" | ||
15 | FILES_${PN} = "${libdir}/*.so.*" | ||
16 | |||
17 | export VERBOSE=1 | ||
diff --git a/meta/recipes-connectivity/opensync/msynctool_0.38.bb b/meta/recipes-connectivity/opensync/msynctool_0.38.bb deleted file mode 100644 index ff86a0b103..0000000000 --- a/meta/recipes-connectivity/opensync/msynctool_0.38.bb +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | SUMMARY = "Calendar (and other PIM data) synchronization program" | ||
2 | DESCRIPTION = "msynctool is a program to synchronize calendars, \ | ||
3 | addressbooks and other PIM data between programs on your computer and \ | ||
4 | other computers, mobile devices, PDAs or cell phones. It uses the \ | ||
5 | OpenSync plugins when synchronizing data." | ||
6 | HOMEPAGE = "http://www.opensync.org/" | ||
7 | LICENSE = "GPLv2+" | ||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
9 | file://tools/msynctool.c;beginline=1;endline=20;md5=0b71ef245b75c74bff7d7ec58b9b4527" | ||
10 | |||
11 | DEPENDS = "libopensync glib-2.0" | ||
12 | |||
13 | SRC_URI = "http://www.opensync.org/download/releases/${PV}/msynctool-${PV}.tar.bz2" | ||
14 | |||
15 | inherit cmake pkgconfig | ||
16 | |||
17 | PR = "r0" | ||
18 | |||
19 | SRC_URI[md5sum] = "495c45d6f12d3523a736864b0ced6ce5" | ||
20 | SRC_URI[sha256sum] = "4a903d4db05bf2f677a675ec47e9791da9b1752c9feda0026157e82aa97e372b" | ||
diff --git a/meta/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch b/meta/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch deleted file mode 100644 index 13e7943da5..0000000000 --- a/meta/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | --- | ||
2 | Makefile.am | 2 +- | ||
3 | configure.ac | 1 - | ||
4 | help/Makefile.am | 1 - | ||
5 | 3 files changed, 1 insertion(+), 3 deletions(-) | ||
6 | |||
7 | --- empathy-0.23.4.orig/Makefile.am | ||
8 | +++ empathy-0.23.4/Makefile.am | ||
9 | @@ -1,6 +1,6 @@ | ||
10 | -SUBDIRS = tools extensions po data libempathy libempathy-gtk src docs help | ||
11 | +SUBDIRS = tools extensions po data libempathy libempathy-gtk src | ||
12 | |||
13 | if HAVE_MEGAPHONE | ||
14 | SUBDIRS += megaphone | ||
15 | endif | ||
16 | |||
17 | --- empathy-0.23.4.orig/configure.ac | ||
18 | +++ empathy-0.23.4/configure.ac | ||
19 | @@ -55,11 +55,10 @@ AM_PROG_LIBTOOL | ||
20 | AM_PROG_MKDIR_P | ||
21 | AM_PATH_GLIB_2_0 | ||
22 | AC_PATH_XTRA | ||
23 | IT_PROG_INTLTOOL([0.35.0]) | ||
24 | GTK_DOC_CHECK([1.3]) | ||
25 | -GNOME_DOC_INIT | ||
26 | IDT_COMPILE_WARNINGS | ||
27 | AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool) | ||
28 | AC_PATH_PROG(GCONFTOOL, gconftool-2) | ||
29 | AM_GCONF_SOURCE_2 | ||
30 | GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal` | ||
31 | --- empathy-0.23.4.orig/help/Makefile.am | ||
32 | +++ empathy-0.23.4/help/Makefile.am | ||
33 | @@ -1,6 +1,5 @@ | ||
34 | -include $(top_srcdir)/gnome-doc-utils.make | ||
35 | |||
36 | DOC_MODULE = empathy | ||
37 | DOC_ENTITIES = legal.xml | ||
38 | DOC_FIGURES = \ | ||
39 | figures/empathy-main-window.png \ | ||
diff --git a/meta/recipes-connectivity/telepathy/empathy_2.26.1.bb b/meta/recipes-connectivity/telepathy/empathy_2.26.1.bb deleted file mode 100644 index 2e07b19c16..0000000000 --- a/meta/recipes-connectivity/telepathy/empathy_2.26.1.bb +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | SUMMARY = "a Telepathy based IM client" | ||
2 | DESCRIPTION = "Instant messaging program supporting text, voice, video, file \ | ||
3 | transfers and interapplication communication over many different protocols, \ | ||
4 | include: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut, \ | ||
5 | Gadu-Gadu, Groupwise, ICQ and QQ." | ||
6 | HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0" | ||
7 | LICENSE = "GPL" | ||
8 | DEPENDS = "libcanberra telepathy-farsight gnome-doc-utils python-native telepathy-python telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade eds-dbus" | ||
9 | RDEPENDS = "telepathy-mission-control" | ||
10 | RRECOMMENDS = "telepathy-gabble" | ||
11 | PR = "r2" | ||
12 | |||
13 | inherit gnome | ||
14 | |||
15 | PARALLEL_MAKE = "" | ||
16 | |||
17 | EXTRA_OECONF += "--disable-scrollkeeper" | ||
18 | |||
19 | PACKAGES =+ "empathy-scrollkeeper-junk" | ||
20 | FILES_empathy-scrollkeeper-junk = "/var/lib/scrollkeeper" | ||
21 | |||
22 | FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \ | ||
23 | ${datadir}/dbus-1/services/*.service \ | ||
24 | ${datadir}/telepathy/managers/*.chandler \ | ||
25 | ${datadir}/icons \ | ||
26 | ${libdir}/python*" | ||
27 | |||
28 | FILES_${PN}-dbg += "${libdir}/python*/*/.debug" | ||
29 | |||
diff --git a/meta/recipes-connectivity/telepathy/telepathy-farsight_0.0.7.bb b/meta/recipes-connectivity/telepathy/telepathy-farsight_0.0.7.bb deleted file mode 100644 index 3e8d10fe50..0000000000 --- a/meta/recipes-connectivity/telepathy/telepathy-farsight_0.0.7.bb +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | SUMMARY = "Telepathy fasrsight" | ||
2 | DESCRIPTION = "Glue library for telepathy media signalling and the media \ | ||
3 | streaming capabilities of Farsight2." | ||
4 | HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" | ||
5 | DEPENDS = "glib-2.0 dbus telepathy-glib farsight2" | ||
6 | LICENSE = "LGPLv2" | ||
7 | |||
8 | SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-farsight/${P}.tar.gz \ | ||
9 | " | ||
10 | |||
11 | inherit autotools | ||
12 | |||
13 | EXTRA_OECONF = "--disable-python" | ||
14 | |||
15 | AUTOTOOLS_STAGE_PKGCONFIG = "1" | ||
16 | |||
17 | FILES_${PN} += "${datadir}/telepathy \ | ||
18 | ${datadir}/dbus-1" | ||
diff --git a/meta/recipes-connectivity/telepathy/telepathy-gabble/gabble.manager b/meta/recipes-connectivity/telepathy/telepathy-gabble/gabble.manager deleted file mode 100644 index 9000cd41cc..0000000000 --- a/meta/recipes-connectivity/telepathy/telepathy-gabble/gabble.manager +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | |||
2 | [ConnectionManager] | ||
3 | BusName=org.freedesktop.Telepathy.ConnectionManager.gabble | ||
4 | ObjectPath=/org/freedesktop/Telepathy/ConnectionManager/gabble | ||
5 | |||
6 | [Protocol jabber] | ||
7 | param-account=s required register | ||
8 | param-password=s required register | ||
9 | param-server=s | ||
10 | param-resource=s | ||
11 | param-priority=n | ||
12 | param-port=q | ||
13 | param-old-ssl=b | ||
14 | param-register=b | ||
15 | param-low-bandwidth=b | ||
16 | param-https-proxy-server=s | ||
17 | param-https-proxy-port=q | ||
18 | param-fallback-conference-server=s | ||
19 | param-stun-server=s | ||
20 | param-stun-port=q | ||
21 | param-ignore-ssl-errors=b | ||
22 | param-alias=s | ||
23 | param-mac=s | ||
24 | param-btid=s | ||
25 | default-resource=Telepathy | ||
26 | default-priority=0 | ||
27 | default-port=5222 | ||
28 | default-old-ssl=false | ||
29 | default-register=false | ||
30 | default-low-bandwidth=false | ||
31 | default-https-proxy-port=443 | ||
32 | default-stun-port=3478 | ||
33 | default-ignore-ssl-errors=false | ||
diff --git a/meta/recipes-connectivity/telepathy/telepathy-gabble_0.7.8.bb b/meta/recipes-connectivity/telepathy/telepathy-gabble_0.7.8.bb deleted file mode 100644 index ff49418540..0000000000 --- a/meta/recipes-connectivity/telepathy/telepathy-gabble_0.7.8.bb +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | SUMMARY = "Telepathy Jabber/XMPP connection manager" | ||
2 | DESCRIPTION = "Telepathy implementation of the Jabber/XMPP protocols." | ||
3 | HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" | ||
4 | DEPENDS = "glib-2.0 dbus loudmouth telepathy-glib dbus-glib" | ||
5 | LICENSE = "LGPL" | ||
6 | |||
7 | # gabble.manager needs to get regenerated every release, so please don't copy it over blindly | ||
8 | SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${P}.tar.gz \ | ||
9 | file://gabble.manager" | ||
10 | |||
11 | inherit autotools pkgconfig | ||
12 | |||
13 | do_compile_prepend() { | ||
14 | cp ${WORKDIR}/gabble.manager ${S}/data/ | ||
15 | } | ||
16 | |||
17 | FILES_${PN} += "${datadir}/telepathy \ | ||
18 | ${datadir}/dbus-1" | ||
diff --git a/meta/recipes-connectivity/wbxml/files/no-doc-install.patch b/meta/recipes-connectivity/wbxml/files/no-doc-install.patch deleted file mode 100644 index 16084e60e6..0000000000 --- a/meta/recipes-connectivity/wbxml/files/no-doc-install.patch +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | --- wbxml2-0.9.2/Makefile.am.old 2007-01-03 19:50:24.000000000 +0000 | ||
2 | +++ wbxml2-0.9.2/Makefile.am 2007-01-03 19:50:39.000000000 +0000 | ||
3 | @@ -24,9 +24,9 @@ | ||
4 | TODO\ | ||
5 | doxygen.h | ||
6 | |||
7 | -install-data-local: | ||
8 | - $(mkinstalldirs) $(DESTDIR)$(wbxmldocdir)/manual | ||
9 | - cp -Rp doc/* $(DESTDIR)$(wbxmldocdir)/manual | ||
10 | +#install-data-local: | ||
11 | +# $(mkinstalldirs) $(DESTDIR)$(wbxmldocdir)/manual | ||
12 | +# cp -Rp doc/* $(DESTDIR)$(wbxmldocdir)/manual | ||
13 | |||
14 | dist-bz2: distdir | ||
15 | sed -e "s/tar.gz/tar.bz2/g" $(distdir)/wbxml2.spec > $(distdir)/wbxml2.spec.aux | ||
diff --git a/meta/recipes-connectivity/wbxml/wbxml2_0.9.2.bb b/meta/recipes-connectivity/wbxml/wbxml2_0.9.2.bb deleted file mode 100644 index e3ac0017ff..0000000000 --- a/meta/recipes-connectivity/wbxml/wbxml2_0.9.2.bb +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | SUMMARY = "Parsing and Encoding of WBXML documents" | ||
2 | DESCRIPTION = "The WBXML Library (aka libwbxml) contains a library and \ | ||
3 | its associated tools to Parse, Encode and Handle WBXML documents. The \ | ||
4 | WBXML format is a binary representation of XML, defined by the Wap \ | ||
5 | Forum, and used to reduce bandwidth in mobile communications." | ||
6 | LICENSE = "GPLv2" | ||
7 | |||
8 | DEPENDS = "libxml2 sed-native expat" | ||
9 | |||
10 | SRC_URI = "${SOURCEFORGE_MIRROR}/wbxmllib/${P}.tar.gz \ | ||
11 | file://no-doc-install.patch;patch=1" | ||
12 | |||
13 | inherit autotools pkgconfig | ||
14 | |||
15 | do_configure_append() { | ||
16 | sed -i s:-I/usr/include::g Makefile | ||
17 | sed -i s:-I/usr/include::g */Makefile | ||
18 | } | ||
19 | |||
20 | PACKAGES += "${PN}-tools" | ||
21 | |||
22 | FILES_${PN}-tools = "${bindir}" | ||
23 | FILES_${PN} = "${libdir}/*.so.*" | ||
24 | |||