Mercurial Mercurial > upstream > oracle > x-cons > x-s12-clone / 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.
24414531 Upgrade fontconfig to 2.12.1
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Thu, 11 Aug 2016 00:00:37 -0700
changeset 1652 3f159f60ac51
parent 1651 43c5382a5e1b
child 1653 9fcb30a2102b
24414531 Upgrade fontconfig to 2.12.1 24414604 problem in X11/FONT
open-src/lib/fontconfig/6770058.patch file | annotate | diff | comparison | revisions
open-src/lib/fontconfig/7058808.patch file | annotate | diff | comparison | revisions
open-src/lib/fontconfig/Makefile file | annotate | diff | comparison | revisions
open-src/lib/fontconfig/cjk-fonts.conf.patch file | annotate | diff | comparison | revisions
open-src/lib/fontconfig/fc-cache.sh file | annotate | diff | comparison | revisions
pkg/manifests/system-library-fontconfig.p5m file | annotate | diff | comparison | revisions
pkg/transforms/defaults file | annotate | diff | comparison | revisions 
--- a/open-src/lib/fontconfig/6770058.patch	Wed Aug 10 13:14:00 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-diff -urp -x '*~' -x '*.orig' src/fcmatch.c src/fcmatch.c
---- src/fcmatch.c	2010-05-10 15:15:11.983002021 -0700
-+++ src/fcmatch.c	2010-05-10 15:15:12.294147068 -0700
-@@ -731,6 +731,12 @@ FcFontSetSort (FcConfig	    *config,
- 	printf ("Sort ");
- 	FcPatternPrint (p);
-     }
-+    if (!config)
-+    {
-+        config = FcConfigGetCurrent ();
-+        if (!config)
-+            return 0;
-+    }
-     nnodes = 0;
-     for (set = 0; set < nsets; set++)
-     {
--- a/open-src/lib/fontconfig/7058808.patch	Wed Aug 10 13:14:00 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-CR 7058808 fc-match core dumps when no fonts are installed. FcFonSort interface returns Null.
-
---- fc-match/fc-match.c	Wed Jun 29 15:00:37 2011
-+++ fc-match/fc-match.c	Wed Jun 29 15:04:43 2011
-@@ -174,6 +174,12 @@
- 	FcFontSet	*font_patterns;
- 	int	j;
- 	font_patterns = FcFontSort (0, pat, all ? FcFalse : FcTrue, 0, &result);
-+	
-+	if (!font_patterns)
-+    	{
-+            fprintf (stderr, "Can't find any matching font\n");
-+            return 1;
-+    	}
- 
- 	for (j = 0; j < font_patterns->nfont; j++)
- 	{
--- a/open-src/lib/fontconfig/Makefile	Wed Aug 10 13:14:00 2016 -0700
+++ b/open-src/lib/fontconfig/Makefile	Thu Aug 11 00:00:37 2016 -0700
@@ -63,19 +63,15 @@
 UPSTREAM_SET	= yes
 GIT_URL		= $(FDO_GIT_URL)/fontconfig
 GIT_URL_SET	= yes
-ORACLE_TPNO	= 23955
+ORACLE_TPNO	= 30873
 
 # Version number (used in path names)
-MODULE_VERSION=2.11.94
+MODULE_VERSION=2.12.1
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 479be870c7f83f15f87bac085b61d641
-TARBALL_SHA1 = 3748d8a2b9cf8052dbd003f524d829157f1ead83
-TARBALL_SHA256 = 73f6d323c7bcfbde25d78397675191d55b8f4139132c6a9444410f3a2d8a9a95
-
-# Source tarball
-SOURCE_TARBALL_NAME=fontconfig-$(MODULE_VERSION).tar.gz
-SOURCE_TARBALL_NAME_SET=yes
+TARBALL_MD5  = b5af5a423ee3b5cfc34846838963c058
+TARBALL_SHA1 = 30d832b754fb10a3b70ebac750a38a0275438ad8
+TARBALL_SHA256 = b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3
 
 # Download site for source
 SOURCE_URL=http://fontconfig.org/release/$(SOURCE_TARBALL_NAME)
@@ -88,9 +84,7 @@
 		Makefile.am.0.patch \
 		bitmap-hacks.patch,-p1 \
 		6447517.patch,-p1 \
-		6770058.patch \
 		7026635.patch,-p1 \
-		7058808.patch \
 		font-links.patch
 
 # Library name (used for specfiles/mapfiles)
--- a/open-src/lib/fontconfig/cjk-fonts.conf.patch	Wed Aug 10 13:14:00 2016 -0700
+++ b/open-src/lib/fontconfig/cjk-fonts.conf.patch	Thu Aug 11 00:00:37 2016 -0700
@@ -1,6 +1,8 @@
---- a/conf.d/40-nonlatin.conf	Mon Jan 20 00:14:19 2014
-+++ b/conf.d/40-nonlatin.conf	Wed Jun 17 14:47:39 2015
-@@ -42,6 +42,50 @@
+diff --git a/conf.d/40-nonlatin.conf b/conf.d/40-nonlatin.conf
+index c900fd4..135dc57 100644
+--- a/conf.d/40-nonlatin.conf
++++ b/conf.d/40-nonlatin.conf
+@@ -42,6 +42,42 @@
  		<default><family>serif</family></default>
  	</alias>
  	<alias>
@@ -20,14 +22,6 @@
 +		<default><family>serif</family></default>
 +	</alias>
 +	<alias>
-+		<family>Sazanami Mincho</family>
-+		<default><family>serif</family></default>
-+	</alias>
-+	<alias>
-+		<family>Sazanami Gothic</family>
-+		<default><family>serif</family></default>
-+	</alias>
-+	<alias>
 +		<family>FZSongTi</family>
 +		<default><family>serif</family></default>
 +	</alias>
@@ -51,7 +45,7 @@
  		<family>Kochi Mincho</family>
  		<default><family>serif</family></default>
  	</alias>
-@@ -129,6 +173,42 @@
+@@ -129,6 +165,38 @@
  		<default><family>sans-serif</family></default>
  	</alias>
  	<alias>
@@ -71,10 +65,6 @@
 +		<default><family>sans-serif</family></default>
 +	</alias>
 +	<alias>
-+		<family>Sazanami Gothic</family>
-+		<default><family>sans-serif</family></default>
-+	</alias>
-+	<alias>
 +		<family>FZSongTi</family>
 +		<default><family>sans-serif</family></default>
 +	</alias>
@@ -94,7 +84,7 @@
  		<family>Kochi Gothic</family>
  		<default><family>sans-serif</family></default>
  	</alias>
-@@ -180,6 +260,10 @@
+@@ -180,6 +248,10 @@
    Monospace faces
   -->
  	<alias>
@@ -105,43 +95,47 @@
  		<family>NSimSun</family>
  		<default><family>monospace</family></default>
  	</alias>
---- a/conf.d/45-latin.conf	Wed Jun 17 14:57:49 2015
-+++ b/conf.g/45-latin.conf	Wed Jun 17 14:58:57 2015
-@@ -10,6 +10,10 @@
-   Serif faces
-  -->
+diff --git a/conf.d/45-latin.conf b/conf.d/45-latin.conf
+index 5228945..105ef75 100644
+--- a/conf.d/45-latin.conf
++++ b/conf.d/45-latin.conf
+@@ -42,6 +42,10 @@
+ 		<default><family>serif</family></default>
+ 	</alias>
  	<alias>
 +		<family>Lucida Bright</family>
 +		<default><family>serif</family></default>
 +	</alias>
 +	<alias>
- 		<family>Bitstream Vera Serif</family>
+ 		<family>Luxi Serif</family>
  		<default><family>serif</family></default>
  	</alias>
-@@ -65,6 +69,10 @@
-   Sans-serif faces
-  -->
+@@ -149,6 +153,10 @@
+ 		<default><family>sans-serif</family></default>
+ 	</alias>
  	<alias>
-+		<family>Lucida Sans Typewriter</family>
++		<family>Lucida Sans</family>
 +		<default><family>sans-serif</family></default>
 +	</alias>
 +	<alias>
- 		<family>Bitstream Vera Sans</family>
+ 		<family>Luxi Sans</family>
  		<default><family>sans-serif</family></default>
  	</alias>
-@@ -116,6 +124,10 @@
-   Monospace faces
-  -->
-  	<alias>
+@@ -216,6 +224,10 @@
+ 		<default><family>monospace</family></default>
+ 	</alias>
+ 	<alias>
 +		<family>Lucida Sans Typewriter</family>
 +		<default><family>monospace</family></default>
 +	</alias>
-+ 	<alias>
- 		<family>Bitstream Vera Sans Mono</family>
++	<alias>
+ 		<family>Luxi Mono</family>
  		<default><family>monospace</family></default>
  	</alias>
---- a/conf.d/65-nonlatin.conf	Wed Jun 17 14:59:41 2015
-+++ b/conf.d/65-nonlatin.conf	Thu Jun 18 08:54:54 2015
+diff --git a/conf.d/65-nonlatin.conf b/conf.d/65-nonlatin.conf
+index 9306f74..f726170 100644
+--- a/conf.d/65-nonlatin.conf
++++ b/conf.d/65-nonlatin.conf
 @@ -4,6 +4,7 @@
  	<alias>
  		<family>serif</family>
--- a/open-src/lib/fontconfig/fc-cache.sh	Wed Aug 10 13:14:00 2016 -0700
+++ b/open-src/lib/fontconfig/fc-cache.sh	Thu Aug 11 00:00:37 2016 -0700
@@ -1,6 +1,6 @@
 #!/bin/ksh93
 #
-# Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -82,6 +82,9 @@
     		exit $SMF_EXIT_ERR_FATAL ;;
 esac
 
+# Clean out obsolete cache-file versions - current version is *.cache-7
+/usr/bin/find /var/cache/fontconfig -name '*.cache-[2-6]' -exec /bin/rm \{\} \+
+
 # Run 32-bit & 64-bit cache builds in parallel
 /usr/bin/${ARCH32}/fc-cache $ARGS &
 pid32=$!
--- a/pkg/manifests/system-library-fontconfig.p5m	Wed Aug 10 13:14:00 2016 -0700
+++ b/pkg/manifests/system-library-fontconfig.p5m	Thu Aug 11 00:00:37 2016 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -27,6 +27,10 @@
 dir  path=etc/fonts
 dir  path=etc/fonts/conf.avail
 file path=etc/fonts/conf.avail/10-autohint.conf
+file path=etc/fonts/conf.avail/10-hinting-full.conf
+file path=etc/fonts/conf.avail/10-hinting-medium.conf
+file path=etc/fonts/conf.avail/10-hinting-none.conf
+file path=etc/fonts/conf.avail/10-hinting-slight.conf
 file path=etc/fonts/conf.avail/10-no-sub-pixel.conf
 file path=etc/fonts/conf.avail/10-scale-bitmap-fonts.conf
 file path=etc/fonts/conf.avail/10-sub-pixel-bgr.conf
@@ -59,6 +63,8 @@
 file path=etc/fonts/conf.avail/90-sun-prefer-bitmap.conf
 file path=etc/fonts/conf.avail/90-synthetic.conf
 dir  path=etc/fonts/conf.d
+link path=etc/fonts/conf.d/10-hinting-slight.conf \
+    target=../conf.avail/10-hinting-slight.conf
 link path=etc/fonts/conf.d/10-scale-bitmap-fonts.conf \
     target=../conf.avail/10-scale-bitmap-fonts.conf
 link path=etc/fonts/conf.d/20-indic.conf target=../conf.avail/20-indic.conf
--- a/pkg/transforms/defaults	Wed Aug 10 13:14:00 2016 -0700
+++ b/pkg/transforms/defaults	Thu Aug 11 00:00:37 2016 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -70,3 +70,10 @@
 # All files in kernel/ subdirs are reboot-needed.
 #
 <transform file path=.*kernel/.+ -> default reboot-needed true>
+
+#
+# All files in i86 & sparcv7 directories are intentionally 32-bit, so
+# tell pkglint not to worry about them.
+#
+<transform file path=usr/bin/$(ARCH32)/ -> \
+    default pkg.linted.pkglint.action014.1 True>
upstream/oracle/x-cons/x-s12-clone