[lightspark] 05/08: Update patches.

Gabriele Giacone gg0-guest at moszumanska.debian.org
Tue May 12 19:02:51 UTC 2015


This is an automated email from the git hooks/post-receive script.

gg0-guest pushed a commit to branch master
in repository lightspark.

commit 308791dff7addf907266ede29492618d02f05894
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Tue May 12 15:12:25 2015 +0200

    Update patches.
---
 debian/changelog            |  2 ++
 debian/patches/assert.patch | 21 +++++++++++++++++++++
 debian/patches/series       |  9 +++++----
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 274af78..9d14ec7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 lightspark (0.7.2+git20150512-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot.
+  * Remove fix-for-llvm3[345] and libav10 patches.
+  * Add patch to fix build, undefined var in assertion.
 
  -- Gabriele Giacone <1o5g4r8o at gmail.com>  Tue, 12 May 2015 15:03:34 +0200
 
diff --git a/debian/patches/assert.patch b/debian/patches/assert.patch
new file mode 100644
index 0000000..b9825b4
--- /dev/null
+++ b/debian/patches/assert.patch
@@ -0,0 +1,21 @@
+Description: Fix FTBFS, remove undefined var in assertions.
+Author: Gabriele Giacone <1o5g4r8o at gmail.com>
+
+--- a/src/tiny_string.cpp
++++ b/src/tiny_string.cpp
+@@ -508,7 +508,6 @@ tiny_string tiny_string::lowercase() con
+ 	uint32_t len = 0;
+ 	for (CharIterator it=begin(); it!=end(); it++)
+ 	{
+-		assert(pend-p >= 6);
+ 		gunichar c = g_unichar_tolower(*it);
+ 		gint n = g_unichar_to_utf8(c, p);
+ 		p += n;
+@@ -530,7 +529,6 @@ tiny_string tiny_string::uppercase() con
+ 	uint32_t len = 0;
+ 	for (CharIterator it=begin(); it!=end(); it++)
+ 	{
+-		assert(pend-p >= 6);
+ 		gunichar c = g_unichar_toupper(*it);
+ 		gint n = g_unichar_to_utf8(c, p);
+ 		p += n;
diff --git a/debian/patches/series b/debian/patches/series
index b3abdde..900d479 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
-fix-for-llvm33.patch
-fix-for-llvm34.patch
-fix-for-llvm35.patch
-libav10.patch
+#fix-for-llvm33.patch
+#fix-for-llvm34.patch
+#fix-for-llvm35.patch
+#libav10.patch
+assert.patch

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-flash/lightspark.git



More information about the pkg-flash-devel mailing list