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.
20657358 migrate meld from Python 2.6 to 2.7
authorJohn Beck <John.Beck@Oracle.COM>
Thu, 05 Mar 2015 15:29:46 -0800
changeset 3914 0919f4d30271
parent 3913 6975b8339adc
child 3915 bf1315c4d52e
20657358 migrate meld from Python 2.6 to 2.7
components/meld/Makefile file | annotate | diff | comparison | revisions
components/meld/meld.p5m file | annotate | diff | comparison | revisions
components/meld/patches/INSTALL.patch file | annotate | diff | comparison | revisions
components/meld/patches/meld.patch file | annotate | diff | comparison | revisions 
--- a/components/meld/Makefile	Thu Mar 05 14:44:01 2015 -0800
+++ b/components/meld/Makefile	Thu Mar 05 15:29:46 2015 -0800
@@ -39,6 +39,10 @@
 include $(WS_MAKE_RULES)/justmake.mk
 include $(WS_MAKE_RULES)/ips.mk
 
+PYTHON_VERSION =	2.7
+
+PKG_MACROS +=		PYVER=$(PYTHON_VERSION)
+
 # Meld has no configure however it honors DESTDIR which is necessary so
 # we don't try to install into roots /usr but rather our proto areas usr
 COMPONENT_INSTALL_ARGS +=	DESTDIR=$(PROTO_DIR)
@@ -52,8 +56,7 @@
 
 test:		$(NO_TESTS)
 
-
 REQUIRED_PACKAGES += developer/gnome/gettext
-REQUIRED_PACKAGES += library/python-2/pygtk2-26
-REQUIRED_PACKAGES += runtime/python-26
+REQUIRED_PACKAGES += library/python/pygtk2-27
+REQUIRED_PACKAGES += runtime/python-27
 REQUIRED_PACKAGES += text/gnu-gettext
--- a/components/meld/meld.p5m	Thu Mar 05 14:44:01 2015 -0800
+++ b/components/meld/meld.p5m	Thu Mar 05 15:29:46 2015 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -39,7 +39,7 @@
 set name=org.opensolaris.arc-caseid value=PSARC/2008/189
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file path=usr/bin/meld \
-    pkg.depend.runpath=/usr/lib/meld:/usr/lib/python2.6:/usr/lib/python2.6/vendor-packages/gtk-2.0 \
+    pkg.depend.runpath=/usr/lib/meld:/usr/lib/python$(PYVER):/usr/lib/python$(PYVER)/vendor-packages/gtk-2.0 \
     pkg.depend.bypass-generate=.*/checker.* \
     pkg.depend.bypass-generate=.*/pychecker/__init__.* \
     pkg.depend.bypass-generate=.*/pygtk.*
--- a/components/meld/patches/INSTALL.patch	Thu Mar 05 14:44:01 2015 -0800
+++ b/components/meld/patches/INSTALL.patch	Thu Mar 05 15:29:46 2015 -0800
@@ -1,10 +1,14 @@
---- meld-1.4.0/INSTALL	Sun Sep 26 15:25:02 2010
-+++ meld-1.4.0/new.INSTALL	Mon Apr 25 11:11:12 2011
[email protected]@ -18,7 +18,7 @@
+This patch originated in-house but is not suitable for upstream.
+
+--- meld-1.4.0/INSTALL.~1~	2010-09-26 15:25:02.000000000 -0700
++++ meld-1.4.0/INSTALL	2015-03-05 15:13:15.766057260 -0800
[email protected]@ -17,8 +17,8 @@
+ ##   Now run "/usr/local/bin/meld"
  ## 
  ##   You can customise the install paths used here:
- PYTHON ?= python
+-PYTHON ?= python
 -prefix := /usr/local
++PYTHON ?= python2.7
 +prefix := /usr
  bindir := $(prefix)/bin
  libdir := $(prefix)/lib
--- a/components/meld/patches/meld.patch	Thu Mar 05 14:44:01 2015 -0800
+++ b/components/meld/patches/meld.patch	Thu Mar 05 15:29:46 2015 -0800
@@ -1,8 +1,10 @@
+This patch originated in-house but is not suitable for upstream.
+
 --- meld-1.4.0/bin/meld	Sun Sep 26 15:25:02 2010
 +++ meld-1.4.0/bin/new.meld	Mon May  2 12:00:56 2011
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
-+#!/usr/bin/python2.6
++#!/usr/bin/python2.7
  
  ### Copyright (C) 2002-2006 Stephen Kennedy <[email protected]>
upstream/oracle/userland-gate