From 397793a0a4d931f2b277762c5a0652e173e6e1c8 Mon Sep 17 00:00:00 2001
From: Dongxiao Xu <dongxiao.xu@intel.com>
Date: Thu, 15 Jul 2010 20:43:13 +0800
Subject: libproxy: Upgraded to version 0.4.2

Remove the patch since build tool has changed from autotool to cmake
Export poky variable to system environment since cmake needs it
Also fix the metadata

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
 meta/packages/libproxy/libproxy/asneededfix.patch | 13 ------------
 meta/packages/libproxy/libproxy_0.2.3.bb          | 18 ----------------
 meta/packages/libproxy/libproxy_0.4.2.bb          | 25 +++++++++++++++++++++++
 3 files changed, 25 insertions(+), 31 deletions(-)
 delete mode 100644 meta/packages/libproxy/libproxy/asneededfix.patch
 delete mode 100644 meta/packages/libproxy/libproxy_0.2.3.bb
 create mode 100644 meta/packages/libproxy/libproxy_0.4.2.bb

(limited to 'meta/packages')

diff --git a/meta/packages/libproxy/libproxy/asneededfix.patch b/meta/packages/libproxy/libproxy/asneededfix.patch
deleted file mode 100644
index cc22077f0..000000000
--- a/meta/packages/libproxy/libproxy/asneededfix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: libproxy-0.2.3/src/lib/Makefile.am
-===================================================================
---- libproxy-0.2.3.orig/src/lib/Makefile.am	2009-03-09 16:24:08.000000000 +0000
-+++ libproxy-0.2.3/src/lib/Makefile.am	2009-03-09 16:24:13.000000000 +0000
-@@ -2,7 +2,7 @@
- libproxy_la_SOURCES = misc.c url.c pac.c dhcp.c dns.c slp.c wpad.c proxy_factory.c config_file.c \
- 						misc.h url.h pac.h dhcp.h dns.h slp.h wpad.h proxy_factory.h proxy.h config_file.h
- libproxy_la_CFLAGS  = -Wall
--libproxy_la_LDFLAGS = -lm
-+libproxy_la_LDFLAGS = -lm -ldl
- 
- include_HEADERS     = proxy.h
- 
diff --git a/meta/packages/libproxy/libproxy_0.2.3.bb b/meta/packages/libproxy/libproxy_0.2.3.bb
deleted file mode 100644
index 8c5ca42ab..000000000
--- a/meta/packages/libproxy/libproxy_0.2.3.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "A library that provides automatic proxy configuration management"
-HOMEPAGE = "http://code.google.com/p/libproxy/"
-BUGTRACKER = "http://code.google.com/p/libproxy/issues/list"
-LICENSE = "LGPLv2.1+"
-
-SECTION = "libs"
-
-DEPENDS = "virtual/libx11 xmu gconf-dbus"
-
-SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz \
-           file://asneededfix.patch;patch=1"
-S = "${WORKDIR}/libproxy-${PV}"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--without-kde --with-gnome --without-webkit --without-python --without-mozjs --without-networkmanager"
-
-FILES_${PN}-dbg += "${libdir}/libproxy/0.2.3/plugins/"
diff --git a/meta/packages/libproxy/libproxy_0.4.2.bb b/meta/packages/libproxy/libproxy_0.4.2.bb
new file mode 100644
index 000000000..61595f64e
--- /dev/null
+++ b/meta/packages/libproxy/libproxy_0.4.2.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "A library that provides automatic proxy configuration management"
+HOMEPAGE = "http://code.google.com/p/libproxy/"
+BUGTRACKER = "http://code.google.com/p/libproxy/issues/list"
+SECTION = "libs"
+LICENSE = "LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=7d7044444a7b1b116e8783edcdb44ff4 \
+                    file://utils/proxy.c;beginline=1;endline=18;md5=55152a1006d7dafbef32baf9c30a99c0"
+
+
+DEPENDS = "virtual/libx11 xmu gconf-dbus"
+
+SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz"
+
+PR = "r0"
+
+inherit cmake pkgconfig
+
+EXTRA_OECONF = "--without-kde --with-gnome --without-webkit --without-python --without-mozjs --without-networkmanager"
+
+FILES_${PN}-dbg += "${libdir}/libproxy/0.4.2/plugins/"
+
+do_configure_prepend() {
+	export HOST_SYS=${HOST_SYS}
+	export BUILD_SYS=${BUILD_SYS}
+}
-- 
cgit v1.2.3