diff --git a/meta/packages/libproxy/libproxy/asneededfix.patch b/meta/packages/libproxy/libproxy/asneededfix.patch deleted file mode 100644 index cc22077f07..0000000000 --- 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.4.2.bb similarity index 56% rename from meta/packages/libproxy/libproxy_0.2.3.bb rename to meta/packages/libproxy/libproxy_0.4.2.bb index 8c5ca42ab8..61595f64e9 100644 --- a/meta/packages/libproxy/libproxy_0.2.3.bb +++ b/meta/packages/libproxy/libproxy_0.4.2.bb @@ -1,18 +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" -LICENSE = "LGPLv2.1+" - 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 \ - file://asneededfix.patch;patch=1" -S = "${WORKDIR}/libproxy-${PV}" +SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz" -inherit autotools pkgconfig +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.2.3/plugins/" +FILES_${PN}-dbg += "${libdir}/libproxy/0.4.2/plugins/" + +do_configure_prepend() { + export HOST_SYS=${HOST_SYS} + export BUILD_SYS=${BUILD_SYS} +}