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.
20655131 migrate hplip from Python 2.6 to 2.7
authorJohn Beck <John.Beck@Oracle.COM>
Thu, 05 Mar 2015 13:53:57 -0800
changeset 3912 c5e09b550970
parent 3911 7afc7128c98a
child 3913 6975b8339adc
20655131 migrate hplip from Python 2.6 to 2.7
components/hplip/Makefile file | annotate | diff | comparison | revisions
components/hplip/hplip.proto-objects file | annotate | diff | comparison | revisions
components/hplip/patches/04_pstotiff.patch file | annotate | diff | comparison | revisions
components/hplip/patches/05_hpps.patch file | annotate | diff | comparison | revisions
components/hplip/patches/06_hpfax.patch file | annotate | diff | comparison | revisions 
--- a/components/hplip/Makefile	Thu Mar 05 07:33:27 2015 -0800
+++ b/components/hplip/Makefile	Thu Mar 05 13:53:57 2015 -0800
@@ -48,6 +48,8 @@
 
 ROOTPPDCACHE =  $(PROTO_DIR)/usr/lib/lp/caches/SUNWhpijs.cache
 
+PYTHON_VERSION = 2.7
+
 # common configure options
 CONFIGURE_OPTIONS +=	--localedir=$(CONFIGURE_LOCALEDIR)
 CONFIGURE_OPTIONS +=	--disable-pp-build
@@ -108,14 +110,14 @@
 	# set version of python interpreter to calm the pkglint
 	find $(PROTO_DIR) -name \*.py -print0 | \
 	   while IFS= read -r -d $$'\0' file; do \
-		/usr/bin/sed -e '1,1s&^#!.*python[:blank:]\{0,\}$$&#!$(PYTHON)&' \
+		/usr/bin/sed -e '1,1s&^#!.*python[:blank:]\{0,\}$$&#!$(PYTHON.$(PYTHON_VERSION))&' \
 		   $$file > $$file.pyverset ; \
 	   done
 	find $(PROTO_DIR) -name \*.py.pyverset -print0 | \
 	   while IFS= read -r -d $$'\0' file; do \
 		$(MV) $$file `echo $$file | sed -e 's/[.]pyverset$$//'` ; \
 	   done
-	$(PYTHON) -m compileall $(PROTO_DIR)/usr/share/hplip/
+	$(PYTHON.$(PYTHON_VERSION)) -m compileall $(PROTO_DIR)/usr/share/hplip/
 	$(TOUCH) $@
 
 PKG_MACROS +=	PYVER=$(PYTHON_VERSION)
@@ -141,7 +143,7 @@
 REQUIRED_PACKAGES += print/cups
 REQUIRED_PACKAGES += image/scanner/xsane/sane-backends
 REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/python-26
+REQUIRED_PACKAGES += runtime/python-27
 REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += system/library/c++-runtime
 REQUIRED_PACKAGES += system/library/libdbus
--- a/components/hplip/hplip.proto-objects	Thu Mar 05 07:33:27 2015 -0800
+++ b/components/hplip/hplip.proto-objects	Thu Mar 05 13:53:57 2015 -0800
@@ -71,16 +71,16 @@
 dir  path=usr/lib/lp
 dir  path=usr/lib/lp/caches
 file path=usr/lib/lp/caches/SUNWhpijs.cache
-dir  path=usr/lib/python2.6
-dir  path=usr/lib/python2.6/vendor-packages
-file path=usr/lib/python2.6/vendor-packages/cupsext.la
-file path=usr/lib/python2.6/vendor-packages/cupsext.so
-file path=usr/lib/python2.6/vendor-packages/hpmudext.la
-file path=usr/lib/python2.6/vendor-packages/hpmudext.so
-file path=usr/lib/python2.6/vendor-packages/pcardext.la
-file path=usr/lib/python2.6/vendor-packages/pcardext.so
-file path=usr/lib/python2.6/vendor-packages/scanext.la
-file path=usr/lib/python2.6/vendor-packages/scanext.so
+dir  path=usr/lib/python2.7
+dir  path=usr/lib/python2.7/vendor-packages
+file path=usr/lib/python2.7/vendor-packages/cupsext.la
+file path=usr/lib/python2.7/vendor-packages/cupsext.so
+file path=usr/lib/python2.7/vendor-packages/hpmudext.la
+file path=usr/lib/python2.7/vendor-packages/hpmudext.so
+file path=usr/lib/python2.7/vendor-packages/pcardext.la
+file path=usr/lib/python2.7/vendor-packages/pcardext.so
+file path=usr/lib/python2.7/vendor-packages/scanext.la
+file path=usr/lib/python2.7/vendor-packages/scanext.so
 dir  path=usr/lib/sane
 file path=usr/lib/sane/libsane-hpaio.la
 link path=usr/lib/sane/libsane-hpaio.so target=libsane-hpaio.so.1.0.0
--- a/components/hplip/patches/04_pstotiff.patch	Thu Mar 05 07:33:27 2015 -0800
+++ b/components/hplip/patches/04_pstotiff.patch	Thu Mar 05 13:53:57 2015 -0800
@@ -4,7 +4,7 @@
 +++ b/fax/filters/pstotiff	Fri Mar 25 03:42:38 2011
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
-+#!/usr/bin/python2.6
++#!/usr/bin/python2.7
  
  import os
  import os.path
--- a/components/hplip/patches/05_hpps.patch	Thu Mar 05 07:33:27 2015 -0800
+++ b/components/hplip/patches/05_hpps.patch	Thu Mar 05 13:53:57 2015 -0800
@@ -4,7 +4,7 @@
 +++ hplip-3.14.4/prnt/filters/hpps	2014-05-22 02:13:25.977568700 -0700
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
-+#!/usr/bin/python2.6
++#!/usr/bin/python2.7
  # -*- coding: utf-8 -*-
  #
  # (c) Copyright 2003-2012 Hewlett-Packard Development Company, L.P.
--- a/components/hplip/patches/06_hpfax.patch	Thu Mar 05 07:33:27 2015 -0800
+++ b/components/hplip/patches/06_hpfax.patch	Thu Mar 05 13:53:57 2015 -0800
@@ -4,7 +4,7 @@
 +++ hplip-3.14.4/fax/backend/hpfax.py	2014-05-22 02:16:18.325960600 -0700
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
-+#!/usr/bin/python2.6
++#!/usr/bin/python2.7
  # -*- coding: utf-8 -*-
  #
  # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P.
upstream/oracle/userland-gate