[weasel-commit] Source: libproxy=0.2.3-5
- From: rbuilder@xxxxxxxxx
- To: weasel-commit@xxxxxxxxxxxxx
- Date: Thu, 28 Jan 2010 12:32:25 -0500
================================
libproxy:source=0.2.3-5 (previous: 0.2.3-4)
cvc rdiff libproxy -1 /weasel.rpath.org@wgl:3-devel/0.2.3-5
================================
0.2.3-5 Filip Brcic (brcha@xxxxxxx) Thu Jan 28 12:32:11 2010
libproxy 0.2.3
libproxy-0.2.3-fix-as-needed-problem.patch: new
--- /dev/null
+++ libproxy-0.2.3-fix-as-needed-problem.patch
@@ -0,0 +12 @@
+diff -Naur libproxy-0.2.3.orig/src/lib/Makefile.am
libproxy-0.2.3/src/lib/Makefile.am
+--- libproxy-0.2.3.orig/src/lib/Makefile.am 2008-06-06 02:26:15.000000000
+0530
++++ libproxy-0.2.3/src/lib/Makefile.am 2009-01-30 13:47:53.365859960 +0530
+@@ -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 $(LIBDL)
+
+ include_HEADERS = proxy.h
+
libproxy.recipe: changed
Index: libproxy.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- libproxy.recipe /weasel.rpath.org@wgl:3-devel/0.2.3-4
+++ libproxy.recipe /weasel.rpath.org@wgl:3-devel/0.2.3-5
@@ -1,63 +1,59 @@
#
-# Copyright (c) 2009 Foresight Linux
-# 2009 Weasel GNU/Linux
-# This file is distributed under the terms of the MIT License.
-# A copy is available at http://www.rpath.com/permanent/mit-license.html
+# Copyright (c) 2010 Filip Brcic <brcha@xxxxxxxxxxxx>
+# Distributed under the terms of the GNU General Public License v3
#
-loadSuperClass('python')
-class Libproxy(AutoPackageRecipe, Python.VersionMixIn):
+class Libproxy(AutoPackageRecipe):
name = 'libproxy'
version = '0.2.3'
-
+
buildRequires = [
- 'GConf:devel', 'glib:devel', 'libICE:devel', 'libSM:devel',
'libX11:devel',
- 'libXmu:devel', 'libXt:devel', 'pkg-config:devel', 'python:devel',
+ 'GConf:devel', 'autoconf:runtime', 'automake:runtime',
+ 'glib:devel', 'libICE:devel', 'libSM:devel', 'libX11:devel',
+ 'libXmu:devel', 'libXt:devel', 'libtool:runtime',
+ 'pkg-config:devel', 'python:devel',
]
+ shortDesc = 'Library for automatic proxy configuration management'
+ longDesc = """
+libproxy is a library that provides automatic proxy configuration management.
+"""
+ url = 'http://code.google.com/p/libproxy/'
+ licenses = [ 'LGPL-2.1' ]
+ categories = [ 'Network/Libraries' ]
+
def unpack(r):
- r.setDefaultPython()
- r.addArchive('http://libproxy.googlecode.com/files/')
- r.addPatch('dbus-fix.patch')
- r.Run('autoreconf')
+ r.addArchive('http://%(name)s.googlecode.com/files/')
- r.extraConfig = (
+ for p in [ 'libproxy-0.2.3-fix-dbus-includes.patch',
+ 'libproxy-0.2.3-fix-python-automagic.patch',
+ 'libproxy-0.2.3-fix-as-needed-problem.patch',
+ 'libproxy-0.2.3-fix-automagic-mozjs.patch',
+ 'libproxy-0.2.3-implicit-declaration.patch',
+ 'libproxy-0.2.3-fbsd.patch',
+ ]:
+ r.addPatch(p)
+
+ r.Replace('(test.*)==', '\\1=',
+ 'configure.ac', 'configure')
+
+ r.Autoreconf(skipAutoheader=True)
+
+ def configure(r):
+ r.Configure(
+ ' --with-envvar'
+ ' --with-file'
+ ' --disable-static'
' --with-gnome'
- ' --with-file'
+ ' --with-kde'
' --without-webkit'
- ' --without-mozjs'
+ ' --without-mozjs' # or --with-mozjs=mozilla once xulrunner is
compiled
' --without-networkmanager'
' --with-python'
)
- r.Environment('mozjs_CFLAGS', '"-DXP_UNIX `pkg-config libxul-unstable
--cflags`"')
- r.Environment('mozjs_LIBS', '"`pkg-config libxul-unstable --libs`"')
-
- if Arch.x86_64:
- # First build 32bit version
- macros32 = r.macros.copy()
- macros32.cc = '"gcc -m32"'
- macros32.cxx = '"g++ -m32"'
- macros32.libdir = '%(prefix)s/lib'
-
- r.Run('cp -a %(builddir)s %(builddir)s/../32bit')
-
- r.Configure(r.extraConfig, dir='../32bit', overrideMacros=macros32,
- preConfigure='USE_ARCH=32')
- r.Make('LIBTOOL=%(bindir)s/libtool',
- dir='../32bit', overrideMacros=macros32,
preMake='USE_ARCH=32')
- r.MakeInstall('LIBTOOL=%(bindir)s/libtool',
- dir='../32bit', overrideMacros=macros32,
preMake='USE_ARCH=32')
-
- r.NormalizePkgConfig(exceptions='.*')
- r.NonMultilibComponent(exceptions='.*')
-
- def configure(r):
-# r.Configure(' --with-file --with-gnome --with-gnome --with-webkit
--with-mozjs --with-networkmanager --with-python')
- r.Configure(r.extraConfig)
-
def make(r):
- r.Make('LIBTOOL=%(bindir)s/libtool')
+ r.Make('LIBDL="-ldl"')
def makeinstall(r):
- r.MakeInstall('LIBTOOL=%(bindir)s/libtool')
+ r.MakeInstall('LIBDL="-ldl"')
libproxy-0.2.3-fix-dbus-includes.patch: new
--- /dev/null
+++ libproxy-0.2.3-fix-dbus-includes.patch
@@ -0,0 +31 @@
+--- libproxy-0.2.3.orig/configure.ac 2008-06-06 02:26:16.000000000 +0530
++++ libproxy-0.2.3/configure.ac 2009-01-25 15:12:45.720319398 +0530
+@@ -21,6 +22,7 @@
+ [PKG_CHECK_MODULES(mozjs, mozilla-js, have_mozjs=yes,
have_mozjs=no)])])
+ PKG_CHECK_MODULES(NetworkManager, NetworkManager,
+ have_networkmanager=yes,
have_networkmanager=no)
++PKG_CHECK_MODULES(dbus, dbus-1, have_dbus=yes, have_dbus=no)
+
+ # Environmental Variable
+ AC_ARG_WITH([envvar],
+@@ -133,15 +135,15 @@
+ [AS_HELP_STRING([--with-networkmanager],
+ [build NetworkManager plugin @<:@automatic@:>@])],
+ [],
+- [test x$have_networkmanager == xyes && with_networkmanager=yes])
++ [test x$have_networkmanager == xyes -a x$have_dbus == xyes &&
with_networkmanager=yes])
+ if test x$with_networkmanager = xyes; then
+- if test x$have_networkmanager == xyes; then
+- NETWORKMANAGER_CFLAGS="$NetworkManager_CFLAGS"
+- NETWORKMANAGER_LIBS="$NetworkManager_LIBS"
++ if test x$have_networkmanager == xyes -a x$have_dbus == xyes; then
++ NETWORKMANAGER_CFLAGS="$NetworkManager_CFLAGS $dbus_CFLAGS"
++ NETWORKMANAGER_LIBS="$NetworkManager_LIBS $dbus_LIBS"
+ AC_SUBST(NETWORKMANAGER_CFLAGS)
+ AC_SUBST(NETWORKMANAGER_LIBS)
+ else
+- echo "NetworkManager plugin requires: NetworkManager!"
++ echo "NetworkManager plugin requires: NetworkManager and dbus!"
+ exit 1
+ fi
+ else
libproxy-0.2.3-fix-python-automagic.patch: new
--- /dev/null
+++ libproxy-0.2.3-fix-python-automagic.patch
@@ -0,0 +22 @@
+diff -Naur libproxy-0.2.3.orig/configure.ac libproxy-0.2.3/configure.ac
+--- libproxy-0.2.3.orig/configure.ac 2008-06-06 02:26:16.000000000 +0530
++++ libproxy-0.2.3/configure.ac 2009-01-25 13:56:15.335319374 +0530
+@@ -10,6 +10,7 @@
+ AC_PROG_LIBTOOL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
++AM_PROG_CC_C_O
+
+ ### Checks for libraries for plugins.
+ PKG_CHECK_MODULES(x11, x11, have_x11=yes, have_x11=no)
+@@ -154,8 +155,8 @@
+ AC_ARG_WITH([python],
+ [AS_HELP_STRING([--with-python],
+ [build Python bindings @<:@automatic@:>@])],
+- [AM_PATH_PYTHON([2.5], with_python=yes)],
+- [AM_PATH_PYTHON([2.5], with_python=yes, with_python=no)])
++ [AM_PATH_PYTHON([2.5], have_python=yes, have_python=no)],
++ [have_python=yes && with_python=yes])
+ AM_CONDITIONAL([WITH_PYTHON], [test x$with_python = xyes])
+
+ # Java
libproxy-0.2.3-implicit-declaration.patch: new
--- /dev/null
+++ libproxy-0.2.3-implicit-declaration.patch
@@ -0,0 +10 @@
+--- src/bin/proxy.c
++++ src/bin/proxy.c
+@@ -21,6 +21,7 @@
+ #include <stdlib.h>
+ #include <assert.h>
+ #include <unistd.h>
++#define __USE_BSD /* For strdup() */
+ #include <string.h>
+
+ // Import libproxy API
libproxy-0.2.3-fbsd.patch: new
--- /dev/null
+++ libproxy-0.2.3-fbsd.patch
@@ -0,0 +75 @@
+Mix of various upstream commits to build on FreeBSD and be more POSIX
compliant.
+Drop at next bump.
+
+
+Index: src/lib/url.c
+===================================================================
+--- src/lib/url.c (revision 308)
++++ src/lib/url.c (revision 309)
+@@ -26,6 +26,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
++#include <netinet/in.h>
+
+ #include "misc.h"
+ #include "url.h"
+Index: src/lib/proxy_factory.c
+===================================================================
+--- src/lib/proxy_factory.c (revision 308)
++++ src/lib/proxy_factory.c (revision 309)
+@@ -27,6 +27,7 @@
+ #include <math.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
++#include <netinet/in.h>
+ #include <pthread.h>
+
+
+Index: src/plugins/pacrunner_webkit.c
+===================================================================
+--- src/plugins/webkit.c (revision 335)
++++ src/plugins/webkit.c (working copy)
+@@ -23,6 +23,7 @@
+ #include <sys/socket.h>
+ #include <netdb.h>
+ #include <arpa/inet.h>
++#include <netinet/in.h>
+ #define __USE_BSD
+ #include <unistd.h>
+
+Index: src/plugins/pacrunner_mozjs.c
+===================================================================
+--- src/plugins/mozjs.c (revision 335)
++++ src/plugins/mozjs.c (working copy)
+@@ -23,6 +23,7 @@
+ #include <sys/socket.h>
+ #include <netdb.h>
+ #include <arpa/inet.h>
++#include <netinet/in.h>
+ #define __USE_BSD
+ #include <unistd.h>
+
+Index: configure.ac
+===================================================================
+--- configure.ac (revision 334)
++++ configure.ac (revision 335)
+@@ -199,7 +199,7 @@
+ AC_TYPE_SIZE_T
+ PLUGINDIR=$libdir/$PACKAGE_NAME/$PACKAGE_VERSION/plugins
+ AC_SUBST(PLUGINDIR)
+-CFLAGS="-g -std=c99 $CFLAGS -DPLUGINDIR=\\\"$PLUGINDIR\\\"
-DSYSCONFDIR=\\\"$sysconfdir\\\" -D_POSIX_C_SOURCE=1"
++CFLAGS="-g -std=c99 $CFLAGS -DPLUGINDIR=\\\"$PLUGINDIR\\\"
-DSYSCONFDIR=\\\"$sysconfdir\\\" -D_POSIX_C_SOURCE=200112L"
+
+ ### Checks for library functions.
+ AC_FUNC_MALLOC
+Index: src/bin/Makefile.am
+===================================================================
+--- src/bin/Makefile.am (revision 318)
++++ src/bin/Makefile.am (revision 319)
+@@ -3,5 +3,4 @@
+ # Command line interface to libproxy
+ proxy_SOURCES = proxy.c
+ proxy_CFLAGS = -I$(top_srcdir)/src/lib
+-proxy_LDFLAGS = -ldl
+ proxy_LDADD = ../lib/libproxy.la
libproxy-0.2.3-fix-automagic-mozjs.patch: new
--- /dev/null
+++ libproxy-0.2.3-fix-automagic-mozjs.patch
@@ -0,0 +60 @@
+--- configure.ac.orig 2009-06-29 11:15:29.169464423 +0300
++++ configure.ac 2009-06-29 11:16:03.963593002 +0300
+@@ -17,9 +17,6 @@
+ PKG_CHECK_MODULES(xmu, xmu, have_xmu=yes, have_xmu=no)
+ PKG_CHECK_MODULES(gconf, gconf-2.0, have_gconf=yes, have_gconf=no)
+ PKG_CHECK_MODULES(webkit, webkit-1.0, have_webkit=yes, have_webkit=no)
+-PKG_CHECK_MODULES(mozjs, xulrunner-js, have_mozjs=yes,
+- [PKG_CHECK_MODULES(mozjs, firefox-js, have_mozjs=yes,
+- [PKG_CHECK_MODULES(mozjs, mozilla-js, have_mozjs=yes,
have_mozjs=no)])])
+ PKG_CHECK_MODULES(NetworkManager, NetworkManager,
+ have_networkmanager=yes,
have_networkmanager=no)
+ PKG_CHECK_MODULES(dbus, dbus-1, have_dbus=yes, have_dbus=no)
+@@ -111,24 +108,32 @@
+
+ # Mozilla Javascript
+ AC_ARG_WITH([mozjs],
+- [AS_HELP_STRING([--with-mozjs],
+- [build Mozilla JavaScript PAC runner plugin @<:@automatic@:>@])],
++
[AS_HELP_STRING([--with-mozjs@<:@=xulrunner|firefox|mozilla|seamonkey|no@:>@],
++ [build Mozilla JavaScript PAC runner plugin (autodetected by
default)])],
+ [],
+- [test x$have_mozjs == xyes && with_mozjs=yes])
+-if test x$with_mozjs = xyes; then
+- if test x$have_mozjs == xyes; then
+- MOZJS_CFLAGS="$mozjs_CFLAGS"
+- MOZJS_LIBS="$mozjs_LIBS"
+- AC_SUBST(MOZJS_CFLAGS)
+- AC_SUBST(MOZJS_LIBS)
+- else
+- echo "Mozilla JavaScript plugin requires: mozjs!"
+- exit 1
+- fi
++ [with_mozjs=auto])
++
++if (test x$with_mozjs = xauto || test x$with_mozjs = xyes); then
++ PKG_CHECK_MODULES(mozjs, xulrunner-js, with_mozjs=xulrunner,
++ [PKG_CHECK_MODULES(mozjs, firefox-js,
with_mozjs=firefox,
++ [PKG_CHECK_MODULES(mozjs, mozilla-js,
with_mozjs=mozilla,
++ [PKG_CHECK_MODULES(mozjs, seamonkey-js,
with_mozjs=seamonkey,
++ [test x$with_mozjs = xauto && with_mozjs = no
|| with_mozjs = error])])])])
++elif test x$with_mozjs != xno; then
++ PKG_CHECK_MODULES(mozjs, [$with_mozjs[]-js])
++fi
++
++if test x$with_mozjs = xerror; then
++ AC_MSG_ERROR([cannot find any mozjs provider])
+ else
+- with_mozjs=no
++ AC_MSG_RESULT([$with_mozjs])
++ MOZJS_CFLAGS="$mozjs_CFLAGS"
++ MOZJS_LIBS="$mozjs_LIBS"
++ AC_SUBST(MOZJS_CFLAGS)
++ AC_SUBST(MOZJS_LIBS)
+ fi
+-AM_CONDITIONAL([WITH_MOZJS], [test x$with_mozjs = xyes])
++
++AM_CONDITIONAL([WITH_MOZJS], [test x$with_mozjs != xno])
+
+ # NetworkManager
+ AC_ARG_WITH([networkmanager],
dbus-fix.patch: removed
Committed by: brcha
Other related posts:
- » [weasel-commit] Source: libproxy=0.2.3-5 - rbuilder
