* [gentoo-commits] proj/gnome:gnome-next commit in: net-libs/libproxy/files/, net-libs/libproxy/
@ 2011-07-06 14:37 Alexandre Restovtsev
0 siblings, 0 replies; only message in thread
From: Alexandre Restovtsev @ 2011-07-06 14:37 UTC (permalink / raw
To: gentoo-commits
commit: f35c9dc3b866b0cf581ae180130f38c8f39df602
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Jul 6 14:26:12 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Jul 6 14:37:32 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f35c9dc3
net-libs/libproxy: punt
The reason for putting libproxy in the overlay was for webkit-gtk:3
support. Since USE=webkit has been disabled, keeping the ebuild in the
overlay is pointless; it's basically just an outdated version of the
gx86 ebuild. Fixes bug #374211.
---
.../libproxy-0.4.6-mozjs-link_directory.patch | 30 -----
.../files/libproxy-0.4.6-webkit-gtk-3.patch | 24 ----
.../files/libproxy-0.4.6-xulrunner-2.patch | 133 --------------------
net-libs/libproxy/libproxy-0.4.6-r300.ebuild | 85 -------------
4 files changed, 0 insertions(+), 272 deletions(-)
diff --git a/net-libs/libproxy/files/libproxy-0.4.6-mozjs-link_directory.patch b/net-libs/libproxy/files/libproxy-0.4.6-mozjs-link_directory.patch
deleted file mode 100644
index cab138e..0000000
--- a/net-libs/libproxy/files/libproxy-0.4.6-mozjs-link_directory.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 18fbf794ffc2cab9f4b8df3c4132b094fc4ef281 Mon Sep 17 00:00:00 2001
-From: nicolas.dufresne <nicolas.dufresne@c587cffe-e639-0410-9787-d7902ae8ed56>
-Date: Tue, 12 Oct 2010 17:39:18 +0000
-Subject: [PATCH 1/2] Disable transient linking
-
-As explained at
-http://www.cmake.org/Wiki/CMake_FAQ#Why_do_I_have_unwanted_semicolons_.3B_in_my_compiler_flags.3F
-if CMake links A to B and B to C, all the flags from A will be appended when
-C is linked. This behaviour is wrong, but CMake provides a workaround which
-is implemented in this patch.
-
-git-svn-id: https://libproxy.googlecode.com/svn/trunk@774 c587cffe-e639-0410-9787-d7902ae8ed56
----
- libproxy/cmake/libproxy.cmk | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/libproxy/cmake/libproxy.cmk b/libproxy/cmake/libproxy.cmk
-index 5625d4e..dc9fa0f 100644
---- a/libproxy/cmake/libproxy.cmk
-+++ b/libproxy/cmake/libproxy.cmk
-@@ -18,5 +18,6 @@ endif()
- set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp
- PROPERTY COMPILE_DEFINITIONS MODULEDIR="${MODULEDIR}";BUILTIN_MODULES=${BUILTIN_MODULES})
- set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1.0.0 SOVERSION 1)
-+set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "")
- install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR})
- install(FILES proxy.h DESTINATION ${INCLUDE_INSTALL_DIR})
---
-1.7.2.3
-
diff --git a/net-libs/libproxy/files/libproxy-0.4.6-webkit-gtk-3.patch b/net-libs/libproxy/files/libproxy-0.4.6-webkit-gtk-3.patch
deleted file mode 100644
index b2383da..0000000
--- a/net-libs/libproxy/files/libproxy-0.4.6-webkit-gtk-3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur libproxy-0.4.6/.cproject libproxy-0.4.6.new/.cproject
---- libproxy-0.4.6/.cproject 2010-09-02 01:53:34.000000000 +0530
-+++ libproxy-0.4.6.new/.cproject 2011-01-24 22:57:36.767000067 +0530
-@@ -167,7 +167,7 @@
- <pathentry include="/usr/include/NetworkManager" kind="inc" path="" system="true"/>
- <pathentry include="/usr/include/dbus-1.0" kind="inc" path="" system="true"/>
- <pathentry include="/usr/lib64/dbus-1.0/include" kind="inc" path="" system="true"/>
--<pathentry include="/usr/include/webkit-1.0" kind="inc" path="" system="true"/>
-+<pathentry include="/usr/include/webkit-3.0" kind="inc" path="" system="true"/>
- <pathentry include="/usr/include/glib-2.0" kind="inc" path="" system="true"/>
- <pathentry include="/usr/lib64/glib-2.0/include" kind="inc" path="" system="true"/>
- <pathentry include="/usr/include/gtk-2.0" kind="inc" path="" system="true"/>
-diff -Naur libproxy-0.4.6/libproxy/cmake/modules/pacrunner_webkit.cmk libproxy-0.4.6.new/libproxy/cmake/modules/pacrunner_webkit.cmk
---- libproxy-0.4.6/libproxy/cmake/modules/pacrunner_webkit.cmk 2010-09-02 01:53:34.000000000 +0530
-+++ libproxy-0.4.6.new/libproxy/cmake/modules/pacrunner_webkit.cmk 2011-01-24 22:57:46.410000066 +0530
-@@ -12,5 +12,5 @@
- set(WEBKIT_FOUND 1)
- endif()
- else()
-- px_check_modules(WEBKIT webkit-1.0)
--endif()
-\ No newline at end of file
-+ px_check_modules(WEBKIT webkitgtk-3.0)
-+endif()
diff --git a/net-libs/libproxy/files/libproxy-0.4.6-xulrunner-2.patch b/net-libs/libproxy/files/libproxy-0.4.6-xulrunner-2.patch
deleted file mode 100644
index 5f3de3c..0000000
--- a/net-libs/libproxy/files/libproxy-0.4.6-xulrunner-2.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-http://bugs.gentoo.org/359879
-http://code.google.com/p/libproxy/issues/detail?id=158
-
---- libproxy/cmake/modules/pacrunner_mozjs.cmk
-+++ libproxy/cmake/modules/pacrunner_mozjs.cmk
-@@ -7,16 +7,23 @@
- include_directories("${MOZJS_INCLUDE_DIR}")
- endif()
- elseif(NOT APPLE)
-- set(MOZJS_SEARCH_ORDER "xulrunner-js;firefox-js;mozilla-js;seamonkey-js" CACHE STRING "MozJS search order")
-+ set(MOZJS_SEARCH_ORDER "mozilla-js;xulrunner-js;firefox-js;seamonkey-js" CACHE STRING "MozJS search order")
- option(WITH_MOZJS "Search for MOZJS package" ON)
- if (WITH_MOZJS)
-- pkg_search_module(MOZJS ${MOZJS_SEARCH_ORDER})
-- if(MOZJS_FOUND)
-- include_directories(${MOZJS_INCLUDE_DIRS})
-- link_directories(${MOZJS_LIBRARY_DIRS})
-- else()
-- set(MOZJS_FOUND 0)
-- endif()
-+ foreach(MOZJSLIB ${MOZJS_SEARCH_ORDER})
-+ pkg_search_module(MOZJS ${MOZJSLIB})
-+ if(MOZJS_FOUND)
-+ include_directories(${MOZJS_INCLUDE_DIRS})
-+ link_directories(${MOZJS_LIBRARY_DIRS})
-+ pkg_search_module(MOZJS2 ${MOZJSLIB}>=2.0b10)
-+ if(MOZJS2_FOUND)
-+ add_definitions(-DHAVE_MOZJS_2)
-+ endif(MOZJS2_FOUND)
-+ break()
-+ else()
-+ set(MOZJS_FOUND 0)
-+ endif()
-+ endforeach()
- else()
- set(MOZJS_FOUND 0)
- endif()
---- libproxy/modules/pacrunner_mozjs.cpp
-+++ libproxy/modules/pacrunner_mozjs.cpp
-@@ -42,12 +42,12 @@
- #define INET6_ADDRSTRLEN 46
- #endif
-
--static JSBool dnsResolve(JSContext *cx, JSObject * /*obj*/, uintN /*argc*/, jsval *argv, jsval *rval) {
-+static JSBool dnsResolve_(JSContext *cx, jsval hostname, jsval *vp) {
- // Get hostname argument
-- char *tmp = JS_strdup(cx, JS_GetStringBytes(JS_ValueToString(cx, argv[0])));
-+ char *tmp = JS_EncodeString(cx, JS_ValueToString(cx, hostname));
-
- // Set the default return value
-- *rval = JSVAL_NULL;
-+ JS_SET_RVAL(cx, vp, JSVAL_NULL);
-
- // Look it up
- struct addrinfo *info = NULL;
-@@ -66,7 +66,7 @@
- NI_NUMERICHOST)) goto out;
-
- // We succeeded
-- *rval = STRING_TO_JSVAL(JS_NewString(cx, tmp, strlen(tmp)));
-+ JS_SET_RVAL(cx, vp, STRING_TO_JSVAL(JS_NewStringCopyN(cx, tmp, strlen(tmp))));
- tmp = NULL;
-
- out:
-@@ -75,15 +75,20 @@
- return true;
- }
-
--static JSBool myIpAddress(JSContext *cx, JSObject *obj, uintN /*argc*/, jsval * /*argv*/, jsval *rval) {
-+static JSBool dnsResolve(JSContext *cx, uintN /*argc*/, jsval *vp) {
-+ jsval *argv = JS_ARGV(cx, vp);
-+ return dnsResolve_(cx, argv[0], vp);
-+}
-+
-+static JSBool myIpAddress(JSContext *cx, uintN /*argc*/, jsval *vp) {
- char *hostname = (char *) JS_malloc(cx, 1024);
- if (!gethostname(hostname, 1023)) {
-- JSString *myhost = JS_NewString(cx, hostname, strlen(hostname));
-+ JSString *myhost = JS_NewStringCopyN(cx, hostname, strlen(hostname));
- jsval arg = STRING_TO_JSVAL(myhost);
-- return dnsResolve(cx, obj, 1, &arg, rval);
-+ return dnsResolve_(cx, 1, &arg);
- }
- JS_free(cx, hostname);
-- *rval = JSVAL_NULL;
-+ JS_SET_RVAL(cx, vp, JSVAL_NULL);
- return true;
- }
-
-@@ -91,7 +96,7 @@
- // This MUST be a static global
- static JSClass cls = {
- "global", JSCLASS_GLOBAL_FLAGS,
-- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
-+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
- JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
- };
-@@ -111,7 +116,11 @@
- //JS_SetOptions(this->jsctx, JSOPTION_VAROBJFIX);
- //JS_SetVersion(this->jsctx, JSVERSION_LATEST);
- //JS_SetErrorReporter(cx, reportError);
-+ #ifdef HAVE_MOZJS_2
-+ if (!(this->jsglb = JS_NewCompartmentAndGlobalObject(this->jsctx, &cls, NULL))) goto error;
-+ #else
- if (!(this->jsglb = JS_NewObject(this->jsctx, &cls, NULL, NULL))) goto error;
-+ #endif
- if (!JS_InitStandardClasses(this->jsctx, this->jsglb)) goto error;
-
- // Define Javascript functions
-@@ -147,15 +156,19 @@
- throw bad_alloc();
- }
- jsval args[2] = {
-- STRING_TO_JSVAL(JS_NewString(this->jsctx, tmpurl, strlen(tmpurl))),
-- STRING_TO_JSVAL(JS_NewString(this->jsctx, tmphost, strlen(tmphost)))
-+ STRING_TO_JSVAL(JS_NewStringCopyN(this->jsctx, tmpurl, strlen(tmpurl))),
-+ STRING_TO_JSVAL(JS_NewStringCopyN(this->jsctx, tmphost, strlen(tmphost)))
- };
-
- // Find the proxy (call FindProxyForURL())
- jsval rval;
- JSBool result = JS_CallFunctionName(this->jsctx, this->jsglb, "FindProxyForURL", 2, args, &rval);
- if (!result) return "";
-- string answer = string(JS_GetStringBytes(JS_ValueToString(this->jsctx, rval)));
-+
-+ char * tmpanswer = JS_EncodeString(this->jsctx, JS_ValueToString(this->jsctx, rval));
-+ string answer = string(tmpanswer);
-+ JS_free(this->jsctx, tmpanswer);
-+
- if (answer == "undefined") return "";
- return answer;
- }
diff --git a/net-libs/libproxy/libproxy-0.4.6-r300.ebuild b/net-libs/libproxy/libproxy-0.4.6-r300.ebuild
deleted file mode 100644
index 24f5aca..0000000
--- a/net-libs/libproxy/libproxy-0.4.6-r300.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.6-r1.ebuild,v 1.2 2010/11/02 15:10:38 ssuominen Exp $
-
-EAPI="2"
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit cmake-utils eutils multilib python portability
-
-DESCRIPTION="Library for automatic proxy configuration management"
-HOMEPAGE="http://code.google.com/p/libproxy/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="gnome kde mono networkmanager perl python test vala xulrunner" #webkit
-
-RDEPEND="
- gnome? ( gnome-base/gconf )
- kde? ( >=kde-base/kdelibs-4.3 )
- mono? ( dev-lang/mono )
- networkmanager? ( net-misc/networkmanager )
- perl? ( dev-lang/perl )
- vala? ( dev-lang/vala )
- xulrunner? ( >=net-libs/xulrunner-1.9.1:1.9 )"
- # Disable till we figure out how to fix problems with gtk2/gtk3 apps
- #webkit? ( net-libs/webkit-gtk:3 )
-
-DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.19"
-
-DOCS="AUTHORS NEWS README ChangeLog"
-
-PATCHES=(
- "${FILESDIR}"/${P}-mozjs-link_directory.patch
- "${FILESDIR}"/${P}-xulrunner-2.patch )
- # "${FILESDIR}"/${P}-webkit-gtk-3.patch )
-
-pkg_setup() {
- if use python; then
- python_set_active_version 2
- fi
-}
-
-src_configure() {
- mycmakeargs=(
- -DPERL_VENDORINSTALL=ON
- -DCMAKE_C_FLAGS="${CFLAGS}"
- -DCMAKE_CXX_FLAGS="${CXXFLAGS}"
- -DWITH_WEBKIT=OFF
- $(cmake-utils_use_with gnome GNOME)
- $(cmake-utils_use_with kde KDE4)
- $(cmake-utils_use_with mono DOTNET)
- $(cmake-utils_use_with networkmanager NM)
- $(cmake-utils_use_with perl PERL)
- $(cmake-utils_use_with python PYTHON)
- $(cmake-utils_use_with vala VALA)
- $(cmake-utils_use_with xulrunner MOZJS)
- $(cmake-utils_use test BUILD_TESTING)
- )
- #$(cmake-utils_use_with webkit WEBKIT)
- cmake-utils_src_configure
-}
-
-src_compile() {
- # Prevent access violation when building with mono support
- export MONO_SHARED_DIR="${T}/shared"
- cmake-utils_src_compile
-}
-
-pkg_postinst() {
- preserve_old_lib_notify /usr/$(get_libdir)/libproxy.so.0
-
- if use python; then
- python_need_rebuild
- python_mod_optimize $(python_get_sitedir)/${PN}.py
- fi
-}
-
-pkg_postrm() {
- if use python; then
- python_mod_cleanup $(python_get_sitedir)/${PN}.py
- fi
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-07-06 14:37 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-06 14:37 [gentoo-commits] proj/gnome:gnome-next commit in: net-libs/libproxy/files/, net-libs/libproxy/ Alexandre Restovtsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox