control: tags -1 patch
On 2015-11-11 12:47:33 [-0800], Steve Langasek wrote:
> The utopia-documents package fails to build in unstable, now that swig has
> been updated to version 3.0.7:
The two patches attached will let build again. However due to #812823 I
don't think it makes sense to apply them.
Sebastian
Index: utopia-documents-2.4.4/libambrosia/ambrosia/utils.cpp
===================================================================
--- utopia-documents-2.4.4.orig/libambrosia/ambrosia/utils.cpp
+++ utopia-documents-2.4.4/libambrosia/ambrosia/utils.cpp
@@ -82,7 +82,7 @@ extern "C" {
glUseProgram = glUseProgramObjectARB;
#else
if (!glShaderSource && glShaderSourceARB)
- glShaderSource = (void (*)(GLuint, GLsizei, const GLchar**, const GLint*))glShaderSourceARB;
+ glShaderSource = (void (*)(GLuint, GLsizei, const GLchar* const*, const GLint*))glShaderSourceARB;
if (!glCompileShader && glCompileShaderARB)
glCompileShader = (void (*)(GLuint))glCompileShaderARB;
if (!glGetShaderiv && glGetObjectParameterivARB)
Index: utopia-documents-2.4.4/libutopia2/plugins/python/spine/spineapi_python.py
===================================================================
--- utopia-documents-2.4.4.orig/libutopia2/plugins/python/spine/spineapi_python.py
+++ utopia-documents-2.4.4/libutopia2/plugins/python/spine/spineapi_python.py
@@ -1,3 +1,4 @@
+%pythoncode %{
###############################################################################
#
# This file is part of the Utopia Documents application.
@@ -28,6 +29,7 @@
# along with Utopia Documents. If not, see <http://www.gnu.org/licenses/>
#
###############################################################################
+%}
%pythonappend Annotation::Annotation() {
self.beginRegion()
@@ -159,12 +161,12 @@
else:
return input
- #print (before, label, after)
+ # %{ print (before, label, after) }%
before, label, after = (fuzz(before), fuzz(label, strict = True), fuzz(after))
- #print (before, label, after)
+ # %{ print (before, label, after) }%
regex = "%s.?(%s).?%s" % (before, label, after)
- # Now ignore whole matches, and get only the sub-string matches
+ # %{ Now ignore whole matches, and get only the sub-string matches }%
return self.search(regex, spineapi.RegExp + spineapi.IgnoreCase)[1::2]
def annotations(self, scratch = None):
@@ -252,7 +254,7 @@
try:
del self[key]
except KeyError:
- # Ignore
+ # {% Ignore }%
pass
for i in value:
self.insertProperty(key, unicode(i))
@@ -334,7 +336,7 @@
def appendTextExtent(self, extent):
self.regions += extent.boundingBoxes()
- # FIXME how to add text content?
+ # %{ FIXME how to add text content? }%
def content(self):
strippedtxt=self.rich_content
@@ -348,23 +350,23 @@
if cursor.wordValid():
text=cursor.wordText().strip()
- # replace existing underscores with double underscores
- # we will of course fail to preserve existing double underscores
+ # %{ replace existing underscores with double underscores }%
+ # %{ we will of course fail to preserve existing double underscores }%
text.replace('_', "\x2017")
- # add a space or font change character if neccessary
+ # %{ add a space or font change character if neccessary }%
if self.rich_content:
- # deal with hyphenated lines
- # (hyphenated words should already include the hyphen)
+ # %{ deal with hyphenated lines }%
+ # %{ (hyphenated words should already include the hyphen) }%
need_space=True
- # shame python does not understand unicode classes
+ # %{ shame python does not understand unicode classes }%
if self.rich_content[-1] in [u"-", u"\x058A", u"\x2010", u"\x2013", u"\x2014", u"\xFE63", u"\xFF0D"]:
self.rich_content= self.rich_content[0:-1]
need_space=False
- # Mark font changes
+ # %{ Mark font changes }%
if cursor.wordFontName() != self.last_font:
self.rich_content+="_"
self.last_font=cursor.wordFontName()
@@ -375,7 +377,7 @@
self.rich_content=''
self.last_font=cursor.wordFontName()
- # add text
+ # %{ add text }%
self.rich_content+= text
}
Index: utopia-documents-2.4.4/libutopia2_auth/plugins/python/utopia/auth.i
===================================================================
--- utopia-documents-2.4.4.orig/libutopia2_auth/plugins/python/utopia/auth.i
+++ utopia-documents-2.4.4/libutopia2_auth/plugins/python/utopia/auth.i
@@ -125,8 +125,8 @@ std::string _getServiceBaseUri(const std
self.state['lock'] = threading.Lock()
def __call__(self, oldToken):
- # Only one simulataneous call allowed per auth server
- # All waiting calls block and they all share the returned token
+ # %{ Only one simulataneous call allowed per auth server }%
+ # %{ All waiting calls block and they all share the returned token }%
newToken = self.state['authToken']
if (newToken is None) or oldToken == newToken:
if not self.state['lock'].acquire(False):
