[ming] 05/13: Remove patches applied upstream.

[Gabriele Giacone]

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

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

commit bf3179a44b424c08b7d15f8ab5fc01391684c067
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Thu May 14 17:35:44 2015 +0200

    Remove patches applied upstream.
---
 debian/changelog        |   2 +-
 debian/patches/04_bison | 113 ------------------------------------------------
 debian/patches/05_hurd  |  17 --------
 debian/patches/06_ungif |  16 -------
 debian/patches/series   |   3 --
 5 files changed, 1 insertion(+), 150 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1a652d8..690431c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 ming (1:0.4.6-1) unstable; urgency=medium
 
   * New upstream release.
-  * Do not hardcode /usr/lib/perl5 in d/rules and d/*.install (Closes: #752716).
+  * Remove 04_bison 05_hurd 06_ungif patches, applied upstream.
   * Switch to 3.0 (quilt) format.
   * Remove non debian/ changes.
   * Add Vcs-* fields.
diff --git a/debian/patches/04_bison b/debian/patches/04_bison
deleted file mode 100644
index 434fb95..0000000
--- a/debian/patches/04_bison
+++ /dev/null
@@ -1,113 +0,0 @@
-Description: Fix build with recent bison versions.
-Author: Gabriele Giacone <1o5g4r8o at gmail.com>
-Origin: upstream, https://github.com/libming/libming/commit/8745e080324be997b2eaebc7bd9c0284130d55ff
-
---- a/src/actioncompiler/compile.h
-+++ b/src/actioncompiler/compile.h
-@@ -17,7 +17,7 @@ extern int swfVersion;
- typedef struct _buffer *Buffer;
- 
- /* shut up bison.simple */
--void yyerror(char *msg);
-+void yyerror(void *buffer, char *msg);
- int yylex();
- 
- #ifndef max
---- a/src/actioncompiler/swf4compiler.y
-+++ b/src/actioncompiler/swf4compiler.y
-@@ -16,6 +16,8 @@
- 
- %}
- 
-+%parse-param {void *buffer}
-+
- %union {
-   Buffer action;
-   char *str;
---- a/src/actioncompiler/swf5compiler.y
-+++ b/src/actioncompiler/swf5compiler.y
-@@ -25,6 +25,8 @@ static int classContext = 0;
- 
- %}
- 
-+%parse-param {void *buffer}
-+
- %union
- {
-   Buffer action;
-@@ -261,7 +263,7 @@ class_init
- 	{
- 		if(classContext)
- 		{
--			swf5error("Nested classes are not allowed\n");
-+			swf5error(NULL, "Nested classes are not allowed\n");
- 			YYABORT;
- 		}
- 		classContext = 1;
-@@ -391,7 +393,7 @@ return_stmt
- 		{ int tmp = chkctx(CTX_FUNCTION);
- 		  if(tmp < 0) 
- 		  {
--			swf5error("return outside function");
-+			swf5error(NULL, "return outside function");
- 			YYABORT;
- 		  }
- 		  $$ = newBuffer();
-@@ -404,7 +406,7 @@ return_stmt
- 		{ int tmp = chkctx(CTX_FUNCTION);
- 		  if(tmp < 0)
- 		  {
--			swf5error("return outside function");
-+			swf5error(NULL, "return outside function");
- 			YYABORT;
- 		  }
- 		  $$ = newBuffer();
-@@ -877,7 +879,7 @@ cont_stmt
- 		{ 
- 		  if(chkctx(CTX_CONTINUE) < 0)
- 		  {
--			swf5error("continue outside loop");
-+			swf5error(NULL, "continue outside loop");
- 			YYABORT;
- 		  }
- 		  $$ = newBuffer();
-@@ -905,7 +907,7 @@ break_stmt
- 		  }
- 		  else
- 		  {
--			swf5error("break outside switch / loop");
-+			swf5error(NULL, "break outside switch / loop");
- 			YYABORT;
- 		  }
- 		}
-@@ -1603,7 +1605,7 @@ primary
- 		{
- 			if($1->name != NULL)
- 			{
--				swf5error("anonymous decl only. identifier not allowed");
-+				swf5error(NULL, "anonymous decl only. identifier not allowed");
- 				YYABORT;
- 			}
- 			$$ = newBuffer();
---- a/src/actioncompiler/swf4compiler.flex
-+++ b/src/actioncompiler/swf4compiler.flex
-@@ -9,7 +9,7 @@
- #include "blocks/error.h"
- #include "swf4compiler.tab.h" /* defines token types */
- 
--static int swf4debug;
-+extern int swf4debug;
- 
- static const char *lexBuffer = NULL;
- static int lexBufferLen = 0;
---- a/src/actioncompiler/swf5compiler.flex
-+++ b/src/actioncompiler/swf5compiler.flex
-@@ -9,7 +9,7 @@
- #include "blocks/error.h"
- #include "swf5compiler.tab.h" /* defines token types */
- 
--static int swf5debug;
-+extern int swf5debug;
- 
- static const char *lexBuffer = NULL;
- static int lexBufferLen = 0;
diff --git a/debian/patches/05_hurd b/debian/patches/05_hurd
deleted file mode 100644
index fd65b94..0000000
--- a/debian/patches/05_hurd
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix build on GNU/Hurd
-Author: Gabriele Giacone <1o5g4r8o at gmail.com>
-Origin: upstream, https://github.com/libming/libming/commit/f079175192199c912ee9de4e56182e4c2a7acc8b
-
---- a/src/ming.h.in
-+++ b/src/ming.h.in
-@@ -47,6 +47,10 @@ extern "C" {
- #define MING_VERSION        @MAJOR_VERSION at .@MINOR_VERSION at .@MICRO_VERSION@
- #define MING_VERSION_TEXT  "@MAJOR_VERSION at .@MINOR_VERSION at .@MICRO_VERSION@"
- 
-+#ifndef PATH_MAX
-+#define PATH_MAX 4096
-+#endif
-+
- /***** Type definitions - avoid cyclic dependencies ****/
- 
- typedef unsigned char byte;
diff --git a/debian/patches/06_ungif b/debian/patches/06_ungif
deleted file mode 100644
index a7617e4..0000000
--- a/debian/patches/06_ungif
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Remove ungif linking, see #732272
-Author: Gabriele Giacone <1o5g4r8o at gmail.com>
-
---- a/py_ext/setup.py.in
-+++ b/py_ext/setup.py.in
-@@ -18,10 +18,6 @@ if "@ZLIB@":
- if "@PNGLIB@":
- 	mylibs.append('png')
- 
--if "@GIFLIB@":
--	mylibs.append("ungif")
--
--
- setup(name = "mingc", version = "@MING_VERSION@",
-       package_dir = {'': srcdir},
-       py_modules = ['ming', 'mingc'],
diff --git a/debian/patches/series b/debian/patches/series
index 19e8852..1525ac4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
 01_perl_vendor
 02_php_ext
 03_py_ext
-04_bison
-05_hurd
-06_ungif

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