diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2006-01-18 15:38:00 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-18 15:38:00 +0000 |
| commit | e475db3258cccd9f7b098be7c82813766bfc63f7 (patch) | |
| tree | 359414a11d84fcc726dab447f63c13f2afc3b102 /packages | |
| parent | 14f1e2441bfc5365d1297c7c8aaaabee604d3cb8 (diff) | |
| parent | c3a20dc277a3913df8c25ce50997d3ccccc2f448 (diff) | |
merge of 6fc08cb0027e6ecc5ef10578e8c37a7b66f53bf9
and 7eab4425d3ef00f6bc0fc9dcf55117c3cf8c24d6
Diffstat (limited to 'packages')
6 files changed, 36 insertions, 3 deletions
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb index dc891e7598..6186c70679 100644 --- a/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb +++ b/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb @@ -4,7 +4,7 @@ SECTION = "gpe" PRIORITY = "optional" MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" -DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus" +DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus libcontactsdb" RDEPENDS = "bluez-utils-dbus blueprobe" GPE_TARBALL_SUFFIX= "bz2" diff --git a/packages/libxsettings-client/libxsettings-client-0.16/.mtn2git_empty b/packages/libxsettings-client/libxsettings-client-0.16/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libxsettings-client/libxsettings-client-0.16/.mtn2git_empty diff --git a/packages/libxsettings-client/libxsettings-client-0.16/Makefile-am.patch b/packages/libxsettings-client/libxsettings-client-0.16/Makefile-am.patch new file mode 100644 index 0000000000..fb5b1dbe65 --- /dev/null +++ b/packages/libxsettings-client/libxsettings-client-0.16/Makefile-am.patch @@ -0,0 +1,11 @@ +--- libxsettings-client-0.16/Makefile.am.orig 2006-01-17 16:01:21.000000000 +0000 ++++ libxsettings-client-0.16/Makefile.am 2006-01-17 16:01:30.000000000 +0000 +@@ -3,7 +3,7 @@ + source_h = xsettings-client.h xsettings-common.h + source_c = xsettings-client.c xsettings-common.c + +-INCLUDES = -I $(includedir) $(X_CFLAGS) ++INCLUDES = $(X_CFLAGS) + + libxsincludedir = $(includedir) + diff --git a/packages/libxsettings-client/libxsettings-client_0.16.bb b/packages/libxsettings-client/libxsettings-client_0.16.bb index 5f5d618695..0e54f6088b 100644 --- a/packages/libxsettings-client/libxsettings-client_0.16.bb +++ b/packages/libxsettings-client/libxsettings-client_0.16.bb @@ -3,10 +3,12 @@ LICENSE = "BSD-X" PRIORITY = "optional" DEPENDS = "libxsettings x11" MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" +PR="r1" inherit autotools pkgconfig gpe -SRC_URI = "${GPE_MIRROR}/libxsettings-client-${PV}.tar.bz2" +SRC_URI = "${GPE_MIRROR}/libxsettings-client-${PV}.tar.bz2 \ + file://Makefile-am.patch;patch=1" headers = "xsettings-client.h xsettings-common.h" diff --git a/packages/ppp/ppp-2.4.3/makefile-remove-hard-usr-reference.patch b/packages/ppp/ppp-2.4.3/makefile-remove-hard-usr-reference.patch new file mode 100644 index 0000000000..574abfaf2c --- /dev/null +++ b/packages/ppp/ppp-2.4.3/makefile-remove-hard-usr-reference.patch @@ -0,0 +1,19 @@ +--- ppp-2.4.3/pppd/Makefile.linux.orig 2006-01-17 15:09:56.000000000 +0000 ++++ ppp-2.4.3/pppd/Makefile.linux 2006-01-17 15:10:21.000000000 +0000 +@@ -117,12 +117,12 @@ + #LIBS += -lshadow $(LIBS) + endif + +-ifneq ($(wildcard /usr/include/crypt.h),) ++#ifneq ($(wildcard /usr/include/crypt.h),) + CFLAGS += -DHAVE_CRYPT_H=1 +-endif +-ifneq ($(wildcard /usr/lib/libcrypt.*),) ++#endif ++#ifneq ($(wildcard /usr/lib/libcrypt.*),) + LIBS += -lcrypt +-endif ++#endif + + ifdef NEEDDES + ifndef USE_CRYPT diff --git a/packages/ppp/ppp_2.4.3.bb b/packages/ppp/ppp_2.4.3.bb index 8701efc556..0e3b9be24a 100644 --- a/packages/ppp/ppp_2.4.3.bb +++ b/packages/ppp/ppp_2.4.3.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Point-to-Point Protocol (PPP) daemon" HOMEPAGE = "http://samba.org/ppp/" DEPENDS = "libpcap" LICENSE = "BSD GPLv2" -PR = "r0" +PR = "r1" SRC_URI = "ftp://ftp.samba.org/pub/ppp/ppp-${PV}.tar.gz \ file://makefile.patch;patch=1 \ @@ -12,6 +12,7 @@ SRC_URI = "ftp://ftp.samba.org/pub/ppp/ppp-${PV}.tar.gz \ file://plugins-fix-CC.patch;patch=1 \ file://pppoatm-makefile.patch;patch=1 \ file://enable-ipv6.patch;patch=1 \ + file://makefile-remove-hard-usr-reference.patch;patch=1 \ file://pon \ file://poff \ file://init \ |