summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-libs/libqmi/files/libqmi-1.0.0-python3.patch
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-libs/libqmi/files/libqmi-1.0.0-python3.patch')
-rw-r--r--net-libs/libqmi/files/libqmi-1.0.0-python3.patch176
1 files changed, 176 insertions, 0 deletions
diff --git a/net-libs/libqmi/files/libqmi-1.0.0-python3.patch b/net-libs/libqmi/files/libqmi-1.0.0-python3.patch
new file mode 100644
index 000000000000..152804dc3656
--- /dev/null
+++ b/net-libs/libqmi/files/libqmi-1.0.0-python3.patch
@@ -0,0 +1,176 @@
+http://bugs.gentoo.org/464314
+
+upstream seems to have this fixed already
+
+--- a/build-aux/qmi-codegen/Client.py
++++ b/build-aux/qmi-codegen/Client.py
+@@ -61,10 +61,10 @@ class Client:
+ break
+
+ translations = { 'underscore' : utils.build_underscore_name(self.name),
+- 'no_prefix_underscore_upper' : string.upper(utils.build_underscore_name(self.name[4:])),
++ 'no_prefix_underscore_upper' : utils.build_underscore_name(self.name[4:]).upper(),
+ 'camelcase' : utils.build_camelcase_name(self.name),
+ 'hyphened' : utils.build_dashed_name(self.name),
+- 'service' : string.upper(self.service) }
++ 'service' : self.service.upper() }
+
+ # Emit class header
+ template = (
+@@ -207,8 +207,8 @@ class Client:
+ # At least one field in the indication
+ translations['output_camelcase'] = utils.build_camelcase_name(message.output.fullname)
+ translations['bundle_type'] = 'QMI_TYPE_' + utils.remove_prefix(utils.build_underscore_uppercase_name(message.output.fullname), 'QMI_')
+- translations['service'] = string.upper(self.service)
+- translations['message_name_dashed'] = string.replace(message.name, ' ', '-')
++ translations['service'] = self.service.upper()
++ translations['message_name_dashed'] = message.name.replace(' ', '-')
+ inner_template += (
+ '\n'
+ ' /**\n'
+@@ -263,8 +263,8 @@ class Client:
+ def __emit_methods(self, hfile, cfile, message_list):
+ translations = { 'underscore' : utils.build_underscore_name(self.name),
+ 'camelcase' : utils.build_camelcase_name (self.name),
+- 'service_lowercase' : string.lower(self.service),
+- 'service_uppercase' : string.upper(self.service),
++ 'service_lowercase' : self.service.lower(),
++ 'service_uppercase' : self.service.upper(),
+ 'service_camelcase' : string.capwords(self.service) }
+
+ for message in message_list.list:
+@@ -518,7 +518,7 @@ class Client:
+ """
+ def emit_sections(self, sfile):
+ translations = { 'underscore' : utils.build_underscore_name(self.name),
+- 'no_prefix_underscore_upper' : string.upper(utils.build_underscore_name(self.name[4:])),
++ 'no_prefix_underscore_upper' : utils.build_underscore_name(self.name[4:]).upper(),
+ 'camelcase' : utils.build_camelcase_name (self.name),
+ 'hyphened' : utils.build_dashed_name (self.name) }
+
+--- a/build-aux/qmi-codegen/Field.py
++++ b/build-aux/qmi-codegen/Field.py
+@@ -57,10 +57,10 @@ class Field:
+ self.variable = VariableFactory.create_variable(dictionary, self.fullname, self.container_type)
+
+ # Create the variable name within the Container
+- self.variable_name = 'arg_' + string.lower(utils.build_underscore_name(self.name))
++ self.variable_name = 'arg_' + utils.build_underscore_name(self.name).lower()
+
+ # Create the ID enumeration name
+- self.id_enum_name = string.upper(utils.build_underscore_name(self.prefix + ' TLV ' + self.name))
++ self.id_enum_name = utils.build_underscore_name(self.prefix + ' TLV ' + self.name).upper()
+
+ # Output Fields may have prerequisites
+ self.prerequisites = []
+--- a/build-aux/qmi-codegen/Message.py
++++ b/build-aux/qmi-codegen/Message.py
+@@ -53,7 +53,7 @@ class Message:
+ self.fullname = self.prefix + ' ' + self.service + ' ' + self.name
+
+ # Create the ID enumeration name
+- self.id_enum_name = string.upper(utils.build_underscore_name(self.fullname))
++ self.id_enum_name = utils.build_underscore_name(self.fullname).upper()
+
+ # Build output container.
+ # Every defined message will have its own output container, which
+--- a/build-aux/qmi-codegen/MessageList.py
++++ b/build-aux/qmi-codegen/MessageList.py
+@@ -109,7 +109,7 @@ class MessageList:
+ messages of a given service.
+ """
+ def __emit_get_printable(self, hfile, cfile):
+- translations = { 'service' : string.lower(self.service) }
++ translations = { 'service' : self.service.lower() }
+
+ template = (
+ '\n'
+@@ -175,7 +175,7 @@ class MessageList:
+ introduced.
+ """
+ def __emit_get_version_introduced(self, hfile, cfile):
+- translations = { 'service' : string.lower(self.service) }
++ translations = { 'service' : self.service.lower() }
+
+ template = (
+ '\n'
+--- a/build-aux/qmi-codegen/Variable.py
++++ b/build-aux/qmi-codegen/Variable.py
+@@ -45,7 +45,7 @@ class Variable:
+ self.needs_dispose = False
+
+ self.endian = "QMI_ENDIAN_LITTLE"
+- if dictionary.has_key('endian'):
++ if 'endian' in dictionary:
+ endian = dictionary['endian']
+ if endian == 'network' or endian == 'big':
+ self.endian = "QMI_ENDIAN_BIG"
+--- a/build-aux/qmi-codegen/VariableArray.py
++++ b/build-aux/qmi-codegen/VariableArray.py
+@@ -86,7 +86,7 @@ class VariableArray(Variable):
+ def clear_func_name(self):
+ # element public format might be a base type like 'gchar *' rather
+ # than a structure name like QmiFooBar
+- elt_name = string.replace(self.array_element.public_format, '*', 'pointer')
++ elt_name = self.array_element.public_format.replace('*', 'pointer')
+ return utils.build_underscore_name(self.name) + \
+ '_' + \
+ utils.build_underscore_name_from_camelcase(utils.build_camelcase_name(elt_name))
+--- a/build-aux/qmi-codegen/VariableInteger.py
++++ b/build-aux/qmi-codegen/VariableInteger.py
+@@ -247,7 +247,7 @@ class VariableInteger(Variable):
+ '${lp} g_string_append_printf (${printable}, "%s", tmp ? "yes" : "no");\n')
+ elif self.public_format != self.private_format:
+ translations['public_type_underscore'] = utils.build_underscore_name_from_camelcase(self.public_format)
+- translations['public_type_underscore_upper'] = string.upper(utils.build_underscore_name_from_camelcase(self.public_format))
++ translations['public_type_underscore_upper'] = utils.build_underscore_name_from_camelcase(self.public_format).upper()
+ template += (
+ '#if defined __${public_type_underscore_upper}_IS_ENUM__\n'
+ '${lp} g_string_append_printf (${printable}, "%s", ${public_type_underscore}_get_string ((${public_format})tmp));\n'
+--- a/build-aux/qmi-codegen/utils.py
++++ b/build-aux/qmi-codegen/utils.py
+@@ -54,7 +54,7 @@ def add_copyright(f):
+ Build a header guard string based on the given filename
+ """
+ def build_header_guard(output_name):
+- return "__LIBQMI_GLIB_" + string.upper(string.replace (output_name, '-', '_')) + "__"
++ return "__LIBQMI_GLIB_" + output_name.replace('-', '_').upper() + "__"
+
+
+ """
+@@ -145,7 +145,7 @@ Build an underscore name from the given full name
+ e.g.: "This is a message" --> "this_is_a_message"
+ """
+ def build_underscore_name(name):
+- return string.lower(string.replace (name, ' ', '_'))
++ return name.replace(' ', '_').lower()
+
+
+ """
+@@ -153,7 +153,7 @@ Build an underscore uppercase name from the given full name
+ e.g.: "This is a message" --> "THIS_IS_A_MESSAGE"
+ """
+ def build_underscore_uppercase_name(name):
+- return string.upper(string.replace (name, ' ', '_'))
++ return name.replace(' ', '_').upper()
+
+
+ """
+@@ -170,7 +170,7 @@ Build a camelcase name from the given full name
+ e.g.: "This is a message" --> "ThisIsAMessage"
+ """
+ def build_camelcase_name(name):
+- return string.replace(string.capwords(name), ' ', '')
++ return string.capwords(name).replace(' ', '')
+
+
+ """
+@@ -178,7 +178,7 @@ Build a dashed lowercase name from the given full name
+ e.g.: "This is a message" --> "this-is-a-message"
+ """
+ def build_dashed_name(name):
+- return string.replace(string.lower(name), ' ', '-')
++ return name.replace(' ', '-').lower()
+
+
+ """