[python-sfml] 02/03: Add 05_Fix-documentation-errors-causing-build-failures-with.patch
James Cowgill
jcowgill-guest at moszumanska.debian.org
Sat Jun 6 23:37:22 UTC 2015
This is an automated email from the git hooks/post-receive script.
jcowgill-guest pushed a commit to branch master
in repository python-sfml.
commit fb4e898a1ee602d85a0d44e87a0db31bc2cb214f
Author: James Cowgill <james410 at cowgill.org.uk>
Date: Sun Jun 7 00:14:12 2015 +0100
Add 05_Fix-documentation-errors-causing-build-failures-with.patch
---
...tation-errors-causing-build-failures-with.patch | 218 +++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 219 insertions(+)
diff --git a/debian/patches/05_Fix-documentation-errors-causing-build-failures-with.patch b/debian/patches/05_Fix-documentation-errors-causing-build-failures-with.patch
new file mode 100644
index 0000000..32b6b86
--- /dev/null
+++ b/debian/patches/05_Fix-documentation-errors-causing-build-failures-with.patch
@@ -0,0 +1,218 @@
+Description: Fix documentation errors causing build failures with sphinx 1.3
+ Note the forwarded version has a few more changes in it to fix mistakes
+ introduced since python-sfml 1.3
+Author: James Cowgill <james410 at cowgill.org.uk>
+Bug-Debian: https://bugs.debian.org/787855
+Forwarded: https://github.com/Sonkun/python-sfml/pull/114
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/doc/source/api/graphics.rst
++++ b/doc/source/api/graphics.rst
+@@ -541,7 +541,7 @@ Image
+ jpeg. If this function fails, it raises an exception.
+
+ :raise: :exc:`IOError` - The image failed to load
+- :param string filename: Path of the image file to load
++ :param str filename: Path of the image file to load
+ :rtype: :class:`sfml.graphics.Image`
+
+ .. py:classmethod:: from_memory(data)
+@@ -565,7 +565,7 @@ Image
+ The destination file is overwritten if it already exists.
+
+ :raise: :exc:`IOError` - If the image is empty
+- :param string filename: Path of the file to save
++ :param str filename: Path of the file to save
+
+ .. py:method:: show()
+
+@@ -794,7 +794,7 @@ Texture
+ If this function fails, it raises an exception.
+
+ :raise: :class:`IOError` - The texture failed to load
+- :param string filename: Path of the image file to load
++ :param str filename: Path of the image file to load
+ :param area: Area of the image to load
+ :type area: :class:`sfml.graphics.Rectangle`
+ :rtype: :class:`sfml.graphics.Texture`
+@@ -1123,7 +1123,7 @@ Font
+ This function raises an exception if it fails.
+
+ :raise: :exc:`IOError` - The font failed to load
+- :param string filename: Path of the font file to load
++ :param str filename: Path of the font file to load
+ :rtype: :class:`sfml.graphics.Font`
+
+ .. py:classmethod:: from_memory(data)
+@@ -1254,8 +1254,8 @@ Shader
+ writing your own shaders.
+
+ :raise: :exc:`IOError` - If one of the two shaders failed to load
+- :param string vertex_filename: Path of the vertex or fragment shader file to load
+- :param string fragment_filename: Path of the fragment shader file to load
++ :param str vertex_filename: Path of the vertex or fragment shader file to load
++ :param str fragment_filename: Path of the fragment shader file to load
+ :rtype: :class:`sfml.graphics.Shader`
+
+
+@@ -1272,8 +1272,8 @@ Shader
+ shaders.
+
+ :raise: :exc:`IOError` - If one of the two shaders failed to load
+- :param string vertex_shader: String containing the source code of the vertex shader
+- :param string fragment_shader: String containing the source code of the fragment shader
++ :param str vertex_shader: String containing the source code of the vertex shader
++ :param str fragment_shader: String containing the source code of the fragment shader
+ :rtype: :class:`sfml.graphics.Shader`
+
+ .. py:method:: set_parameter(*args, **kwargs)
+@@ -1324,8 +1324,8 @@ Shader
+ shader.set_1float_parameter("myparam", 5.2) # using the specific method (faster)
+ shader.set_parameter("myparam", 5.2) # using the general method
+
+- :param string name: Name of the parameter in the shader
+- :param x float: Value to assign
++ :param str name: Name of the parameter in the shader
++ :param float x: Value to assign
+
+ .. py:method:: set_2float_parameter(name, x, y)
+
+@@ -1344,9 +1344,9 @@ Shader
+ shader.set_2float_parameter("myparam", 5.2, 6) # using the specific method (faster)
+ shader.set_parameter("myparam", 5.2, 6) # using the general method
+
+- :param string name: Name of the parameter in the shader
+- :param x float: First component of the value to assign
+- :param y float: Second component of the value to assign
++ :param str name: Name of the parameter in the shader
++ :param float x: First component of the value to assign
++ :param float y: Second component of the value to assign
+
+ .. py:method:: set_3float_parameter(name, x, y, z)
+
+@@ -1365,10 +1365,10 @@ Shader
+ shader.set_3float_parameter("myparam", 5.2, 6, -8.1) # using the specific method (faster)
+ shader.set_parameter("myparam", 5.2, 6, -8.1) # using the general method
+
+- :param string name: Name of the parameter in the shader
+- :param x float: First component of the value to assign
+- :param y float: Second component of the value to assign
+- :param z float: Third component of the value to assign
++ :param str name: Name of the parameter in the shader
++ :param float x: First component of the value to assign
++ :param float y: Second component of the value to assign
++ :param float z: Third component of the value to assign
+
+ .. py:method:: set_4float_parameter(name, x, y, z, w)
+
+@@ -1387,11 +1387,11 @@ Shader
+ shader.set_4float_parameter("myparam", 5.2, 6, -8.1, 0.4) # using the specific method (faster)
+ shader.set_parameter("myparam", 5.2, 6, -8.1, 0.4) # using the general method
+
+- :param string name: Name of the parameter in the shader
+- :param x float: First component of the value to assign
+- :param y float: Second component of the value to assign
+- :param z float: Third component of the value to assign
+- :param w float: Fourth component of the value to assign
++ :param str name: Name of the parameter in the shader
++ :param float x: First component of the value to assign
++ :param float y: Second component of the value to assign
++ :param float z: Third component of the value to assign
++ :param float w: Fourth component of the value to assign
+
+ .. py:method:: set_vector2_paramater(name, vector)
+
+@@ -1412,7 +1412,7 @@ Shader
+ shader.set_parameter("myparam", sf.Vector2(5.2, 6)) # using the general method
+ shader.set_parameter("myparam", (5.2, 6)) # using tuple works too
+
+- :param string name: Name of the parameter in the shader
++ :param str name: Name of the parameter in the shader
+ :param sfml.system.Vector2 vector: Vector to assign
+
+ .. py:method:: set_vector3_paramater(name, vector)
+@@ -1433,7 +1433,7 @@ Shader
+ shader.set_parameter("myparam", sf.Vector3(5.2, 6, -8.1)) # using the general method
+ shader.set_parameter("myparam", (5.2, 6, -8.1)) # using tuple works too
+
+- :param string name: Name of the parameter in the shader
++ :param str name: Name of the parameter in the shader
+ :param sfml.system.Vector3 vector: Vector to assign
+
+ .. py:method:: set_color_parameter(name, color)
+@@ -1459,7 +1459,7 @@ Shader
+ shader.set_color_parameter("myparam", sf.Color(255, 128, 0, 255)) # using the specific method (faster)
+ shader.set_parameter("myparam", sf.Color(255, 128, 0, 255)) # using the general method
+
+- :param string name: Name of the parameter in the shader
++ :param str name: Name of the parameter in the shader
+ :param sfml.graphics.Color color: Color to assign
+
+ .. py:method:: set_transform_parameter(name, transform)
+@@ -1482,7 +1482,7 @@ Shader
+ shader.set_transform_parameter("matrix", transform) # using the specific method (faster)
+ shader.set_parameter("matrix", transform) # using the general method
+
+- :param string name: Name of the parameter in the shader
++ :param str name: Name of the parameter in the shader
+ :param sfml.graphics.Transform transform: Transform to assign
+
+ .. py:method:: set_texture_parameter(name, texture)
+@@ -1511,7 +1511,7 @@ Shader
+ To use the texture of the object being draw, which cannot be
+ known in advance, use :meth:`set_currenttexturetype_parameter`.
+
+- :param string name: Name of the parameter in the shader
++ :param str name: Name of the parameter in the shader
+ :param sfml.graphics.Texture texture: Texture to assign
+
+ .. py:method:: set_currenttexturetype_parameter(name)
+@@ -1994,7 +1994,7 @@ Text
+
+ Construct the string, and optionally from a string, font and size.
+
+- :param string: Text assigned to the string
++ :param str: Text assigned to the string
+ :type string: bytes or string
+ :param sfml.graphics.Font font: Font used to draw the string
+ :param integer character_size: Base size of characters, in pixels
+@@ -2908,7 +2908,7 @@ RenderWindow
+ usage of the graphics module.
+
+ :param sfml.window.VideoMode mode: Video mode to use (defines the width, height and depth of the rendering area of the window)
+- :param string title: Title of the window
++ :param str title: Title of the window
+ :param style: Window style
+ :type style: :class:`sfml.window.Style`'s constant
+ :param sfml.window.ContextSettings settings: Additional settings for the underlying OpenGL context
+--- a/doc/source/api/network.rst
++++ b/doc/source/api/network.rst
+@@ -54,7 +54,7 @@ IpAddress
+ Here address can be either a decimal address (ex: "192.168.1.56")
+ or a network name (ex: "localhost").
+
+- :param string string: IP address or network name
++ :param str string: IP address or network name
+ :rtype: :class:`sfml.network.IpAddress`
+
+ .. classmethod:: from_integer(integer)
+--- a/doc/source/api/window.rst
++++ b/doc/source/api/window.rst
+@@ -492,7 +492,7 @@ Window
+ etc.
+
+ :param sfml.window.VideoMode mode: Video mode to use (defines the width, height and depth of the rendering area of the window)
+- :param string title: Title of the window
++ :param str title: Title of the window
+ :param sfml.window.Style style: Window style
+ :param sfml.window.ContextSettings settings: Additional settings for the underlying OpenGL context
+
+@@ -501,7 +501,7 @@ Window
+ Recreate the window.
+
+ :param sfml.window.VideoMode mode: Video mode to use (defines the width, height and depth of the rendering area of the window)
+- :param string title: Title of the window
++ :param str title: Title of the window
+ :param sfml.window.Style style: Window style
+ :param sfml.window.ContextSettings settings: Additional settings for the underlying OpenGL context
+
diff --git a/debian/patches/series b/debian/patches/series
index 1db649f..64d4a4f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
02_disable-cython-headers.patch
03_disable-intersphinx.patch
04_Fixed-sf.Rectangle.interesects-method.patch
+05_Fix-documentation-errors-causing-build-failures-with.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/python-sfml.git
More information about the Pkg-games-commits
mailing list