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.
23170558 Move pango to Userland and update to 1.38.0
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Fri, 06 May 2016 13:30:51 -0700
changeset 5943 c081bc16736d
parent 5942 31e5d1792d2f
child 5944 885ee1b94ac0
23170558 Move pango to Userland and update to 1.38.0 PSARC/2016/259 pango 1.38.0
components/gnome/pango/Makefile file | annotate | diff | comparison | revisions
components/gnome/pango/files/libpango-1.0.3.3lib file | annotate | diff | comparison | revisions
components/gnome/pango/files/libpangocairo-1.0.3.3lib file | annotate | diff | comparison | revisions
components/gnome/pango/files/libpangoft2-1.0.3.3lib file | annotate | diff | comparison | revisions
components/gnome/pango/files/libpangoxft-1.0.3.3lib file | annotate | diff | comparison | revisions
components/gnome/pango/pango.p5m file | annotate | diff | comparison | revisions
components/gnome/pango/patches/01-check.defs-test.patch file | annotate | diff | comparison | revisions
components/gnome/pango/test/results-all.master file | annotate | diff | comparison | revisions 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/pango/Makefile	Fri May 06 13:30:51 2016 -0700
@@ -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) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+# All components using gobject-introspection must be built with gcc as
+# gobject-introspection does not produce correct results when using Studio.
+COMPILER =		gcc
+BUILD_BITS =		64_and_32
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		pango
+COMPONENT_VERSION=	1.38.0
+COMPONENT_PROJECT_URL=	http://www.pango.org/
+COMPONENT_ARCHIVE_HASH= \
+    sha256:1d4e75974bad853ee9ac5fc5caee5e7ab235abbd945d51d01f3806e04e7c226c
+COMPONENT_BUGDB=	gnome/pango
+
+TPNO=			24871
+
+include $(WS_MAKE_RULES)/gnome-component.mk
+
+CONFIGURE_OPTIONS += --enable-gtk-doc
+# Required for other components.
+CONFIGURE_OPTIONS += --enable-introspection
+
+# Workaround for build failures due to pango Makefiles not passing CFLAGS or
+# LDFLAGS, especially the -m32/64 flag, to g-ir-scanner
+COMPONENT_BUILD_ENV += CFLAGS="$(strip $(CFLAGS))"
+COMPONENT_BUILD_ENV += LDFLAGS="$(strip $(LDFLAGS))"
+
+# Needed for "gmake test" to work successfully.
+unexport SHELLOPTS
+COMPONENT_TEST_ARGS += -k
+
+# Standard automake test framework results transform
+COMPONENT_TEST_TRANSFORMS += \
+        '-n ' \
+        '-e "/TOTAL/p" ' \
+        '-e "/SKIP/p" ' \
+        '-e "/PASS/p" ' \
+        '-e "/FAIL/p" ' \
+        '-e "/ERROR/p" '
+
+COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
+
+REQUIRED_PACKAGES += library/desktop/cairo
+REQUIRED_PACKAGES += library/desktop/gobject/gobject-introspection
+REQUIRED_PACKAGES += library/desktop/harfbuzz
+REQUIRED_PACKAGES += library/glib2
+# Needs fontconfig version >= 2.10.91
+REQUIRED_PACKAGES += system/library/fontconfig
+REQUIRED_PACKAGES += system/library/freetype-2
+REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += x11/library/libxft
+REQUIRED_PACKAGES += x11/library/libx11
+REQUIRED_PACKAGES += x11/library/libxrender
+REQUIRED_PACKAGES += x11/server/xorg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/pango/files/libpango-1.0.3.3lib	Fri May 06 13:30:51 2016 -0700
@@ -0,0 +1,30 @@
+.TH libpango-1\&.0 3lib "28 Dec 2015"
+.SH "NAME"
+libpango-1\&.0, libpangoft2-1\&.0, libpangoxft-1\&.0, libpangocairo-1\&.0 \- layout and rendering of internationalized text with FreeType2, Xft, and Cairo support
+.SH "DESCRIPTION"
+.PP
+Pango provides a framework for the layout and rendering of internationalized
+text\&. The name is derived from the Greek "Pan" which means "All", and the
+Japanese "Go" which means "Language"\&.
+.SH "FILES"
+.TP 30
+.B /usr/lib/libpango-1\&.0\&.so
+Internationalization shared library
+.TP 30
+.B /usr/lib/libpangocairo-1\&.0\&.so
+Pango Cairo rendering backend shared library
+.TP 30
+.B /usr/lib/libpangoft2-1\&.0\&.so
+FreeType2 font and rendering backend for Pango shared library
+.TP 30
+.B /usr/lib/libpangoxft2-1\&.0\&.so
+Font handling and rendering with the Xft backend for Pango shared library
+.TP 30
+.B /usr/share/gtk-doc/html/pango
+Location of developer documentation
+.SH "SEE ALSO"
+.PP
+.BR Xft (3)
+.BR libcairo (3lib),
+.BR attributes (7),
+.BR gnome-interfaces (7).
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/pango/files/libpangocairo-1.0.3.3lib	Fri May 06 13:30:51 2016 -0700
@@ -0,0 +1,1 @@
+.so man3lib/libpango-1.0.3lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/pango/files/libpangoft2-1.0.3.3lib	Fri May 06 13:30:51 2016 -0700
@@ -0,0 +1,1 @@
+.so man3lib/libpango-1.0.3lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/pango/files/libpangoxft-1.0.3.3lib	Fri May 06 13:30:51 2016 -0700
@@ -0,0 +1,1 @@
+.so man3lib/libpango-1.0.3lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/pango/pango.p5m	Fri May 06 13:30:51 2016 -0700
@@ -0,0 +1,178 @@
+#
+# 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/desktop/pango@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Pango international text layout library"
+set name=pkg.description \
+    value="Pango is a library for laying out and rendering of text, with an emphasis on internationalization. Pango can be used anywhere that text layout is needed, though most of the work on Pango so far has been done in the context of the GTK+ widget toolkit. Pango forms the core of text and font handling for GTK+."
+set name=com.oracle.info.description value=pango
+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/259
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+file path=usr/bin/pango-view
+file path=usr/include/pango-1.0/pango/pango-attributes.h
+file path=usr/include/pango-1.0/pango/pango-bidi-type.h
+file path=usr/include/pango-1.0/pango/pango-break.h
+file path=usr/include/pango-1.0/pango/pango-context.h
+file path=usr/include/pango-1.0/pango/pango-coverage.h
+file path=usr/include/pango-1.0/pango/pango-engine.h
+file path=usr/include/pango-1.0/pango/pango-enum-types.h
+file path=usr/include/pango-1.0/pango/pango-features.h
+file path=usr/include/pango-1.0/pango/pango-font.h
+file path=usr/include/pango-1.0/pango/pango-fontmap.h
+file path=usr/include/pango-1.0/pango/pango-fontset.h
+file path=usr/include/pango-1.0/pango/pango-glyph-item.h
+file path=usr/include/pango-1.0/pango/pango-glyph.h
+file path=usr/include/pango-1.0/pango/pango-gravity.h
+file path=usr/include/pango-1.0/pango/pango-item.h
+file path=usr/include/pango-1.0/pango/pango-language.h
+file path=usr/include/pango-1.0/pango/pango-layout.h
+file path=usr/include/pango-1.0/pango/pango-matrix.h
+file path=usr/include/pango-1.0/pango/pango-modules.h
+file path=usr/include/pango-1.0/pango/pango-ot.h
+file path=usr/include/pango-1.0/pango/pango-renderer.h
+file path=usr/include/pango-1.0/pango/pango-script.h
+file path=usr/include/pango-1.0/pango/pango-tabs.h
+file path=usr/include/pango-1.0/pango/pango-types.h
+file path=usr/include/pango-1.0/pango/pango-utils.h
+file path=usr/include/pango-1.0/pango/pango.h
+file path=usr/include/pango-1.0/pango/pangocairo.h
+file path=usr/include/pango-1.0/pango/pangofc-decoder.h
+file path=usr/include/pango-1.0/pango/pangofc-font.h
+file path=usr/include/pango-1.0/pango/pangofc-fontmap.h
+file path=usr/include/pango-1.0/pango/pangoft2.h
+file path=usr/include/pango-1.0/pango/pangoxft-render.h
+file path=usr/include/pango-1.0/pango/pangoxft.h
+file path=usr/lib/$(MACH64)/girepository-1.0/Pango-1.0.typelib
+file path=usr/lib/$(MACH64)/girepository-1.0/PangoCairo-1.0.typelib
+file path=usr/lib/$(MACH64)/girepository-1.0/PangoFT2-1.0.typelib
+file path=usr/lib/$(MACH64)/girepository-1.0/PangoXft-1.0.typelib
+link path=usr/lib/$(MACH64)/libpango-1.0.so target=libpango-1.0.so.0.3800.0
+link path=usr/lib/$(MACH64)/libpango-1.0.so.0 target=libpango-1.0.so.0.3800.0
+file path=usr/lib/$(MACH64)/libpango-1.0.so.0.3800.0
+link path=usr/lib/$(MACH64)/libpangocairo-1.0.so \
+    target=libpangocairo-1.0.so.0.3800.0
+link path=usr/lib/$(MACH64)/libpangocairo-1.0.so.0 \
+    target=libpangocairo-1.0.so.0.3800.0
+file path=usr/lib/$(MACH64)/libpangocairo-1.0.so.0.3800.0
+link path=usr/lib/$(MACH64)/libpangoft2-1.0.so \
+    target=libpangoft2-1.0.so.0.3800.0
+link path=usr/lib/$(MACH64)/libpangoft2-1.0.so.0 \
+    target=libpangoft2-1.0.so.0.3800.0
+file path=usr/lib/$(MACH64)/libpangoft2-1.0.so.0.3800.0
+link path=usr/lib/$(MACH64)/libpangox-1.0.so.0 target=libpangoxft-1.0.so.0
+link path=usr/lib/$(MACH64)/libpangoxft-1.0.so \
+    target=libpangoxft-1.0.so.0.3800.0
+link path=usr/lib/$(MACH64)/libpangoxft-1.0.so.0 \
+    target=libpangoxft-1.0.so.0.3800.0
+file path=usr/lib/$(MACH64)/libpangoxft-1.0.so.0.3800.0
+file path=usr/lib/$(MACH64)/pkgconfig/pango.pc
+file path=usr/lib/$(MACH64)/pkgconfig/pangocairo.pc
+file path=usr/lib/$(MACH64)/pkgconfig/pangoft2.pc
+file path=usr/lib/$(MACH64)/pkgconfig/pangoxft.pc
+file path=usr/lib/girepository-1.0/Pango-1.0.typelib
+file path=usr/lib/girepository-1.0/PangoCairo-1.0.typelib
+file path=usr/lib/girepository-1.0/PangoFT2-1.0.typelib
+file path=usr/lib/girepository-1.0/PangoXft-1.0.typelib
+link path=usr/lib/libpango-1.0.so target=libpango-1.0.so.0.3800.0
+link path=usr/lib/libpango-1.0.so.0 target=libpango-1.0.so.0.3800.0
+file path=usr/lib/libpango-1.0.so.0.3800.0
+link path=usr/lib/libpangocairo-1.0.so target=libpangocairo-1.0.so.0.3800.0
+link path=usr/lib/libpangocairo-1.0.so.0 target=libpangocairo-1.0.so.0.3800.0
+file path=usr/lib/libpangocairo-1.0.so.0.3800.0
+link path=usr/lib/libpangoft2-1.0.so target=libpangoft2-1.0.so.0.3800.0
+link path=usr/lib/libpangoft2-1.0.so.0 target=libpangoft2-1.0.so.0.3800.0
+file path=usr/lib/libpangoft2-1.0.so.0.3800.0
+link path=usr/lib/libpangox-1.0.so.0 target=libpangoxft-1.0.so
+link path=usr/lib/libpangoxft-1.0.so target=libpangoxft-1.0.so.0.3800.0
+link path=usr/lib/libpangoxft-1.0.so.0 target=libpangoxft-1.0.so.0.3800.0
+file path=usr/lib/libpangoxft-1.0.so.0.3800.0
+file path=usr/lib/pkgconfig/pango.pc
+file path=usr/lib/pkgconfig/pangocairo.pc
+file path=usr/lib/pkgconfig/pangoft2.pc
+file path=usr/lib/pkgconfig/pangoxft.pc
+file path=usr/share/gir-1.0/Pango-1.0.gir
+file path=usr/share/gir-1.0/PangoCairo-1.0.gir
+file path=usr/share/gir-1.0/PangoFT2-1.0.gir
+file path=usr/share/gir-1.0/PangoXft-1.0.gir
+file path=usr/share/gtk-doc/html/pango/PangoEngineLang.html
+file path=usr/share/gtk-doc/html/pango/PangoEngineShape.html
+file path=usr/share/gtk-doc/html/pango/PangoFcDecoder.html
+file path=usr/share/gtk-doc/html/pango/PangoFcFont.html
+file path=usr/share/gtk-doc/html/pango/PangoFcFontMap.html
+file path=usr/share/gtk-doc/html/pango/PangoMarkupFormat.html
+file path=usr/share/gtk-doc/html/pango/api-index-full.html
+file path=usr/share/gtk-doc/html/pango/home.png
+file path=usr/share/gtk-doc/html/pango/index.html
+file path=usr/share/gtk-doc/html/pango/index.sgml
+file path=usr/share/gtk-doc/html/pango/layout.gif
+file path=usr/share/gtk-doc/html/pango/left.png
+file path=usr/share/gtk-doc/html/pango/lowlevel.html
+file path=usr/share/gtk-doc/html/pango/pango-Bidirectional-Text.html
+file path=usr/share/gtk-doc/html/pango/pango-Cairo-Rendering.html
+file path=usr/share/gtk-doc/html/pango/pango-CoreText-Fonts.html
+file path=usr/share/gtk-doc/html/pango/pango-Coverage-Maps.html
+file path=usr/share/gtk-doc/html/pango/pango-Engines.html
+file path=usr/share/gtk-doc/html/pango/pango-Fonts.html
+file path=usr/share/gtk-doc/html/pango/pango-FreeType-Fonts-and-Rendering.html
+file path=usr/share/gtk-doc/html/pango/pango-Glyph-Storage.html
+file path=usr/share/gtk-doc/html/pango/pango-Layout-Objects.html
+file path=usr/share/gtk-doc/html/pango/pango-Miscellaneous-Utilities.html
+file path=usr/share/gtk-doc/html/pango/pango-Modules.html
+file path=usr/share/gtk-doc/html/pango/pango-OpenType-Font-Handling.html
+file path=usr/share/gtk-doc/html/pango/pango-Scripts-and-Languages.html
+file path=usr/share/gtk-doc/html/pango/pango-Tab-Stops.html
+file path=usr/share/gtk-doc/html/pango/pango-Text-Attributes.html
+file path=usr/share/gtk-doc/html/pango/pango-Text-Processing.html
+file path=usr/share/gtk-doc/html/pango/pango-Version-Checking.html
+file path=usr/share/gtk-doc/html/pango/pango-Vertical-Text.html
+file path=usr/share/gtk-doc/html/pango/pango-Win32-Fonts-and-Rendering.html
+file path=usr/share/gtk-doc/html/pango/pango-Xft-Fonts-and-Rendering.html
+file path=usr/share/gtk-doc/html/pango/pango-hierarchy.html
+file path=usr/share/gtk-doc/html/pango/pango-pango-renderer.html
+file path=usr/share/gtk-doc/html/pango/pango.devhelp2
+file path=usr/share/gtk-doc/html/pango/pango.html
+file path=usr/share/gtk-doc/html/pango/rendering.html
+file path=usr/share/gtk-doc/html/pango/right.png
+file path=usr/share/gtk-doc/html/pango/rotated-text.png
+file path=usr/share/gtk-doc/html/pango/style.css
+file path=usr/share/gtk-doc/html/pango/up.png
+file path=usr/share/man/man1/pango-view.1
+file files/libpango-1.0.3.3lib path=usr/share/man/man3lib/libpango-1.0.3.3lib
+file files/libpangocairo-1.0.3.3lib \
+    path=usr/share/man/man3lib/libpangocairo-1.0.3.3lib
+file files/libpangoft2-1.0.3.3lib \
+    path=usr/share/man/man3lib/libpangoft2-1.0.3.3lib
+file files/libpangoxft-1.0.3.3lib \
+    path=usr/share/man/man3lib/libpangoxft-1.0.3.3lib
+license COPYING license=LGPLv2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/pango/patches/01-check.defs-test.patch	Fri May 06 13:30:51 2016 -0700
@@ -0,0 +1,25 @@
+Fixes check.defs test for symbol exports to work on Solaris.
+
+The default nm check doesn't work with Solaris nm, but expects the default
+output format from BSD/GNU nm instead.   Switching it to use /usr/gnu/bin/nm
+still fails, since it finds the unexpected symbols of _PROCEDURE_LINKAGE_TABLE_
+and _etext from other sections, so instead we use the Solaris elfdump much as
+Linux overrides with objdump.
+
+Need to submit upstream.
+
+--- pango-1.38.0/pango/check.defs	Wed Mar  5 20:33:55 2014
++++ pango-1.38.0/pango/check.defs	Thu Apr 28 18:32:45 2016
+@@ -7,8 +7,11 @@
+ status=0
+ 
+ get_pango_syms='nm "$so" | grep " T " | cut -d" " -f3'
+-if [ "`uname -s`" = "Linux" ]; then
++system="`uname -s`"
++if [ "$system" = "Linux" ]; then
+ 	get_pango_syms='objdump -t "$so" | sed -n "/.*g *F *\.\(opd\|text\).* \(.*pango_.*\)$/s//\2/p"'
++elif [ "$system" = "SunOS" ]; then
++	get_pango_syms='elfdump -s "$so" | sed -n "/.* FUNC GLOB .*\.text.* \(.*pango_.*\)$/s//\1/p"'
+ fi
+ 
+ for def in $srcdir/*.def; do
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/pango/test/results-all.master	Fri May 06 13:30:51 2016 -0700
@@ -0,0 +1,35 @@
+PASS: check.defs
+# TOTAL: 1
+# PASS:  1
+# SKIP:  0
+# XFAIL: 0
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0
+PASS: check.docs
+# TOTAL: 1
+# PASS:  1
+# SKIP:  0
+# XFAIL: 0
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0
+PASS: testboundaries
+PASS: testboundaries_ucd
+PASS: testcolor
+PASS: testscript
+PASS: markup-parse
+FAIL: test-layout
+PASS: test-font
+PASS: testattributes
+PASS: testiter
+PASS: test-pangocairo-threads
+PASS: test-ot-tags
+PASS: cxx-test
+# TOTAL: 12
+# PASS:  11
+# SKIP:  0
+# XFAIL: 0
+# FAIL:  1
+# XPASS: 0
+# ERROR: 0
upstream/oracle/userland-gate