[Pkg-fonts-bugs] Ubuntu fontforge 0.0.20100501-3ubuntu2
Ubuntu Merge-o-Matic
mom at ubuntu.com
Sun Dec 12 11:19:51 UTC 2010
This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes. It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
-------------- next part --------------
Format: 1.8
Date: Sat, 11 Dec 2010 11:44:05 +0100
Source: fontforge
Binary: fontforge fontforge-nox libfontforge-dev libfontforge1 libgdraw4 python-fontforge
Architecture: source
Version: 0.0.20100501-3ubuntu2
Distribution: natty
Urgency: low
Maintainer: Debian Fonts Task Force <pkg-fonts-devel at lists.alioth.debian.org>
Changed-By: Matthias Klose <doko at ubuntu.com>
Description:
fontforge - font editor
fontforge-nox - font editor - non-X version
libfontforge-dev - font editor - runtime library (development files)
libfontforge1 - font editor - runtime library
libgdraw4 - font editor - runtime graphics and widget library
python-fontforge - font editor - Python bindings
Changes:
fontforge (0.0.20100501-3ubuntu2) natty; urgency=low
.
* Fix build failure with python2.7.
Checksums-Sha1:
536ec8cddddd13c5c89849ce91e6e801a7d84dc3 1825 fontforge_0.0.20100501-3ubuntu2.dsc
e4d3a4a3702ebd04467e2e06d79bfed6661af3d6 22062 fontforge_0.0.20100501-3ubuntu2.debian.tar.gz
Checksums-Sha256:
88f882f7ec1b092c09ef6d6c72b19d1a7c0bd053297e6d458c3679e49c249c57 1825 fontforge_0.0.20100501-3ubuntu2.dsc
1627943825f021ad8ef53a754511c3dd06c91ce727f39c3239e9658d34063ea2 22062 fontforge_0.0.20100501-3ubuntu2.debian.tar.gz
Files:
523b733b5ca3dd47dd08c126c0a58055 1825 fonts optional fontforge_0.0.20100501-3ubuntu2.dsc
4e0569209dcbab5104964212197ba085 22062 fonts optional fontforge_0.0.20100501-3ubuntu2.debian.tar.gz
-------------- next part --------------
diff -pruN 0.0.20100501-3ubuntu1/debian/changelog 0.0.20100501-3ubuntu2/debian/changelog
--- 0.0.20100501-3ubuntu1/debian/changelog 2010-12-03 22:10:31.000000000 +0000
+++ 0.0.20100501-3ubuntu2/debian/changelog 2010-12-11 10:44:29.000000000 +0000
@@ -1,3 +1,9 @@
+fontforge (0.0.20100501-3ubuntu2) natty; urgency=low
+
+ * Fix build failure with python2.7.
+
+ -- Matthias Klose <doko at ubuntu.com> Sat, 11 Dec 2010 11:44:05 +0100
+
fontforge (0.0.20100501-3ubuntu1) natty; urgency=low
* Fix build failure with ld --as-needed.
diff -pruN 0.0.20100501-3ubuntu1/debian/patches/901_python27_compat.diff 0.0.20100501-3ubuntu2/debian/patches/901_python27_compat.diff
--- 0.0.20100501-3ubuntu1/debian/patches/901_python27_compat.diff 1970-01-01 01:00:00.000000000 +0100
+++ 0.0.20100501-3ubuntu2/debian/patches/901_python27_compat.diff 2010-12-11 10:42:40.000000000 +0000
@@ -0,0 +1,11 @@
+--- ./fontforge/ffpython.h~ 2010-04-05 22:10:26.000000000 +0200
++++ ./fontforge/ffpython.h 2010-12-11 11:41:47.817184818 +0100
+@@ -43,7 +43,7 @@
+
+ #define STRING_CHECK PyBytes_Check
+ #define STRING_TO_PY PyBytes_FromString
+-#define DECODE_UTF8(s, size, errors) PyBytes_Decode(s, size, "UTF-8", errors)
++#define DECODE_UTF8(s, size, errors) PyString_Decode(s, size, "UTF-8", errors)
+ #define PYBYTES_UTF8(str) PyString_AsEncodedObject(str, "UTF-8", NULL)
+ #define STRING_FROM_FORMAT PyBytes_FromFormat
+
diff -pruN 0.0.20100501-3ubuntu1/debian/patches/series 0.0.20100501-3ubuntu2/debian/patches/series
--- 0.0.20100501-3ubuntu1/debian/patches/series 2010-12-03 22:12:08.000000000 +0000
+++ 0.0.20100501-3ubuntu2/debian/patches/series 2010-12-11 10:42:58.000000000 +0000
@@ -9,3 +9,4 @@
110_fix_incorrect_locale_code.diff
900_debian_HelpDir_path.diff
901_ld_as_needed.diff
+901_python27_compat.diff
diff -pruN 0.0.20100501-3ubuntu1/fontforge/ffpython.h 0.0.20100501-3ubuntu2/fontforge/ffpython.h
--- 0.0.20100501-3ubuntu1/fontforge/ffpython.h 2010-04-05 21:10:26.000000000 +0100
+++ 0.0.20100501-3ubuntu2/fontforge/ffpython.h 2010-12-12 10:55:04.000000000 +0000
@@ -43,7 +43,7 @@
#define STRING_CHECK PyBytes_Check
#define STRING_TO_PY PyBytes_FromString
-#define DECODE_UTF8(s, size, errors) PyBytes_Decode(s, size, "UTF-8", errors)
+#define DECODE_UTF8(s, size, errors) PyString_Decode(s, size, "UTF-8", errors)
#define PYBYTES_UTF8(str) PyString_AsEncodedObject(str, "UTF-8", NULL)
#define STRING_FROM_FORMAT PyBytes_FromFormat
diff -pruN 0.0.20100501-3ubuntu1/.pc/901_python27_compat.diff/fontforge/ffpython.h 0.0.20100501-3ubuntu2/.pc/901_python27_compat.diff/fontforge/ffpython.h
--- 0.0.20100501-3ubuntu1/.pc/901_python27_compat.diff/fontforge/ffpython.h 1970-01-01 01:00:00.000000000 +0100
+++ 0.0.20100501-3ubuntu2/.pc/901_python27_compat.diff/fontforge/ffpython.h 2010-04-05 21:10:26.000000000 +0100
@@ -0,0 +1,115 @@
+/* Copyright (C) 2007-2010 by George Williams */
+/*
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+
+ * The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if PY_MAJOR_VERSION >= 3
+
+#define PyInt_Check PyLong_Check
+#define PyInt_AsLong PyLong_AsLong
+#define PyInt_FromLong PyLong_FromLong
+
+#define STRING_CHECK PyUnicode_Check
+#define STRING_TO_PY PyUnicode_FromString
+#define DECODE_UTF8(s, size, errors) PyUnicode_DecodeUTF8(s, size, errors)
+#define PYBYTES_UTF8(str) PyUnicode_AsUTF8String(str)
+#define STRING_FROM_FORMAT PyUnicode_FromFormat
+
+#define PICKLE "pickle"
+
+#else /* PY_MAJOR_VERSION >= 3 */
+
+#define STRING_CHECK PyBytes_Check
+#define STRING_TO_PY PyBytes_FromString
+#define DECODE_UTF8(s, size, errors) PyBytes_Decode(s, size, "UTF-8", errors)
+#define PYBYTES_UTF8(str) PyString_AsEncodedObject(str, "UTF-8", NULL)
+#define STRING_FROM_FORMAT PyBytes_FromFormat
+
+#define PICKLE "cPickle"
+
+#endif /* PY_MAJOR_VERSION >= 3 */
+
+
+#if !defined( Py_RETURN_NONE )
+/* Not defined before 2.4 */
+# define Py_RETURN_NONE return( Py_INCREF(Py_None), Py_None )
+#endif
+#define Py_RETURN(self) return( Py_INCREF((PyObject *) (self)), (PyObject *) (self) )
+
+#ifndef PyMODINIT_FUNC /* declarations for DLL import/export */
+#define PyMODINIT_FUNC void
+#endif
+
+#if PY_MAJOR_VERSION < 2 || (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION <= 5)
+#define PyBytesObject PyStringObject
+#define PyBytes_Type PyString_Type
+
+#define PyBytes_Check PyString_Check
+#define PyBytes_CheckExact PyString_CheckExact
+#define PyBytes_CHECK_INTERNED PyString_CHECK_INTERNED
+#define PyBytes_AS_STRING PyString_AS_STRING
+#define PyBytes_GET_SIZE PyString_GET_SIZE
+#define Py_TPFLAGS_BYTES_SUBCLASS Py_TPFLAGS_STRING_SUBCLASS
+
+#define PyBytes_FromStringAndSize PyString_FromStringAndSize
+#define PyBytes_FromString PyString_FromString
+#define PyBytes_FromFormatV PyString_FromFormatV
+#define PyBytes_FromFormat PyString_FromFormat
+#define PyBytes_Size PyString_Size
+#define PyBytes_AsString PyString_AsString
+#define PyBytes_Repr PyString_Repr
+#define PyBytes_Concat PyString_Concat
+#define PyBytes_ConcatAndDel PyString_ConcatAndDel
+#define _PyBytes_Resize _PyString_Resize
+#define _PyBytes_Eq _PyString_Eq
+#define PyBytes_Format PyString_Format
+#define _PyBytes_FormatLong _PyString_FormatLong
+#define PyBytes_DecodeEscape PyString_DecodeEscape
+#define _PyBytes_Join _PyString_Join
+#define PyBytes_Decode PyString_Decode
+#define PyBytes_Encode PyString_Encode
+#define PyBytes_AsEncodedObject PyString_AsEncodedObject
+#define PyBytes_AsEncodedString PyString_AsEncodedString
+#define PyBytes_AsDecodedObject PyString_AsDecodedObject
+#define PyBytes_AsDecodedString PyString_AsDecodedString
+#define PyBytes_AsStringAndSize PyString_AsStringAndSize
+#define _PyBytes_InsertThousandsGrouping _PyString_InsertThousandsGrouping
+#endif
+
+#if PY_MAJOR_VERSION < 2 || (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION <= 4)
+typedef int Py_ssize_t;
+#endif
+
+struct flaglist { char *name; int flag; };
+
+extern SplineChar *sc_active_in_ui;
+extern FontViewBase *fv_active_in_ui;
+extern int layer_active_in_ui;
+
+extern void FfPy_Replace_MenuItemStub(PyObject *(*func)(PyObject *,PyObject *));
+extern PyObject *PySC_From_SC(SplineChar *sc);
+extern PyObject *PyFV_From_FV(FontViewBase *fv);
+extern int FlagsFromTuple(PyObject *tuple,struct flaglist *flags);
+extern void PyFF_Glyph_Set_Layer(SplineChar *sc,int layer);
diff -pruN 0.0.20100501-3ubuntu1/.pc/applied-patches 0.0.20100501-3ubuntu2/.pc/applied-patches
--- 0.0.20100501-3ubuntu1/.pc/applied-patches 2010-12-12 10:55:09.000000000 +0000
+++ 0.0.20100501-3ubuntu2/.pc/applied-patches 2010-12-12 10:55:04.000000000 +0000
@@ -9,3 +9,4 @@
110_fix_incorrect_locale_code.diff
900_debian_HelpDir_path.diff
901_ld_as_needed.diff
+901_python27_compat.diff
More information about the Pkg-fonts-bugs
mailing list