| 1 |
eva 09/05/03 18:50:48 |
| 2 |
|
| 3 |
Added: libproxy-0.2.3-fix-libxul-cflags.patch |
| 4 |
libproxy-0.2.3-fix-as-needed-problem.patch |
| 5 |
libproxy-0.2.3-fix-python-automagic.patch |
| 6 |
libproxy-0.2.3-fix-dbus-includes.patch |
| 7 |
Log: |
| 8 |
liproxy is a library for automatic proxy configuration management, initial ebuild by nirbheek, closes bug #244028. |
| 9 |
(Portage version: 2.2_rc31/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 net-libs/libproxy/files/libproxy-0.2.3-fix-libxul-cflags.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libproxy/files/libproxy-0.2.3-fix-libxul-cflags.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libproxy/files/libproxy-0.2.3-fix-libxul-cflags.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: libproxy-0.2.3-fix-libxul-cflags.patch |
| 18 |
=================================================================== |
| 19 |
configure.ac | 5 +++-- |
| 20 |
1 files changed, 3 insertions(+), 2 deletions(-) |
| 21 |
|
| 22 |
diff --git a/configure.ac b/configure.ac |
| 23 |
index bfea453..844896b 100644 |
| 24 |
--- a/configure.ac |
| 25 |
+++ b/configure.ac |
| 26 |
@@ -23,6 +23,7 @@ PKG_CHECK_MODULES(mozjs, xulrunner-js, have_mozjs=yes, |
| 27 |
PKG_CHECK_MODULES(NetworkManager, NetworkManager, |
| 28 |
have_networkmanager=yes, have_networkmanager=no) |
| 29 |
PKG_CHECK_MODULES(dbus, dbus-1, have_dbus=yes, have_dbus=no) |
| 30 |
+PKG_CHECK_MODULES(libxul_unstable, libxul-unstable, have_mozjs=yes, have_mozjs=no) |
| 31 |
|
| 32 |
# Environmental Variable |
| 33 |
AC_ARG_WITH([envvar], |
| 34 |
@@ -117,8 +118,8 @@ AC_ARG_WITH([mozjs], |
| 35 |
[test x$have_mozjs == xyes && with_mozjs=yes]) |
| 36 |
if test x$with_mozjs = xyes; then |
| 37 |
if test x$have_mozjs == xyes; then |
| 38 |
- MOZJS_CFLAGS="$mozjs_CFLAGS" |
| 39 |
- MOZJS_LIBS="$mozjs_LIBS" |
| 40 |
+ MOZJS_CFLAGS="$mozjs_CFLAGS $libxul_unstable_CFLAGS" |
| 41 |
+ MOZJS_LIBS="$mozjs_LIBS $libxul_unstable_LIBS" |
| 42 |
AC_SUBST(MOZJS_CFLAGS) |
| 43 |
AC_SUBST(MOZJS_LIBS) |
| 44 |
else |
| 45 |
|
| 46 |
|
| 47 |
|
| 48 |
1.1 net-libs/libproxy/files/libproxy-0.2.3-fix-as-needed-problem.patch |
| 49 |
|
| 50 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libproxy/files/libproxy-0.2.3-fix-as-needed-problem.patch?rev=1.1&view=markup |
| 51 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libproxy/files/libproxy-0.2.3-fix-as-needed-problem.patch?rev=1.1&content-type=text/plain |
| 52 |
|
| 53 |
Index: libproxy-0.2.3-fix-as-needed-problem.patch |
| 54 |
=================================================================== |
| 55 |
diff -Naur libproxy-0.2.3.orig/src/lib/Makefile.am libproxy-0.2.3/src/lib/Makefile.am |
| 56 |
--- libproxy-0.2.3.orig/src/lib/Makefile.am 2008-06-06 02:26:15.000000000 +0530 |
| 57 |
+++ libproxy-0.2.3/src/lib/Makefile.am 2009-01-30 13:47:53.365859960 +0530 |
| 58 |
@@ -2,7 +2,7 @@ |
| 59 |
libproxy_la_SOURCES = misc.c url.c pac.c dhcp.c dns.c slp.c wpad.c proxy_factory.c config_file.c \ |
| 60 |
misc.h url.h pac.h dhcp.h dns.h slp.h wpad.h proxy_factory.h proxy.h config_file.h |
| 61 |
libproxy_la_CFLAGS = -Wall |
| 62 |
-libproxy_la_LDFLAGS = -lm |
| 63 |
+libproxy_la_LDFLAGS = -lm -ldl |
| 64 |
|
| 65 |
include_HEADERS = proxy.h |
| 66 |
|
| 67 |
|
| 68 |
|
| 69 |
|
| 70 |
1.1 net-libs/libproxy/files/libproxy-0.2.3-fix-python-automagic.patch |
| 71 |
|
| 72 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libproxy/files/libproxy-0.2.3-fix-python-automagic.patch?rev=1.1&view=markup |
| 73 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libproxy/files/libproxy-0.2.3-fix-python-automagic.patch?rev=1.1&content-type=text/plain |
| 74 |
|
| 75 |
Index: libproxy-0.2.3-fix-python-automagic.patch |
| 76 |
=================================================================== |
| 77 |
diff -Naur libproxy-0.2.3.orig/configure.ac libproxy-0.2.3/configure.ac |
| 78 |
--- libproxy-0.2.3.orig/configure.ac 2008-06-06 02:26:16.000000000 +0530 |
| 79 |
+++ libproxy-0.2.3/configure.ac 2009-01-25 13:56:15.335319374 +0530 |
| 80 |
@@ -10,6 +10,7 @@ |
| 81 |
AC_PROG_LIBTOOL |
| 82 |
AC_PROG_LN_S |
| 83 |
AC_PROG_MAKE_SET |
| 84 |
+AM_PROG_CC_C_O |
| 85 |
|
| 86 |
### Checks for libraries for plugins. |
| 87 |
PKG_CHECK_MODULES(x11, x11, have_x11=yes, have_x11=no) |
| 88 |
@@ -154,8 +155,8 @@ |
| 89 |
AC_ARG_WITH([python], |
| 90 |
[AS_HELP_STRING([--with-python], |
| 91 |
[build Python bindings @<:@automatic@:>@])], |
| 92 |
- [AM_PATH_PYTHON([2.5], with_python=yes)], |
| 93 |
- [AM_PATH_PYTHON([2.5], with_python=yes, with_python=no)]) |
| 94 |
+ [AM_PATH_PYTHON([2.5], have_python=yes, have_python=no)], |
| 95 |
+ [have_python=yes && with_python=yes]) |
| 96 |
AM_CONDITIONAL([WITH_PYTHON], [test x$with_python = xyes]) |
| 97 |
|
| 98 |
# Java |
| 99 |
|
| 100 |
|
| 101 |
|
| 102 |
1.1 net-libs/libproxy/files/libproxy-0.2.3-fix-dbus-includes.patch |
| 103 |
|
| 104 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libproxy/files/libproxy-0.2.3-fix-dbus-includes.patch?rev=1.1&view=markup |
| 105 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libproxy/files/libproxy-0.2.3-fix-dbus-includes.patch?rev=1.1&content-type=text/plain |
| 106 |
|
| 107 |
Index: libproxy-0.2.3-fix-dbus-includes.patch |
| 108 |
=================================================================== |
| 109 |
--- libproxy-0.2.3.orig/configure.ac 2008-06-06 02:26:16.000000000 +0530 |
| 110 |
+++ libproxy-0.2.3/configure.ac 2009-01-25 15:12:45.720319398 +0530 |
| 111 |
@@ -21,6 +22,7 @@ |
| 112 |
[PKG_CHECK_MODULES(mozjs, mozilla-js, have_mozjs=yes, have_mozjs=no)])]) |
| 113 |
PKG_CHECK_MODULES(NetworkManager, NetworkManager, |
| 114 |
have_networkmanager=yes, have_networkmanager=no) |
| 115 |
+PKG_CHECK_MODULES(dbus, dbus-1, have_dbus=yes, have_dbus=no) |
| 116 |
|
| 117 |
# Environmental Variable |
| 118 |
AC_ARG_WITH([envvar], |
| 119 |
@@ -133,15 +135,15 @@ |
| 120 |
[AS_HELP_STRING([--with-networkmanager], |
| 121 |
[build NetworkManager plugin @<:@automatic@:>@])], |
| 122 |
[], |
| 123 |
- [test x$have_networkmanager == xyes && with_networkmanager=yes]) |
| 124 |
+ [test x$have_networkmanager == xyes -a x$have_dbus == xyes && with_networkmanager=yes]) |
| 125 |
if test x$with_networkmanager = xyes; then |
| 126 |
- if test x$have_networkmanager == xyes; then |
| 127 |
- NETWORKMANAGER_CFLAGS="$NetworkManager_CFLAGS" |
| 128 |
- NETWORKMANAGER_LIBS="$NetworkManager_LIBS" |
| 129 |
+ if test x$have_networkmanager == xyes -a x$have_dbus == xyes; then |
| 130 |
+ NETWORKMANAGER_CFLAGS="$NetworkManager_CFLAGS $dbus_CFLAGS" |
| 131 |
+ NETWORKMANAGER_LIBS="$NetworkManager_LIBS $dbus_LIBS" |
| 132 |
AC_SUBST(NETWORKMANAGER_CFLAGS) |
| 133 |
AC_SUBST(NETWORKMANAGER_LIBS) |
| 134 |
else |
| 135 |
- echo "NetworkManager plugin requires: NetworkManager!" |
| 136 |
+ echo "NetworkManager plugin requires: NetworkManager and dbus!" |
| 137 |
exit 1 |
| 138 |
fi |
| 139 |
else |
Archives