18713330 CBE requirements per pteam -gcc 4.8, python 3.4, jdk 8 and prep for Studio 12.4
--- a/exception_lists/packaging Wed Jul 16 14:26:04 2014 -0700
+++ b/exception_lists/packaging Thu Jul 17 11:38:10 2014 -0700
@@ -73,12 +73,12 @@
usr/share/X11/xorg.conf.d/50-synaptics.conf i386
# Only need the normal *.pyc compiled byte-code, not the "optimized" *.pyo
-usr/lib/python2.6/vendor-packages/xcbgen/__init__.pyo
-usr/lib/python2.6/vendor-packages/xcbgen/error.pyo
-usr/lib/python2.6/vendor-packages/xcbgen/expr.pyo
-usr/lib/python2.6/vendor-packages/xcbgen/matcher.pyo
-usr/lib/python2.6/vendor-packages/xcbgen/state.pyo
-usr/lib/python2.6/vendor-packages/xcbgen/xtypes.pyo
+usr/lib/python3.4/vendor-packages/xcbgen/__init__.pyo
+usr/lib/python3.4/vendor-packages/xcbgen/error.pyo
+usr/lib/python3.4/vendor-packages/xcbgen/expr.pyo
+usr/lib/python3.4/vendor-packages/xcbgen/matcher.pyo
+usr/lib/python3.4/vendor-packages/xcbgen/state.pyo
+usr/lib/python3.4/vendor-packages/xcbgen/xtypes.pyo
# No need to deliver libchromeXvMC.so since it requires DRI which we don't build with
usr/lib/libchromeXvMC.so i386
--- a/open-src/common/Makefile.init Wed Jul 16 14:26:04 2014 -0700
+++ b/open-src/common/Makefile.init Thu Jul 17 11:38:10 2014 -0700
@@ -1,7 +1,7 @@
# -*- Makefile -*- rules commonly shared among X consolidation open source dirs
# Makefile.init has definitions that are needed before the module/modtype rules
#
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2014, 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"),
@@ -123,7 +123,7 @@
ARCH_LIB_FLAGS_i386_suncc =
## GNU Compilers
-GCC_VERSION = 4.7
+GCC_VERSION = 4.8
GCC = /usr/gcc/$(GCC_VERSION)/bin/gcc
GXX = /usr/gcc/$(GCC_VERSION)/bin/g++
CC_gcc = $(GCC)
@@ -184,8 +184,6 @@
ARCH64_FLAGS += $(ARCH_FLAGS_$(MACH)_$(MODULE_COMPILER))
ARCH_LIB_FLAGS = $(ARCH_LIB_FLAGS_$(MACH)_$(MODULE_COMPILER))
-CPPFLAGS = -D_REENTRANT
-
# Flags for specific binary types
LIB_CPPFLAGS = $(CPPFLAGS)
LIB_CFLAGS = $(CFLAGS) $(ARCH_LIB_FLAGS)
@@ -318,7 +316,7 @@
## Python tools & paths
# When changing PYTHON_VERSION, check that PYTHON_PKG_VERSION &
# PYTHON_PATH_VERSION are still set correctly in pkg/Makefile
-PYTHON_VERSION=2.6
+PYTHON_VERSION=3.4
PYTHON=/usr/bin/python$(PYTHON_VERSION)
PYTHON_PATH=$(PROTODIR)/usr/lib/python$(PYTHON_VERSION)/vendor-packages:$(PROTODIR)/usr/lib/python$(PYTHON_VERSION)/site-packages:/usr/lib/python$(PYTHON_VERSION)/vendor-packages:/usr/lib/python$(PYTHON_VERSION)/site-packages
# We want our python modules installed to vendor-packages, not site-packages
--- a/open-src/xserver/xvnc/Makefile Wed Jul 16 14:26:04 2014 -0700
+++ b/open-src/xserver/xvnc/Makefile Thu Jul 17 11:38:10 2014 -0700
@@ -4,7 +4,7 @@
# Based on Fedora's tigervnc.spec revision 1.20 from
# http://cvs.fedoraproject.org/viewvc/rpms/tigervnc/devel/tigervnc.spec
#
-# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2014, 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"),
@@ -72,13 +72,14 @@
SOURCE_PATCHES += no-nasm.patch,-p1
SOURCE_PATCHES += applet-html.patch
SOURCE_PATCHES += icon.patch,-p1
-SOURCE_PATCHES += jdk17.patch,-p1
+SOURCE_PATCHES += jdk-version.patch,-p1
SOURCE_PATCHES += solaris-libraries.patch,-p1
SOURCE_PATCHES += vnc-nobuildtime.patch,-p1
SOURCE_PATCHES += vnc-nohttpd.patch,-p1
SOURCE_PATCHES += solaris-port.patch,-p1
SOURCE_PATCHES += solaris-audit.patch,-p1
SOURCE_PATCHES += 17950657.patch,-p1
+SOURCE_PATCHES += studio12.4-patch,-p1
# Need to regenerate autoconf/automake files after patching
AUTORECONF=yes
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xvnc/jdk-version.patch Thu Jul 17 11:38:10 2014 -0700
@@ -0,0 +1,14 @@
+--- a/java/src/com/tigervnc/vncviewer/Makefile Thu Jul 10 14:52:31 2014
++++ b/java/src/com/tigervnc/vncviewer/Makefile Thu Jul 10 14:52:51 2014
+@@ -3,8 +3,9 @@
+ #
+
+ CP = cp
+-JC = javac
+-JCFLAGS = -target 1.5 -classpath ../../../
++JDK_VERSION = 1.8.0
++JC = /usr/jdk/instances/jdk$(JDK_VERSION)/bin/javac
++JCFLAGS = -target 1.8 -classpath ../../../
+ JAR = jar
+ ARCHIVE = VncViewer.jar
+ MANIFEST = MANIFEST.MF
--- a/open-src/xserver/xvnc/jdk17.patch Wed Jul 16 14:26:04 2014 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- a/java/src/com/tigervnc/vncviewer/Makefile Tue Jan 15 10:12:51 2013
-+++ b/java/src/com/tigervnc/vncviewer/Makefile Tue Jan 15 10:13:05 2013
-@@ -4,7 +4,7 @@
-
- CP = cp
- JC = javac
--JCFLAGS = -target 1.5 -classpath ../../../
-+JCFLAGS = -target 1.7 -classpath ../../../
- JAR = jar
- ARCHIVE = VncViewer.jar
- MANIFEST = MANIFEST.MF
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xvnc/studio12.4-patch Thu Jul 17 11:38:10 2014 -0700
@@ -0,0 +1,13 @@
+--- a/unix/xserver/include/misc.h Thu Jul 10 11:37:34 2014
++++ b/unix/xserver/include/misc.h Thu Jul 10 11:38:50 2014
+@@ -297,7 +297,9 @@
+ }
+ #endif
+
+-#if !(defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)))
++#if !(defined(__GNUC__) \
++ || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) \
++ || (defined(__SUNPRO_CC) && (__SUNPRO_CC >= 0x5130)))
+ static inline int
+ __builtin_constant_p(int x)
+ {
--- a/open-src/xserver/xvnc/sun-src/java/src/com/tigervnc/decoder/Makefile Wed Jul 16 14:26:04 2014 -0700
+++ b/open-src/xserver/xvnc/sun-src/java/src/com/tigervnc/decoder/Makefile Thu Jul 17 11:38:10 2014 -0700
@@ -1,6 +1,7 @@
-JC = javac
-JCFLAGS = -target 1.7 -classpath ../../../
+JDK_VERSION = 1.8.0
+JC = /usr/jdk/instances/jdk$(JDK_VERSION)/bin/javac
+JCFLAGS = -target 1.8 -classpath ../../../
SOURCES = \
common/Repaintable.java \
--- a/pkg/manifests/x11-library-libxcb.p5m Wed Jul 16 14:26:04 2014 -0700
+++ b/pkg/manifests/x11-library-libxcb.p5m Thu Jul 17 11:38:10 2014 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, 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,7 +27,9 @@
# Autogenerate *.pyc manifest entries for each *.py file
<transform file path=.*\.py$ -> emit file path=%(path)c>
-
+# Autogenerate *.pyc manifest entries for the *.pyc files in __pycache__ dir
+<transform file path=^(.*/xcbgen)/(.*)\.py$ -> \
+ emit file path=%<1>/__pycache__/%<2>.cpython-34.pyc>
set name=pkg.fmri value=pkg:/x11/library/libxcb@__version:libxcb__
set name=pkg.summary value="libxcb - The X11 protocol C Binding"
set name=pkg.description \
@@ -210,6 +212,7 @@
#
dir path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages/xcbgen
file path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages/xcbgen/__init__.py
+dir path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages/xcbgen/__pycache__
file path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages/xcbgen/error.py
file path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages/xcbgen/expr.py
file path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages/xcbgen/matcher.py