The following commit has been merged in the debian-experimental-3.5 branch:
commit 03b42d55fc1b334228c60bec3ec1f1cfa5a48aa2
Author: Rene Engelhard <r...@debian.org>
Date: Mon Mar 12 20:16:24 2012 +0100
backport from libreoffice-3-5; fix breakages in python2 after python3 fixes
diff --git a/changelog b/changelog
index f9e27ba..e58aca8 100644
--- a/changelog
+++ b/changelog
@@ -18,6 +18,8 @@ libreoffice (1:3.5.1~rc2-1) UNRELEASED; urgency=low
* debian/patches/bibliography-no-crash-if-no-base.diff: backport fix
from libreoffice-3-5 to not crash Tools -> Bibliography if -base isn't
installed (closes: #602953, #598809)
+ * debian/patches/pyuno_fix_python2.diff: backport from libreoffice-3-5.
+ As name says, fix breakages in python2 after python3 fixes
* debian/rules: rename ext-sources to src, as done upstream
* debian/control.fonts.in: make ttf-opensymbol Priority: extra, thanks
@@ -47,15 +49,11 @@ libreoffice (1:3.5.1~rc2-1) UNRELEASED; urgency=low
the respetive extensions. Run sync_extensions after rm -rf'ing the
dir already in preinst (upgrade) (closes: #658646)
-<<<<<<< HEAD
[ Bjoern Michaelsen ]
* debian/patches/fix-quickstart-shutdown.diff: fix logout with
quickstarter (closes: #632920, #605268)
- -- Rene Engelhard <r...@debian.org> Tue, 06 Mar 2012 22:30:46 +0100
-=======
- -- Rene Engelhard <r...@debian.org> Tue, 06 Mar 2012 23:59:54 +0000
->>>>>>> origin/master
+ -- Rene Engelhard <r...@debian.org> Mon, 12 Mar 2012 20:14:46 +0100
libreoffice (1:3.5.0-2) experimental; urgency=low
diff --git a/patches/pyuno_fix_python2.diff b/patches/pyuno_fix_python2.diff
new file mode 100644
index 0000000..5d80574
--- /dev/null
+++ b/patches/pyuno_fix_python2.diff
@@ -0,0 +1,71 @@
+From 82bf2998cb243f3269e39de8daee56cb6bc04550 Mon Sep 17 00:00:00 2001
+From: David Bolen <db3l....@gmail.com>
+Date: Wed, 07 Mar 2012 10:13:52 +0000
+Subject: fdo#46926: fix UNO struct comparison in Python 2
+
+This requires setting a rich comparison flag in Python 2, while Python 3
+uses rich comparison by default.
+(regression from a09ce46818fd4d5e08b3af9a478501cd8ef5b4fe)
+(cherry picked from commit 387389b644b91808fdee74846b2d855382f48ed7)
+
+Signed-off-by: Caolán McNamara <caol...@redhat.com>
+
+From fc290187f08981c734d1f2d3f6649c94e3ac6f99 Mon Sep 17 00:00:00 2001
+From: David Bolen <db3l....@gmail.com>
+Date: Wed, 07 Mar 2012 10:07:42 +0000
+Subject: fdo#46859: adapt string type checks to work with both Python 2 and 3
+
+(regression from a09ce46818fd4d5e08b3af9a478501cd8ef5b4fe)
+(cherry picked from commit 4634cbc237239da771e0f6a81f78171ecec726ba)
+
+Signed-off-by: Caolán McNamara <caol...@redhat.com>
+
+From 94541ebd9eb95a47f40bac95f5f6982a562e5a4d Mon Sep 17 00:00:00 2001
+From: Michael Stahl <mst...@redhat.com>
+Date: Fri, 09 Mar 2012 10:28:28 +0000
+Subject: fdo#46926: fix the fix for Python 3
+
+Thanks to Maxime de Roucy for the hint that the "cmpfunc" type doesn't exist.
+(cherry picked from commit 06484b6946ac6a974c24af6624fb75bbe298c1e8)
+
+Signed-off-by: Caolán McNamara <caol...@redhat.com>
+
+diff -u b/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
+--- b/pyuno/source/module/pyuno.cxx
++++ b/pyuno/source/module/pyuno.cxx
+@@ -641,9 +641,16 @@
+ {
+ raisePyExceptionWithAny( makeAny( e ) );
+ }
+- return Py_False;
++ return (op == Py_EQ ? Py_False : Py_True);
+ }
+
++/* Python 2 has a tp_flags value for rich comparisons. Python 3 does not (on
by default) */
++#ifdef Py_TPFLAGS_HAVE_RICHCOMPARE
++#define TP_FLAGS (Py_TPFLAGS_HAVE_RICHCOMPARE)
++#else
++#define TP_FLAGS 0
++#endif
++
+ static PyTypeObject PyUNOType =
+ {
+ PyVarObject_HEAD_INIT( &PyType_Type, 0 )
+@@ -654,7 +661,7 @@
+ (printfunc) 0,
+ (getattrfunc) PyUNO_getattr,
+ (setattrfunc) PyUNO_setattr,
+- 0,
++ /* this type does not exist in Python 3: (cmpfunc) */ 0,
+ (reprfunc) PyUNO_repr,
+ 0,
+ 0,
+@@ -665,7 +672,7 @@
+ (getattrofunc)0,
+ (setattrofunc)0,
+ NULL,
+- 0,
++ TP_FLAGS,
+ NULL,
+ (traverseproc)0,
+ (inquiry)0,
diff --git a/patches/series b/patches/series
index 0d60826..0d4d4e1 100644
--- a/patches/series
+++ b/patches/series
@@ -33,3 +33,4 @@ armhf-bridges-doubles.diff
debian-hardened-buildflags.diff
fix-quickstart-shutdown.diff
bibliography-no-crash-if-no-base.diff
+pyuno_fix_python2.diff
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1s7ajd-00087w...@vasks.debian.org
