[pygobject2/f15/master] add patch to test possible fix for bug #682543
John Palmieri (J5)
johnp at fedoraproject.org
Wed Mar 23 14:49:49 UTC 2011
commit c8a57939a06d0803755b29eb55e68d1bebbf12b7
Author: John (J5) Palmieri <johnp at redhat.com>
Date: Wed Mar 23 10:49:01 2011 -0400
add patch to test possible fix for bug #682543
...when-converting-objects-to-strings-gvalue.patch | 48 ++++++++++++++++++++
pygobject2.spec | 7 +++-
2 files changed, 54 insertions(+), 1 deletions(-)
---
diff --git a/0001-fix-a-typo-when-converting-objects-to-strings-gvalue.patch b/0001-fix-a-typo-when-converting-objects-to-strings-gvalue.patch
new file mode 100644
index 0000000..ce19894
--- /dev/null
+++ b/0001-fix-a-typo-when-converting-objects-to-strings-gvalue.patch
@@ -0,0 +1,48 @@
+From 075ead0533ba311120b3ca9ac9ae75ca84ace8fb Mon Sep 17 00:00:00 2001
+From: John (J5) Palmieri <johnp at redhat.com>
+Date: Wed, 23 Mar 2011 10:39:19 -0400
+Subject: [PATCH] fix a typo when converting objects to strings gvalues
+
+---
+ gobject/pygtype.c | 4 ++--
+ tests/test_properties.py | 8 ++++++++
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/gobject/pygtype.c b/gobject/pygtype.c
+index f317b3b..5ee54aa 100644
+--- a/gobject/pygtype.c
++++ b/gobject/pygtype.c
+@@ -904,9 +904,9 @@ pyg_value_from_pyobject(GValue *value, PyObject *obj)
+ }
+ } else {
+ #if PY_VERSION_HEX < 0x03000000
+- g_value_set_string(value, PyString_AsString(obj));
++ g_value_set_string(value, PyString_AsString(tmp_str));
+ #else
+- tmp = PyUnicode_AsUTF8String(obj);
++ tmp = PyUnicode_AsUTF8String(tmp_str);
+ g_value_set_string(value, PyBytes_AsString(tmp));
+ Py_DECREF(tmp);
+ #endif
+diff --git a/tests/test_properties.py b/tests/test_properties.py
+index 1499903..54afd11 100644
+--- a/tests/test_properties.py
++++ b/tests/test_properties.py
+@@ -88,6 +88,14 @@ class TestProperties(unittest.TestCase):
+ obj.props.normal = UNICODE_UTF8
+ self.assertEqual(obj.props.normal, TEST_UTF8)
+
++ def testIntToStr(self):
++ obj = new(PropertyObject, construct_only=1)
++ self.assertEqual(obj.props.construct_only, '1')
++ obj.set_property('construct', '2')
++ self.assertEqual(obj.props.construct, '2')
++ obj.props.normal = 3
++ self.assertEqual(obj.props.normal, '3')
++
+ def testConstructOnly(self):
+ obj = new(PropertyObject, construct_only="123")
+ self.assertEqual(obj.props.construct_only, "123")
+--
+1.7.4.1
+
diff --git a/pygobject2.spec b/pygobject2.spec
index 558dda7..24251a6 100644
--- a/pygobject2.spec
+++ b/pygobject2.spec
@@ -12,7 +12,7 @@
Name: pygobject2
Version: 2.28.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
Group: Development/Languages
Summary: Python 2 bindings for GObject
@@ -20,6 +20,9 @@ URL: http://www.pygtk.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
#VCS: git:git://git.gnome.org/pygobject
Source: http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.28/pygobject-%{version}.tar.bz2
+
+Patch0: 0001-fix-a-typo-when-converting-objects-to-strings-gvalue.patch
+
### Build Dependencies ###
BuildRequires: glib2-devel >= %{glib2_version}
@@ -89,6 +92,7 @@ for use in Python 3 programs.
%prep
%setup -q -n pygobject-%{version}
+%patch0 -p1 -b .int_to_str
%if 0%{?with_python3}
rm -rf %{py3dir}
@@ -128,6 +132,7 @@ make DESTDIR=$RPM_BUILD_ROOT install
find $RPM_BUILD_ROOT -name '*.la' -delete
find $RPM_BUILD_ROOT -name '*.a' -delete
+Patch0: 0001-fix-a-typo-when-converting-objects-to-strings-gvalue.patch1
rm examples/Makefile*
%files
More information about the scm-commits
mailing list