# HG changeset patch
# User Niveditha Rau <Niveditha.Rau@Oracle.COM>
# Date 1465536555 25200
# Node ID b1580ab0bb5a444b3adf09135a078b8a1839efad
# Parent  7a67a08c24cb78b9831251aac7498e2ceb51ab72
23245664 Deliver rest 0.7.93 in Solaris
PSARC/2016/370 librest

diff -r 7a67a08c24cb -r b1580ab0bb5a components/gnome/rest/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/rest/Makefile	Thu Jun 09 22:29:15 2016 -0700
@@ -0,0 +1,77 @@
+#
+# 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 =            64_and_32
+# All components using gobject-introspection must be built with gcc as
+# gobject-introspection does not produce correct results when using Studio.
+COMPILER =              gcc
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		rest
+COMPONENT_VERSION=	0.7.93
+COMPONENT_PROJECT_URL=	https://wiki.gnome.org/Projects/Librest
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:c710644455340a44ddc005c645c466f05c0d779993138ea21a62c6082108b216
+COMPONENT_BUGDB=	gnome/libraries
+
+TPNO=			25457
+
+# Tests do not work on Solaris yet
+TEST_TARGET= $(SKIP_TEST)
+
+# Needs gobject-introspection, not available on S11.
+ifeq ($(BUILD_TYPE), evaluation)
+BUILD_32_and_64=
+INSTALL_32_and_64=
+PUBLISH_STAMP=
+endif
+
+include $(WS_MAKE_RULES)/gnome-component.mk
+
+CONFIGURE_OPTIONS += --with-ca-certificates=/etc/certs/ca-certificates.crt
+# Required for other components.
+CONFIGURE_OPTIONS += --enable-introspection
+
+# Needed because of Makefile.am patches.
+COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fiv);
+
+# for the tests
+unexport SHELLOPTS
+COMPONENT_PRE_CONFIGURE_ACTION += ($(CLONEY) $(SOURCE_DIR) $(@D));
+COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
+COMPONENT_TEST_ARGS =   -k -i
+COMPONENT_TEST_TRANSFORMS += \
+        '-n ' \
+        '-e "/TOTAL:/p" ' \
+        '-e "/SKIP:/p" ' \
+        '-e "/PASS:/p" ' \
+        '-e "/FAIL:/p" ' \
+        '-e "/ERROR:/p" '
+
+REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
+REQUIRED_PACKAGES += library/desktop/gobject/gobject-introspection
+REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += library/libsoup
+REQUIRED_PACKAGES += library/libxml2
diff -r 7a67a08c24cb -r b1580ab0bb5a components/gnome/rest/patches/01-studio.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/rest/patches/01-studio.patch	Thu Jun 09 22:29:15 2016 -0700
@@ -0,0 +1,28 @@
+Removes gcc-specific flag usage.
+
+configure should detect if -Wall is supported and then set an appropriate
+flags variable for use in the Makefiles.
+
+XXX file upstream bug
+--- rest-0.7.93/rest/Makefile.am	Wed Sep  3 05:01:16 2014
++++ rest-0.7.93/rest/Makefile.am	Tue May 12 18:02:56 2015
+@@ -49,7 +49,7 @@
+ librest_@API_VERSION@_la_CFLAGS = $(GLIB_CFLAGS) $(GTHREAD_CFLAGS) \
+ 		    $(SOUP_CFLAGS) $(SOUP_GNOME_CFLAGS) \
+ 		    $(XML_CFLAGS) $(GCOV_CFLAGS) \
+-		    -I$(top_srcdir) -Wall -DG_LOG_DOMAIN=\"Rest\"
++		    -I$(top_srcdir) -DG_LOG_DOMAIN=\"Rest\"
+ librest_@API_VERSION@_la_LDFLAGS = -no-undefined
+ librest_@API_VERSION@_la_LIBADD = $(GLIB_LIBS) $(GTHREAD_LIBS) \
+                     $(SOUP_LIBS) $(SOUP_GNOME_LIBS) $(XML_LIBS) \
+--- rest-0.7.93/rest-extras/Makefile.am	Wed Sep  3 05:01:16 2014
++++ rest-0.7.93/rest-extras/Makefile.am	Tue May 12 18:02:53 2015
+@@ -21,7 +21,7 @@
+ librest_extras_@API_VERSION@_la_CFLAGS = $(GLIB_CFLAGS) $(GTHREAD_CFLAGS) \
+ 		    $(SOUP_CFLAGS) $(SOUP_GNOME_CFLAGS) \
+ 		    $(XML_CFLAGS) $(GCOV_CFLAGS) \
+-		    -I$(top_srcdir) -Wall -DG_LOG_DOMAIN=\"Rest\"
++		    -I$(top_srcdir) -DG_LOG_DOMAIN=\"Rest\"
+ librest_extras_@API_VERSION@_la_LIBADD = $(GLIB_LIBS) $(GTHREAD_LIBS) \
+                     $(SOUP_LIBS) $(SOUP_GNOME_LIBS) $(XML_LIBS) \
+ 		    $(GCOV_LDFLAGS) \
diff -r 7a67a08c24cb -r b1580ab0bb5a components/gnome/rest/rest.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/rest/rest.p5m	Thu Jun 09 22:29:15 2016 -0700
@@ -0,0 +1,81 @@
+#
+# 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.
+#
+
+<transform file path=usr.*/man/.+ -> \
+    default mangler.man.stability "pass-through volatile">
+set name=pkg.fmri \
+    value=pkg:/library/desktop/librest@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="A library designed to make it easier to access web services that claim to be 'RESTful'"
+set name=com.oracle.info.description value=librest
+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/370
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/include/rest-0.7/rest-extras/flickr-proxy-call.h
+file path=usr/include/rest-0.7/rest-extras/flickr-proxy.h
+file path=usr/include/rest-0.7/rest-extras/lastfm-proxy-call.h
+file path=usr/include/rest-0.7/rest-extras/lastfm-proxy.h
+file path=usr/include/rest-0.7/rest-extras/youtube-proxy.h
+file path=usr/include/rest-0.7/rest/oauth-proxy-call.h
+file path=usr/include/rest-0.7/rest/oauth-proxy.h
+file path=usr/include/rest-0.7/rest/oauth2-proxy-call.h
+file path=usr/include/rest-0.7/rest/oauth2-proxy.h
+file path=usr/include/rest-0.7/rest/rest-enum-types.h
+file path=usr/include/rest-0.7/rest/rest-param.h
+file path=usr/include/rest-0.7/rest/rest-params.h
+file path=usr/include/rest-0.7/rest/rest-proxy-auth.h
+file path=usr/include/rest-0.7/rest/rest-proxy-call.h
+file path=usr/include/rest-0.7/rest/rest-proxy.h
+file path=usr/include/rest-0.7/rest/rest-xml-node.h
+file path=usr/include/rest-0.7/rest/rest-xml-parser.h
+file path=usr/lib/$(MACH64)/girepository-1.0/Rest-0.7.typelib
+file path=usr/lib/$(MACH64)/girepository-1.0/RestExtras-0.7.typelib
+link path=usr/lib/$(MACH64)/librest-0.7.so target=librest-0.7.so.0.0.0
+link path=usr/lib/$(MACH64)/librest-0.7.so.0 target=librest-0.7.so.0.0.0
+file path=usr/lib/$(MACH64)/librest-0.7.so.0.0.0
+link path=usr/lib/$(MACH64)/librest-extras-0.7.so \
+    target=librest-extras-0.7.so.0.0.0
+link path=usr/lib/$(MACH64)/librest-extras-0.7.so.0 \
+    target=librest-extras-0.7.so.0.0.0
+file path=usr/lib/$(MACH64)/librest-extras-0.7.so.0.0.0
+file path=usr/lib/$(MACH64)/pkgconfig/rest-0.7.pc
+file path=usr/lib/$(MACH64)/pkgconfig/rest-extras-0.7.pc
+file path=usr/lib/girepository-1.0/Rest-0.7.typelib
+file path=usr/lib/girepository-1.0/RestExtras-0.7.typelib
+link path=usr/lib/librest-0.7.so target=librest-0.7.so.0.0.0
+link path=usr/lib/librest-0.7.so.0 target=librest-0.7.so.0.0.0
+file path=usr/lib/librest-0.7.so.0.0.0
+link path=usr/lib/librest-extras-0.7.so target=librest-extras-0.7.so.0.0.0
+link path=usr/lib/librest-extras-0.7.so.0 target=librest-extras-0.7.so.0.0.0
+file path=usr/lib/librest-extras-0.7.so.0.0.0
+file path=usr/lib/pkgconfig/rest-0.7.pc
+file path=usr/lib/pkgconfig/rest-extras-0.7.pc
+file path=usr/share/gir-1.0/Rest-0.7.gir
+file path=usr/share/gir-1.0/RestExtras-0.7.gir
+license COPYING license=LGPLv2.1