20657358 migrate meld from Python 2.6 to 2.7 s11-update
authorJohn Beck <John.Beck@Oracle.COM>
Thu, 05 Mar 2015 15:29:46 -0800
branchs11-update
changeset 4237 3517b6c3873e
parent 4236 ca71d5a4e4e9
child 4238 59cf6fd337ea
20657358 migrate meld from Python 2.6 to 2.7
components/meld/Makefile
components/meld/patches/INSTALL.patch
components/meld/patches/meld.patch
--- a/components/meld/Makefile	Fri Apr 17 01:53:46 2015 -0700
+++ b/components/meld/Makefile	Thu Mar 05 15:29:46 2015 -0800
@@ -39,7 +39,7 @@
 include $(WS_MAKE_RULES)/justmake.mk
 include $(WS_MAKE_RULES)/ips.mk
 
-PYTHON_VERSION =	2.6
+PYTHON_VERSION =	2.7
 
 PKG_MACROS +=		PYVER=$(PYTHON_VERSION)
 
@@ -54,7 +54,7 @@
 
 test:		$(NO_TESTS)
 
-
-REQUIRED_PACKAGES += library/python-2/pygtk2-26
-REQUIRED_PACKAGES += runtime/python-26
+REQUIRED_PACKAGES += developer/gnome/gettext
+REQUIRED_PACKAGES += library/python/pygtk2-27
 REQUIRED_PACKAGES += runtime/python-27
+REQUIRED_PACKAGES += text/gnu-gettext
--- a/components/meld/patches/INSTALL.patch	Fri Apr 17 01:53:46 2015 -0700
+++ 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	Fri Apr 17 01:53:46 2015 -0700
+++ 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]>