r564 - in /packages/swfmill/trunk/debian: changelog control patches/series patches/swfmill_gcc-6.1.patch

[miriam at users.alioth.debian.org]

Author: miriam
Date: Thu May 19 17:09:06 2016
New Revision: 564

URL: http://svn.debian.org/wsvn/pkg-flash/?sc=1&rev=564
Log:
Fixed #810206 and #811726. Dropped B-D on libpng12-dev. It builds in GCC 6


Added:
    packages/swfmill/trunk/debian/patches/swfmill_gcc-6.1.patch
Modified:
    packages/swfmill/trunk/debian/changelog
    packages/swfmill/trunk/debian/control
    packages/swfmill/trunk/debian/patches/series

Modified: packages/swfmill/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-flash/packages/swfmill/trunk/debian/changelog?rev=564&op=diff
==============================================================================
--- packages/swfmill/trunk/debian/changelog	(original)
+++ packages/swfmill/trunk/debian/changelog	Thu May 19 17:09:06 2016
@@ -3,8 +3,10 @@
   * New upstream release
   * Upgraded compat level to 9
   * Upgraded Standards-Version from 3.9.3 to 3.9.8
-  * debial/rules: using dh_prep instead of dh_clean -k
+  * debian/rules: using dh_prep instead of dh_clean -k
   * Using Hardening Options. See https://wiki.debian.org/Hardening
+  * swfmill_gcc-6.1.patch: Fixed FTBFS with GCC 6. Closes: #811726
+  * debian/control: Dropped Build-Depends on libpng12-dev: Closes: #810206
 
  -- Miriam Ruiz <miriam at debian.org>  Thu, 19 May 2016 02:25:00 +0200
 

Modified: packages/swfmill/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-flash/packages/swfmill/trunk/debian/control?rev=564&op=diff
==============================================================================
--- packages/swfmill/trunk/debian/control	(original)
+++ packages/swfmill/trunk/debian/control	Thu May 19 17:09:06 2016
@@ -3,8 +3,7 @@
 Maintainer: Debian Flash Team <pkg-flash-devel at lists.alioth.debian.org>
 Uploaders: Miriam Ruiz <miriam at debian.org>
 Build-Depends: debhelper (>= 9), quilt, autotools-dev, pkg-config, help2man,
- xsltproc, libxml2-dev, libxslt1-dev, zlib1g-dev, libfreetype6-dev, 
- libpng-dev | libpng12-dev
+ xsltproc, libxml2-dev, libxslt1-dev, zlib1g-dev, libfreetype6-dev, libpng-dev
 Standards-Version: 3.9.8
 Section: libs
 Homepage: http://www.swfmill.org/

Modified: packages/swfmill/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-flash/packages/swfmill/trunk/debian/patches/series?rev=564&op=diff
==============================================================================
--- packages/swfmill/trunk/debian/patches/series	(original)
+++ packages/swfmill/trunk/debian/patches/series	Thu May 19 17:09:06 2016
@@ -1,2 +1,3 @@
 missing_files.patch
 freetype.patch
+swfmill_gcc-6.1.patch

Added: packages/swfmill/trunk/debian/patches/swfmill_gcc-6.1.patch
URL: http://svn.debian.org/wsvn/pkg-flash/packages/swfmill/trunk/debian/patches/swfmill_gcc-6.1.patch?rev=564&op=file
==============================================================================
--- packages/swfmill/trunk/debian/patches/swfmill_gcc-6.1.patch	(added)
+++ packages/swfmill/trunk/debian/patches/swfmill_gcc-6.1.patch	Thu May 19 17:09:06 2016
@@ -0,0 +1,31 @@
+Index: swfmill-0.3.3/src/swft/swft_import_jpeg.cpp
+===================================================================
+--- swfmill-0.3.3.orig/src/swft/swft_import_jpeg.cpp
++++ swfmill-0.3.3/src/swft/swft_import_jpeg.cpp
+@@ -10,7 +10,7 @@
+ #include <zlib.h>
+ 
+ #define TMP_STRLEN 0xff
+-const char jpeg_header[] = { 0xff, 0xd9, 0xff, 0xd8, 0 };
++const unsigned char jpeg_header[] = { 0xff, 0xd9, 0xff, 0xd8, 0 };
+ 
+ // defined in swft_import_png
+ bool compress( unsigned char *inputBuffer, int inLength, unsigned char *outputBuffer, int *outLength );
+@@ -140,7 +140,7 @@ void swft_import_jpeg( xmlXPathParserCon
+ 	if( stat( filename, &filestat ) ) goto fail;
+ 	size = filestat.st_size;
+ 	
+-	ofs = strlen(jpeg_header);
++	ofs = strlen(reinterpret_cast<const char*>(jpeg_header));
+ 	
+ 	rewind(fp);
+ 	data = new unsigned char[size+ofs];
+@@ -231,7 +231,7 @@ void swft_import_jpega( xmlXPathParserCo
+ 	if( stat( filename, &filestat ) ) goto fail;
+ 	size = filestat.st_size;
+ 	
+-	ofs = strlen(jpeg_header);
++	ofs = strlen(reinterpret_cast<const char*>(jpeg_header));
+ 	
+ 	rewind(fp);
+ 	jpegdata = new unsigned char[size+ofs];