Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
23169671 Move libcroco to Userland and update to 0.6.8
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Mon, 25 Apr 2016 23:38:13 -0700
changeset 5896 f6a52b8a207c
parent 5895 742f50b07db0
child 5897 495a9e2444e4
23169671 Move libcroco to Userland and update to 0.6.8
components/gnome/libcroco/Makefile file | annotate | diff | comparison | revisions
components/gnome/libcroco/libcroco.p5m file | annotate | diff | comparison | revisions
components/gnome/libcroco/patches/01-studio.patch file | annotate | diff | comparison | revisions
components/gnome/libcroco/test/results-all.master file | annotate | diff | comparison | revisions
components/meta-packages/incorporation-cache file | annotate | diff | comparison | revisions 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/libcroco/Makefile	Mon Apr 25 23:38:13 2016 -0700
@@ -0,0 +1,55 @@
+#
+# 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.
+#
+
+BUILD_BITS =		32_and_64
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		libcroco
+COMPONENT_VERSION=	0.6.8
+COMPONENT_PROJECT_URL=	https://wiki.gnome.org/Projects/Libcroco
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:ea6e1b858c55219cefd7109756bff5bc1a774ba7a55f7d3ccd734d6b871b8570
+
+TPNO=			24633
+
+include $(WS_MAKE_RULES)/gnome-component.mk
+
+# Needed because of patch to configure.in.
+COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fiv);
+
+# Actually, -Bsymbolic-functions; the option is misnamed -- Solaris linker
+# doesn't support -Bsymbolic-functions currently.
+CONFIGURE_OPTIONS += --disable-Bsymbolic
+CONFIGURE_OPTIONS += --disable-static
+
+# Needed to make tests work
+COMPONENT_TEST_ENV += PATH="$(GNUBIN):$(PATH)"
+COMPONENT_TEST_TARGETS = test
+COMPONENT_TEST_TRANSFORMS += '-e "/^removing tests/d"'
+COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
+
+REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
+REQUIRED_PACKAGES += library/libxml2
+REQUIRED_PACKAGES += library/glib2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/libcroco/libcroco.p5m	Mon Apr 25 23:38:13 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) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/library/libcroco@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="A library that provides CSS parsing and manipulation"
+set name=pkg.description \
+    value="Libcroco is a general CSS parsing and manipulation library written in C for the GNOME project. It provides a CSS2 parser (SAC and CSSOM API), and a CSS2 selection engine."
+set name=com.oracle.info.description value=libcroco
+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/2010/143
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+file path=usr/bin/$(MACH64)/croco-0.6-config
+file path=usr/bin/croco-0.6-config
+file usr/bin/$(MACH64)/csslint-0.6 path=usr/bin/csslint-0.6
+file path=usr/include/libcroco-0.6/libcroco/cr-additional-sel.h
+file path=usr/include/libcroco-0.6/libcroco/cr-attr-sel.h
+file path=usr/include/libcroco-0.6/libcroco/cr-cascade.h
+file path=usr/include/libcroco-0.6/libcroco/cr-declaration.h
+file path=usr/include/libcroco-0.6/libcroco/cr-doc-handler.h
+file path=usr/include/libcroco-0.6/libcroco/cr-enc-handler.h
+file path=usr/include/libcroco-0.6/libcroco/cr-fonts.h
+file path=usr/include/libcroco-0.6/libcroco/cr-input.h
+file path=usr/include/libcroco-0.6/libcroco/cr-num.h
+file path=usr/include/libcroco-0.6/libcroco/cr-om-parser.h
+file path=usr/include/libcroco-0.6/libcroco/cr-parser.h
+file path=usr/include/libcroco-0.6/libcroco/cr-parsing-location.h
+file path=usr/include/libcroco-0.6/libcroco/cr-prop-list.h
+file path=usr/include/libcroco-0.6/libcroco/cr-pseudo.h
+file path=usr/include/libcroco-0.6/libcroco/cr-rgb.h
+file path=usr/include/libcroco-0.6/libcroco/cr-sel-eng.h
+file path=usr/include/libcroco-0.6/libcroco/cr-selector.h
+file path=usr/include/libcroco-0.6/libcroco/cr-simple-sel.h
+file path=usr/include/libcroco-0.6/libcroco/cr-statement.h
+file path=usr/include/libcroco-0.6/libcroco/cr-string.h
+file path=usr/include/libcroco-0.6/libcroco/cr-style.h
+file path=usr/include/libcroco-0.6/libcroco/cr-stylesheet.h
+file path=usr/include/libcroco-0.6/libcroco/cr-term.h
+file path=usr/include/libcroco-0.6/libcroco/cr-tknzr.h
+file path=usr/include/libcroco-0.6/libcroco/cr-token.h
+file path=usr/include/libcroco-0.6/libcroco/cr-utils.h
+file path=usr/include/libcroco-0.6/libcroco/libcroco-config.h
+file path=usr/include/libcroco-0.6/libcroco/libcroco.h
+link path=usr/lib/$(MACH64)/libcroco-0.6.so target=libcroco-0.6.so.3.0.1
+link path=usr/lib/$(MACH64)/libcroco-0.6.so.3 target=libcroco-0.6.so.3.0.1
+file path=usr/lib/$(MACH64)/libcroco-0.6.so.3.0.1
+file path=usr/lib/$(MACH64)/pkgconfig/libcroco-0.6.pc
+link path=usr/lib/libcroco-0.6.so target=libcroco-0.6.so.3.0.1
+link path=usr/lib/libcroco-0.6.so.3 target=libcroco-0.6.so.3.0.1
+file path=usr/lib/libcroco-0.6.so.3.0.1
+file path=usr/lib/pkgconfig/libcroco-0.6.pc
+license COPYING license=LGPLv2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/libcroco/patches/01-studio.patch	Mon Apr 25 23:38:13 2016 -0700
@@ -0,0 +1,15 @@
+Build failure without removal of this flag.
+
+Needs investigation before filing upstream bug; may be Solaris-specific issue.
+
+--- libcroco-0.6.8/configure.in	2012-10-15 15:55:43.000000000 -0700
++++ libcroco-0.6.8/configure.in	2015-05-22 16:54:40.646534907 -0700
+@@ -133,7 +133,7 @@
+   -Wstrict-aliasing=2 -Winit-self -Wunsafe-loop-optimizations \
+   -Wdeclaration-after-statement -Wold-style-definition \
+   -Wno-missing-field-initializers -Wno-unused-parameter \
+-  -fno-common -Wno-switch-enum])
++  -Wno-switch-enum])
+ 
+ ##########################################
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/libcroco/test/results-all.master	Mon Apr 25 23:38:13 2016 -0700
@@ -0,0 +1,116 @@
+make[1]: Entering directory '$(@D)'
+/usr/gnu/bin/make  all-recursive
+make[2]: Entering directory '$(@D)'
+Making all in src
+make[3]: Entering directory '$(@D)/src'
+make[3]: Nothing to be done for 'all'.
+make[3]: Leaving directory '$(@D)/src'
+Making all in csslint
+make[3]: Entering directory '$(@D)/csslint'
+make[3]: Nothing to be done for 'all'.
+make[3]: Leaving directory '$(@D)/csslint'
+Making all in docs
+make[3]: Entering directory '$(@D)/docs'
+Making all in examples
+make[4]: Entering directory '$(@D)/docs/examples'
+make[4]: Nothing to be done for 'all'.
+make[4]: Leaving directory '$(@D)/docs/examples'
+Making all in reference
+make[4]: Entering directory '$(@D)/docs/reference'
+make[4]: Nothing to be done for 'all'.
+make[4]: Leaving directory '$(@D)/docs/reference'
+make[4]: Entering directory '$(@D)/docs'
+make[4]: Nothing to be done for 'all-am'.
+make[4]: Leaving directory '$(@D)/docs'
+make[3]: Leaving directory '$(@D)/docs'
+Making all in tests
+make[3]: Entering directory '$(@D)/tests'
+Making all in test-inputs
+make[4]: Entering directory '$(@D)/tests/test-inputs'
+make[4]: Nothing to be done for 'all'.
+make[4]: Leaving directory '$(@D)/tests/test-inputs'
+Making all in test-output-refs
+make[4]: Entering directory '$(@D)/tests/test-output-refs'
+make[4]: Nothing to be done for 'all'.
+make[4]: Leaving directory '$(@D)/tests/test-output-refs'
+make[4]: Entering directory '$(@D)/tests'
+make[4]: Nothing to be done for 'all-am'.
+make[4]: Leaving directory '$(@D)/tests'
+make[3]: Leaving directory '$(@D)/tests'
+Making all in build
+make[3]: Entering directory '$(@D)/build'
+Making all in win32
+make[4]: Entering directory '$(@D)/build/win32'
+Making all in vs9
+make[5]: Entering directory '$(@D)/build/win32/vs9'
+make[5]: Nothing to be done for 'all'.
+make[5]: Leaving directory '$(@D)/build/win32/vs9'
+Making all in vs10
+make[5]: Entering directory '$(@D)/build/win32/vs10'
+make[5]: Nothing to be done for 'all'.
+make[5]: Leaving directory '$(@D)/build/win32/vs10'
+make[5]: Entering directory '$(@D)/build/win32'
+make[5]: Nothing to be done for 'all-am'.
+make[5]: Leaving directory '$(@D)/build/win32'
+make[4]: Leaving directory '$(@D)/build/win32'
+make[4]: Entering directory '$(@D)/build'
+make[4]: Nothing to be done for 'all-am'.
+make[4]: Leaving directory '$(@D)/build'
+make[3]: Leaving directory '$(@D)/build'
+make[3]: Entering directory '$(@D)'
+make[3]: Leaving directory '$(@D)'
+make[2]: Leaving directory '$(@D)'
+if test -x $(SOURCE_DIR)/tests/testctl ; then $(SOURCE_DIR)/tests/testctl cleanup ; $(SOURCE_DIR)/tests/testctl run ; fi 
+REMAINING_ARGS=cleanup
+REMAINING_ARGS=run
+cur_arg=
+run test: test-prop-ident.sh
+run test: test-several-media.sh
+run test: test-unknown-at-rule.sh
+run test: test-unknown-at-rule2.sh
+run test: test0
+run test: test1
+run test: test2
+run test: test3
+run test: test4
+run test: test5
+run test: test6
+creating tmp directory tests/test-outputs ...
+done
+executing  test-prop-ident.sh  > tests/test-outputs/test-prop-ident.sh.out ...
+$(SOURCE_DIR)/tests/test-prop-ident.sh[3]: .: global-test-vars.sh: cannot open [No such file or directory]
+done
+executing  test-several-media.sh  > tests/test-outputs/test-several-media.sh.out ...
+$(SOURCE_DIR)/tests/test-several-media.sh[3]: .: global-test-vars.sh: cannot open [No such file or directory]
+done
+executing  test-unknown-at-rule.sh  > tests/test-outputs/test-unknown-at-rule.sh.out ...
+done
+executing  test-unknown-at-rule2.sh  > tests/test-outputs/test-unknown-at-rule2.sh.out ...
+done
+executing  test0 $(SOURCE_DIR)/tests/test-inputs/test0.1.css > tests/test-outputs/test0.1.css.out ...
+done
+executing  test1 $(SOURCE_DIR)/tests/test-inputs/test1.css > tests/test-outputs/test1.css.out ...
+done
+executing  test2 $(SOURCE_DIR)/tests/test-inputs/test2.1.css > tests/test-outputs/test2.1.css.out ...
+done
+executing  test2 $(SOURCE_DIR)/tests/test-inputs/test2.2.css > tests/test-outputs/test2.2.css.out ...
+done
+executing  test2 $(SOURCE_DIR)/tests/test-inputs/test2.css > tests/test-outputs/test2.css.out ...
+done
+executing  test3 $(SOURCE_DIR)/tests/test-inputs/test3.1.css > tests/test-outputs/test3.1.css.out ...
+done
+executing  test3 $(SOURCE_DIR)/tests/test-inputs/test3.2.css > tests/test-outputs/test3.2.css.out ...
+done
+executing  test3 $(SOURCE_DIR)/tests/test-inputs/test3.css > tests/test-outputs/test3.css.out ...
+done
+executing  test4 $(SOURCE_DIR)/tests/test-inputs/test4.1.css > tests/test-outputs/test4.1.css.out ...
+done
+executing  test4 $(SOURCE_DIR)/tests/test-inputs/test4.2.css > tests/test-outputs/test4.2.css.out ...
+done
+executing  test5 $(SOURCE_DIR)/tests/test-inputs/test5.1.css > tests/test-outputs/test5.1.css.out ...
+done
+executing  test6  > tests/test-outputs/test6.out ...
+done
+SOME TESTS ARE KO :(
+See tests/tests-error.log to see what's going on
+make[1]: Leaving directory '$(@D)'
--- a/components/meta-packages/incorporation-cache	Sun Apr 24 19:27:51 2016 -0700
+++ b/components/meta-packages/incorporation-cache	Mon Apr 25 23:38:13 2016 -0700
@@ -183,7 +183,6 @@
 consolidation/userland/userland-incorporation:library/desktop/[email protected]
 consolidation/userland/userland-incorporation:library/[email protected]
 consolidation/userland/userland-incorporation:library/[email protected]
-consolidation/userland/userland-incorporation:library/[email protected]
 consolidation/userland/userland-incorporation:library/[email protected]
 consolidation/userland/userland-incorporation:library/[email protected]
 consolidation/userland/userland-incorporation:library/[email protected]
upstream/oracle/userland-gate