[python] upgrade to 2.7.9.

diff --git a/meta-openvuplus/recipes-devtools/python/python-native_2.7.3.bbappend b/meta-openvuplus/recipes-devtools/python/python-native_2.7.3.bbappend
deleted file mode 100644 (file)
index de95c93..0000000
--- a/meta-openvuplus/recipes-devtools/python/python-native_2.7.3.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-PR .= "-vuplus2"
-
-SRC_URI += "file://04-default-is-optimized.patch"
-
-RPROVIDES_${PN} += "python-pickle-native python-pprint-native"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-

diff --git a/meta-openvuplus/recipes-devtools/python/python-native_2.7.9.bbappend b/meta-openvuplus/recipes-devtools/python/python-native_2.7.9.bbappend
new file mode 100644 (file)
index 0000000..de95c93
--- /dev/null
+++ b/meta-openvuplus/recipes-devtools/python/python-native_2.7.9.bbappend
@@ -0,0 +1,8 @@
+PR .= "-vuplus2"
+
+SRC_URI += "file://04-default-is-optimized.patch"
+
+RPROVIDES_${PN} += "python-pickle-native python-pprint-native"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+

diff --git a/meta-openvuplus/recipes-devtools/python/python/pgettext.patch b/meta-openvuplus/recipes-devtools/python/python/pgettext.patch
new file mode 100644 (file)
index 0000000..6ae16ea
--- /dev/null
+++ b/meta-openvuplus/recipes-devtools/python/python/pgettext.patch
@@ -0,0 +1,371 @@
+Index: Python-2.7.9/Lib/gettext.py
+===================================================================
+--- Python-2.7.9.orig/Lib/gettext.py
++++ Python-2.7.9/Lib/gettext.py
+@@ -53,6 +53,7 @@ from errno import ENOENT
+ __all__ = ['NullTranslations', 'GNUTranslations', 'Catalog',
+            'find', 'translation', 'install', 'textdomain', 'bindtextdomain',
+            'dgettext', 'dngettext', 'gettext', 'ngettext',
++           'pgettext', 'lpgettext', 'npgettext', 'lnpgettext', 'ldnpgettext',
+            ]
+ 
+ _default_localedir = os.path.join(sys.prefix, 'share', 'locale')
+@@ -193,11 +194,21 @@ class NullTranslations:
+             return self._fallback.gettext(message)
+         return message
+ 
++    def pgettext(self, context, message):
++        if self._fallback:
++            return self._fallback.pgettext(context, message)
++        return message
++
+     def lgettext(self, message):
+         if self._fallback:
+             return self._fallback.lgettext(message)
+         return message
+ 
++    def lpgettext(self, context, message):
++        if self._fallback:
++            return self._fallback.lpgettext(context, message)
++        return message
++
+     def ngettext(self, msgid1, msgid2, n):
+         if self._fallback:
+             return self._fallback.ngettext(msgid1, msgid2, n)
+@@ -206,6 +217,14 @@ class NullTranslations:
+         else:
+             return msgid2
+ 
++    def npgettext(self, context, msgid1, msgid2, n):
++        if self._fallback:
++            return self._fallback.npgettext(context, msgid1, msgid2, n)
++        if n == 1:
++            return msgid1
++        else:
++            return msgid2
++
+     def lngettext(self, msgid1, msgid2, n):
+         if self._fallback:
+             return self._fallback.lngettext(msgid1, msgid2, n)
+@@ -227,6 +246,14 @@ class NullTranslations:
+         else:
+             return unicode(msgid2)
+ 
++    def lnpgettext(self, context, msgid1, msgid2, n):
++        if self._fallback:
++            return self._fallback.lnpgettext(context, msgid1, msgid2, n)
++        if n == 1:
++            return msgid1
++        else:
++            return msgid2
++
+     def info(self):
+         return self._info
+ 
+@@ -252,13 +279,22 @@ class NullTranslations:
+                 __builtin__.__dict__['lgettext'] = self.lgettext
+             if "lngettext" in names:
+                 __builtin__.__dict__['lngettext'] = self.lngettext
+-
++            if "pgettext" in names:
++                __builtin__.__dict__['pgettext'] = self.pgettext
++            if "npgettext" in names:
++                __builtin__.__dict__['npgettext'] = self.npgettext
++            if "lnpgettext" in names:
++                __builtin__.__dict__['lnpgettext'] = self.lnpgettext
+ 
+ class GNUTranslations(NullTranslations):
+     # Magic number of .mo files
+     LE_MAGIC = 0x950412deL
+     BE_MAGIC = 0xde120495L
+ 
++    # The encoding of a msgctxt and a msgid in a .mo file is
++    # msgctxt + "\x04" + msgid (gettext version >= 0.15)
++    CONTEXT = "%s\x04%s"
++
+     def _parse(self, fp):
+         """Override this method to support alternative .mo formats."""
+         unpack = struct.unpack
+@@ -354,6 +390,21 @@ class GNUTranslations(NullTranslations):
+             return tmsg.encode(self._charset)
+         return tmsg
+ 
++    def pgettext(self, context, message):
++        ctxt_msg_id = self.CONTEXT % (context, message)
++        missing = object()
++        tmsg = self._catalog.get(ctxt_msg_id, missing)
++        if tmsg is missing:
++            if self._fallback:
++                return self._fallback.pgettext(context, message)
++            return message
++        # Encode the Unicode tmsg back to an 8-bit string, if possible
++        if self._output_charset:
++            return tmsg.encode(self._output_charset)
++        elif self._charset:
++            return tmsg.encode(self._charset)
++        return tmsg
++
+     def lgettext(self, message):
+         missing = object()
+         tmsg = self._catalog.get(message, missing)
+@@ -365,6 +416,18 @@ class GNUTranslations(NullTranslations):
+             return tmsg.encode(self._output_charset)
+         return tmsg.encode(locale.getpreferredencoding())
+ 
++    def lpgettext(self, context, message):
++        ctxt_msg_id = self.CONTEXT % (context, message)
++        missing = object()
++        tmsg = self._catalog.get(ctxt_msg_id, missing)
++        if tmsg is missing:
++            if self._fallback:
++                return self._fallback.lpgettext(context, message)
++            return message
++        if self._output_charset:
++            return tmsg.encode(self._output_charset)
++        return tmsg.encode(locale.getpreferredencoding())
++
+     def ngettext(self, msgid1, msgid2, n):
+         try:
+             tmsg = self._catalog[(msgid1, self.plural(n))]
+@@ -381,6 +444,23 @@ class GNUTranslations(NullTranslations):
+             else:
+                 return msgid2
+ 
++    def npgettext(self, context, msgid1, msgid2, n):
++        ctxt_msg_id = self.CONTEXT % (context, msgid1)
++        try:
++            tmsg = self._catalog[(ctxt_msg_id, self.plural(n))]
++            if self._output_charset:
++                return tmsg.encode(self._output_charset)
++            elif self._charset:
++                return tmsg.encode(self._charset)
++            return tmsg
++        except KeyError:
++            if self._fallback:
++                return self._fallback.npgettext(context, msgid1, msgid2, n)
++            if n == 1:
++                return msgid1
++            else:
++                return msgid2
++
+     def lngettext(self, msgid1, msgid2, n):
+         try:
+             tmsg = self._catalog[(msgid1, self.plural(n))]
+@@ -416,6 +496,21 @@ class GNUTranslations(NullTranslations):
+                 tmsg = unicode(msgid2)
+         return tmsg
+ 
++    def lnpgettext(self, context, msgid1, msgid2, n):
++        ctxt_msg_id = self.CONTEXT % (context, msgid1)
++        try:
++            tmsg = self._catalog[(ctxt_msg_id, self.plural(n))]
++            if self._output_charset:
++                return tmsg.encode(self._output_charset)
++            return tmsg.encode(locale.getpreferredencoding())
++        except KeyError:
++            if self._fallback:
++                return self._fallback.lnpgettext(context, msgid1, msgid2, n)
++            if n == 1:
++                return msgid1
++            else:
++                return msgid2
++
+ 
+ # Locate a .mo file using the gettext strategy
+ def find(domain, localedir=None, languages=None, all=0):
+@@ -532,6 +627,14 @@ def dgettext(domain, message):
+         return message
+     return t.gettext(message)
+ 
++def dpgettext(domain, context, message):
++    try:
++        t = translation(domain, _localedirs.get(domain, None),
++                        codeset=_localecodesets.get(domain))
++    except IOError:
++        return message
++    return t.pgettext(context, message)
++
+ def ldgettext(domain, message):
+     try:
+         t = translation(domain, _localedirs.get(domain, None),
+@@ -540,6 +643,14 @@ def ldgettext(domain, message):
+         return message
+     return t.lgettext(message)
+ 
++def ldpgettext(domain, context, message):
++    try:
++        t = translation(domain, _localedirs.get(domain, None),
++                        codeset=_localecodesets.get(domain))
++    except IOError:
++        return message
++    return t.lpgettext(context, message)
++
+ def dngettext(domain, msgid1, msgid2, n):
+     try:
+         t = translation(domain, _localedirs.get(domain, None),
+@@ -551,6 +662,17 @@ def dngettext(domain, msgid1, msgid2, n)
+             return msgid2
+     return t.ngettext(msgid1, msgid2, n)
+ 
++def dnpgettext(domain, context, msgid1, msgid2, n):
++    try:
++        t = translation(domain, _localedirs.get(domain, None),
++                        codeset=_localecodesets.get(domain))
++    except IOError:
++        if n == 1:
++            return msgid1
++        else:
++            return msgid2
++    return t.npgettext(context, msgid1, msgid2, n)
++
+ def ldngettext(domain, msgid1, msgid2, n):
+     try:
+         t = translation(domain, _localedirs.get(domain, None),
+@@ -562,18 +684,41 @@ def ldngettext(domain, msgid1, msgid2, n
+             return msgid2
+     return t.lngettext(msgid1, msgid2, n)
+ 
++def ldnpgettext(domain, context, msgid1, msgid2, n):
++    try:
++        t = translation(domain, _localedirs.get(domain, None),
++                        codeset=_localecodesets.get(domain))
++    except IOError:
++        if n == 1:
++            return msgid1
++        else:
++            return msgid2
++    return t.lnpgettext(context, msgid1, msgid2, n)
++
+ def gettext(message):
+     return dgettext(_current_domain, message)
+ 
++def pgettext(context, message):
++    return dpgettext(_current_domain, context, message)
++
+ def lgettext(message):
+     return ldgettext(_current_domain, message)
+ 
++def lpgettext(context, message):
++    return ldpgettext(_current_domain, context, message)
++
+ def ngettext(msgid1, msgid2, n):
+     return dngettext(_current_domain, msgid1, msgid2, n)
+ 
++def npgettext(context, msgid1, msgid2, n):
++    return dnpgettext(_current_domain, context, msgid1, msgid2, n)
++
+ def lngettext(msgid1, msgid2, n):
+     return ldngettext(_current_domain, msgid1, msgid2, n)
+ 
++def lnpgettext(context, msgid1, msgid2, n):
++    return ldnpgettext(_current_domain, context, msgid1, msgid2, n)
++
+ # dcgettext() has been deemed unnecessary and is not implemented.
+ 
+ # James Henstridge's Catalog constructor from GNOME gettext.  Documented usage
+Index: Python-2.7.9/Tools/i18n/msgfmt.py
+===================================================================
+--- Python-2.7.9.orig/Tools/i18n/msgfmt.py
++++ Python-2.7.9/Tools/i18n/msgfmt.py
+@@ -6,7 +6,8 @@
+ 
+ This program converts a textual Uniforum-style message catalog (.po file) into
+ a binary GNU catalog (.mo file).  This is essentially the same function as the
+-GNU msgfmt program, however, it is a simpler implementation.
++GNU msgfmt program, however, it is a simpler implementation.  Currently it
++does not handle plural forms but it does handle message contexts.
+ 
+ Usage: msgfmt.py [OPTIONS] filename.po
+ 
+@@ -32,7 +33,7 @@ import getopt
+ import struct
+ import array
+ 
+-__version__ = "1.1"
++__version__ = "1.2"
+ 
+ MESSAGES = {}
+ 
+@@ -46,11 +47,14 @@ def usage(code, msg=''):
+ 
+ 
+ \f
+-def add(id, str, fuzzy):
++def add(ctxt, id, str, fuzzy):
+     "Add a non-fuzzy translation to the dictionary."
+     global MESSAGES
+     if not fuzzy and str:
+-        MESSAGES[id] = str
++        if ctxt is None:
++            MESSAGES[id] = str
++        else:
++            MESSAGES["%s\x04%s" % (ctxt, id)] = str
+ 
+ 
+ \f
+@@ -100,6 +104,7 @@ def generate():
+ def make(filename, outfile):
+     ID = 1
+     STR = 2
++    CTXT = 3
+ 
+     # Compute .mo name from .po name and arguments
+     if filename.endswith('.po'):
+@@ -115,7 +120,7 @@ def make(filename, outfile):
+         print >> sys.stderr, msg
+         sys.exit(1)
+ 
+-    section = None
++    section = msgctxt = None
+     fuzzy = 0
+ 
+     # Parse the catalog
+@@ -124,8 +129,8 @@ def make(filename, outfile):
+         lno += 1
+         # If we get a comment line after a msgstr, this is a new entry
+         if l[0] == '#' and section == STR:
+-            add(msgid, msgstr, fuzzy)
+-            section = None
++            add(msgctxt, msgid, msgstr, fuzzy)
++            section = msgctxt = None
+             fuzzy = 0
+         # Record a fuzzy mark
+         if l[:2] == '#,' and 'fuzzy' in l:
+@@ -133,10 +138,16 @@ def make(filename, outfile):
+         # Skip comments
+         if l[0] == '#':
+             continue
+-        # Now we are in a msgid section, output previous section
+-        if l.startswith('msgid') and not l.startswith('msgid_plural'):
++        # Now we are in a msgid or msgctxt section, output previous section
++        if l.startswith("msgctxt"):
++            if section == STR:
++                add(msgctxt, msgid, msgstr, fuzzy)
++            section = CTXT
++            l = l[7:]
++            msgctxt = ''
++        elif l.startswith('msgid') and not l.startswith('msgid_plural'):
+             if section == STR:
+-                add(msgid, msgstr, fuzzy)
++                add(msgctxt, msgid, msgstr, fuzzy)
+             section = ID
+             l = l[5:]
+             msgid = msgstr = ''
+@@ -174,6 +185,8 @@ def make(filename, outfile):
+         l = ast.literal_eval(l)
+         if section == ID:
+             msgid += l
++        elif section == CTXT:
++            msgctxt += l
+         elif section == STR:
+             msgstr += l
+         else:
+@@ -183,7 +196,7 @@ def make(filename, outfile):
+             sys.exit(1)
+     # Add last entry
+     if section == STR:
+-        add(msgid, msgstr, fuzzy)
++        add(msgctxt, msgid, msgstr, fuzzy)
+ 
+     # Compute output
+     output = generate()

diff --git a/meta-openvuplus/recipes-devtools/python/python/some_configure_fixes.patch b/meta-openvuplus/recipes-devtools/python/python/some_configure_fixes.patch
deleted file mode 100644 (file)
index b4cd504..0000000
--- a/meta-openvuplus/recipes-devtools/python/python/some_configure_fixes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 2d997dc..d0c9f83 100644
---- a/configure.in
-+++ b/configure.in
-@@ -4167,27 +4167,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[void *x=resizeterm
-   [AC_MSG_RESULT(no)]
- )
- 
--AC_MSG_CHECKING(for /dev/ptmx)
-+AC_CHECK_FILE(/dev/ptmx, AC_DEFINE(HAVE_DEV_PTMX, 1, [Define if we have /dev/ptmx.]))
- 
--if test -r /dev/ptmx
--then
--  AC_MSG_RESULT(yes)
--  AC_DEFINE(HAVE_DEV_PTMX, 1,
--  [Define if we have /dev/ptmx.])
--else
--  AC_MSG_RESULT(no)
--fi
--
--AC_MSG_CHECKING(for /dev/ptc)
--
--if test -r /dev/ptc
--then
--  AC_MSG_RESULT(yes)
--  AC_DEFINE(HAVE_DEV_PTC, 1,
--  [Define if we have /dev/ptc.])
--else
--  AC_MSG_RESULT(no)
--fi
-+AC_CHECK_FILE(/dev/ptc, AC_DEFINE(HAVE_DEV_PTC, 1, [Define if we have /dev/ptc.]))
- 
- if test "$have_long_long" = yes
- then

diff --git a/meta-openvuplus/recipes-devtools/python/python_2.7.3.bbappend b/meta-openvuplus/recipes-devtools/python/python_2.7.3.bbappend
deleted file mode 100644 (file)
index 0045644..0000000
--- a/meta-openvuplus/recipes-devtools/python/python_2.7.3.bbappend
+++ /dev/null
@@ -1,21 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PR .= "-vuplus1"
-
-SRC_URI += " \
-        file://some_configure_fixes.patch \
-        file://fix_pthread_site.patch \
-        file://no-ldconfig.patch \
-        file://ctypes-error-handling-fix.patch \
-        file://04-default-is-optimized.patch \
-        file://99-ignore-optimization-flag.patch \
-"
-
-EXTRA_OECONF += " \
-       ac_cv_file__dev_ptmx=yes \
-       ac_cv_file__dev_ptc=no \
-       ac_cv_no_strict_aliasing_ok=yes \
-       ac_cv_pthread=yes \
-       ac_cv_cxx_thread=yes \
-       ac_cv_sizeof_off_t=8 \
-"

diff --git a/meta-openvuplus/recipes-devtools/python/python_2.7.9.bbappend b/meta-openvuplus/recipes-devtools/python/python_2.7.9.bbappend
new file mode 100644 (file)
index 0000000..3a509a2
--- /dev/null
+++ b/meta-openvuplus/recipes-devtools/python/python_2.7.9.bbappend
@@ -0,0 +1,20 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+PR .= "-vuplus0"
+
+SRC_URI += " \
+        file://no-ldconfig.patch \
+        file://ctypes-error-handling-fix.patch \
+        file://04-default-is-optimized.patch \
+        file://99-ignore-optimization-flag.patch \
+       file://pgettext.patch \
+"
+
+EXTRA_OECONF += " \
+       ac_cv_file__dev_ptmx=yes \
+       ac_cv_file__dev_ptc=no \
+       ac_cv_no_strict_aliasing_ok=yes \
+       ac_cv_pthread=yes \
+       ac_cv_cxx_thread=yes \
+       ac_cv_sizeof_off_t=8 \
+"