# HG changeset patch # User Niveditha Rau # Date 1479351018 28800 # Node ID 9c5f2a8218bc8861c5dee595b3efc2a95fb95a0d # Parent f350bef4a2753ba5e9992e3c6ebddf637d1f250f 23245338 Move libproxy to Userland and update to 0.4.11.1 PSARC/2016/408 GNOME 3 Miscellaneous Libraries diff -r f350bef4a275 -r 9c5f2a8218bc components/desktop/libproxy/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/desktop/libproxy/Makefile Wed Nov 16 18:50:18 2016 -0800 @@ -0,0 +1,79 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. +# +BUILD_BITS= 32_and_64 +COMPILER= gcc +include ../../../make-rules/shared-macros.mk + +COMPONENT_NAME= libproxy +COMPONENT_VERSION= 0.4.11.1 +COMPONENT_PROJECT_URL= https://code.google.com/p/libproxy +COMPONENT_SRC= $(COMPONENT_NAME)-master +COMPONENT_ARCHIVE= master.zip +COMPONENT_ARCHIVE_URL= https://github.com/binarycrusader/$(COMPONENT_NAME)/archive/master.zip +COMPONENT_BUGDB= library/libproxy + +TPNO= 24459 + +BUILD_STYLE= cmake +include $(WS_MAKE_RULES)/common.mk + +CXXFLAGS += -std=c++11 + +# Only compatible with Python 2.x. +PYTHON_VERSION=2.7 +PYTHON_VERSIONS=2.7 + +# Our Perl 5.22 is 64-bit, so don't deliver Perl bindings for 32-bit build. +CMAKE_OPTIONS.32 = -DWITH_PERL=OFF +CMAKE_OPTIONS.64 = -DWITH_PERL=ON + +CMAKE_OPTIONS += -DINCLUDE_INSTALL_DIR="$(USRINCDIR)/$(COMPONENT_NAME)" +CMAKE_OPTIONS += -DPERL_VENDORINSTALL=ON +CMAKE_OPTIONS += -DPYTHON_EXECUTABLE="$(PYTHON)" +CMAKE_OPTIONS += -DPYTHON_SITEPKG_DIR=$(PYTHON_LIB) +# Required for other components. +CMAKE_OPTIONS += -DWITH_GNOME3=ON +CMAKE_OPTIONS += -DWITH_PYTHON=ON +# Required for other components. +CMAKE_OPTIONS += -DWITH_VALA=ON +# Always build pacrunner as a module. +CMAKE_OPTIONS += -DBIPR=ON + +# Assumes "make" is GNU make, turns into fork bomb if it finds Solaris make +COMPONENT_BUILD_ENV += PATH="/usr/gnu/bin:$(PATH)" + +COMPONENT_POST_INSTALL_ACTION= \ + $(PYTHON) -m py_compile $(PROTO_DIR)/$(PYTHON_LIB)/libproxy.py + +REQUIRED_PACKAGES += developer/build/autoconf +REQUIRED_PACKAGES += developer/build/automake +REQUIRED_PACKAGES += developer/build/cmake +REQUIRED_PACKAGES += developer/build/gnu-make +REQUIRED_PACKAGES += developer/build/pkg-config +REQUIRED_PACKAGES += library/glib2 +REQUIRED_PACKAGES += $(PERL_PKG) +REQUIRED_PACKAGES += runtime/python-27 +REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime +REQUIRED_PACKAGES += system/library/gcc/gcc-c++-runtime diff -r f350bef4a275 -r 9c5f2a8218bc components/desktop/libproxy/libproxy-gnome.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/desktop/libproxy/libproxy-gnome.p5m Wed Nov 16 18:50:18 2016 -0800 @@ -0,0 +1,42 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. +# + + \ + default mangler.man.stability "pass-through volatile"> +set name=pkg.fmri \ + value=pkg:/library/libproxy/libproxy-gnome@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary \ + value="Plugin of libproxy to get proxy information for Gnome 3" +set name=com.oracle.info.description value=libproxy +set name=com.oracle.info.tpno value=$(TPNO) +set name=info.classification \ + value="org.opensolaris.category.2008:Desktop (GNOME)/Libraries" +set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) +set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) +set name=org.opensolaris.arc-caseid value=PSARC/2016/408 +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +file path=usr/lib/$(MACH64)/libproxy/0.4.11/modules/config_gnome3.so +file path=usr/lib/libproxy/0.4.11/modules/config_gnome3.so +license COPYING license=LGPLv2.1 diff -r f350bef4a275 -r 9c5f2a8218bc components/desktop/libproxy/libproxy.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/desktop/libproxy/libproxy.p5m Wed Nov 16 18:50:18 2016 -0800 @@ -0,0 +1,59 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. +# + + \ + default mangler.man.stability "pass-through volatile"> +set name=pkg.fmri \ + value=pkg:/library/libproxy@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary \ + value="A library that provides automatic proxy configuration management" +set name=com.oracle.info.description value=libproxy +set name=com.oracle.info.tpno value=$(TPNO) +set name=info.classification \ + value="org.opensolaris.category.2008:Desktop (GNOME)/Libraries" +set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) +set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) +set name=org.opensolaris.arc-caseid value=PSARC/2016/408 +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +file path=usr/bin/$(MACH64)/proxy +file path=usr/bin/proxy +file path=usr/include/libproxy/proxy.h +link path=usr/lib/$(MACH64)/libproxy.so target=libproxy.so.1 +link path=usr/lib/$(MACH64)/libproxy.so.1 target=libproxy.so.1.0.0 +file path=usr/lib/$(MACH64)/libproxy.so.1.0.0 +file path=usr/lib/$(MACH64)/pkgconfig/libproxy-1.0.pc +file path=usr/lib/$(MACH64)/pxgsettings mode=0555 +link path=usr/lib/libproxy.so target=libproxy.so.1 +link path=usr/lib/libproxy.so.1 target=libproxy.so.1.0.0 +file path=usr/lib/libproxy.so.1.0.0 +file path=usr/lib/pkgconfig/libproxy-1.0.pc +file path=usr/lib/pxgsettings mode=0555 +file path=usr/lib/python2.7/vendor-packages/libproxy.py +file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Net/Libproxy.pm +file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Net/Libproxy/Libproxy.so +file usr/share/cmake/Modules/Findlibproxy.cmake \ + path=usr/share/cmake-2.8/Modules/Findlibproxy.cmake +file path=usr/share/vala/vapi/libproxy-1.0.vapi +license COPYING license=LGPLv2.1 diff -r f350bef4a275 -r 9c5f2a8218bc components/desktop/libproxy/patches/01-memset.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/desktop/libproxy/patches/01-memset.patch Wed Nov 16 18:50:18 2016 -0800 @@ -0,0 +1,12 @@ +Fix for compiling. This change can be sent upstream + +--- libproxy-master/libproxy/modules/config_gnome3.cpp Sat Sep 7 04:14:17 2013 ++++ libproxy-master/libproxy/modules/config_gnome3.cpp Mon May 11 17:56:50 2015 +@@ -25,6 +25,7 @@ + #include // For stat() + #include // For pipe(), close(), vfork(), dup(), execl(), _exit() + #include // For kill() ++#include // For memset() + + #include "../extension_config.hpp" + using namespace libproxy; diff -r f350bef4a275 -r 9c5f2a8218bc components/meta-packages/history/history --- a/components/meta-packages/history/history Wed Nov 16 18:49:40 2016 -0800 +++ b/components/meta-packages/history/history Wed Nov 16 18:50:18 2016 -0800 @@ -979,6 +979,7 @@ library/java/swt@3.3.2,5.12-5.12.0.0.0.90.0 library/liblouisxml@2.1.0,5.12-5.12.0.0.0.90.0 library/liboil@0.3.17,5.12-5.12.0.0.0.90.0 +library/libproxy/libproxy-mozjs@0.3.1-5.12.0.0.0.113.0 library/musicbrainz/libdiscid@0.2.2,5.12-5.12.0.0.0.112.0 library/musicbrainz/libmusicbrainz@3.0.3,5.12-5.12.0.0.0.112.0 library/myspell/dictionary/cs@2.30.0-5.12.0.0.0.97.0 diff -r f350bef4a275 -r 9c5f2a8218bc components/meta-packages/incorporation-cache --- a/components/meta-packages/incorporation-cache Wed Nov 16 18:49:40 2016 -0800 +++ b/components/meta-packages/incorporation-cache Wed Nov 16 18:50:18 2016 -0800 @@ -65,9 +65,6 @@ consolidation/userland/userland-incorporation:gnome/window-manager/metacity@2.30.1-5.12.0.0.0.92.0 consolidation/userland/userland-incorporation:image/library/libart@2.3.21-5.12.0.0.0.92.0 consolidation/userland/userland-incorporation:library/fftw-3@3.2.1-5.12.0.0.0.92.0 -consolidation/userland/userland-incorporation:library/libproxy/libproxy-gnome@0.3.1-5.12.0.0.0.92.0 -consolidation/userland/userland-incorporation:library/libproxy/libproxy-mozjs@0.3.1-5.12.0.0.0.67.0 -consolidation/userland/userland-incorporation:library/libproxy@0.3.1-5.12.0.0.0.90.0 consolidation/userland/userland-incorporation:library/libunique@1.1.6-5.12.0.0.0.92.0 consolidation/userland/userland-incorporation:library/python/python-dbus-27@1.2.0-5.12.0.0.0.92.0 consolidation/userland/userland-incorporation:library/python/python-gnome-desktop-27@2.30.2-5.12.0.0.0.92.0