[adonthell] 47/65: Drop all patches
Markus Koschany
apo at moszumanska.debian.org
Tue Jul 12 19:53:58 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository adonthell.
commit 36490bff61e18025d1144c899953c76ebc3a4468
Author: Markus Koschany <apo at debian.org>
Date: Tue Jul 12 12:21:05 2016 +0200
Drop all patches
---
debian/patches/04_do_not_ship_pyc.diff | 30 ---------------------
debian/patches/10_ftbfs_with_gcc-4.4.diff | 25 -----------------
debian/patches/11_ftbfs_with_gcc-4.6.diff | 40 ----------------------------
debian/patches/12_no_sparc_bytecompile.patch | 29 --------------------
debian/patches/disable-swig.patch | 29 --------------------
debian/patches/format-security.patch | 24 -----------------
debian/patches/series | 7 -----
debian/patches/typemap-bool.patch | 28 -------------------
8 files changed, 212 deletions(-)
diff --git a/debian/patches/04_do_not_ship_pyc.diff b/debian/patches/04_do_not_ship_pyc.diff
deleted file mode 100644
index b75cd9a..0000000
--- a/debian/patches/04_do_not_ship_pyc.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-Author: Unknown
-Description: Do not ship compile Python files.
-Index: adonthell-0.3.5/src/modules/Makefile.am
-===================================================================
---- adonthell-0.3.5.orig/src/modules/Makefile.am 2008-02-11 19:58:20.000000000 +0000
-+++ adonthell-0.3.5/src/modules/Makefile.am 2008-12-22 23:43:49.000000000 +0000
-@@ -3,7 +3,8 @@
- pyc_files = dialogue.pyc adonthell.pyc
- py_files = dialogue.py adonthell.py
-
--moddata_DATA = $(pyc_files)
-+#moddata_DATA = $(pyc_files)
-+moddata_DATA = $(py_files)
-
- EXTRA_DIST = $(py_files)
-
-Index: adonthell-0.3.5/src/modules/Makefile.in
-===================================================================
---- adonthell-0.3.5.orig/src/modules/Makefile.in 2008-05-29 19:43:05.000000000 +0100
-+++ adonthell-0.3.5/src/modules/Makefile.in 2008-12-22 23:43:49.000000000 +0000
-@@ -210,7 +210,8 @@
- moddatadir = $(gamedatadir)/modules
- pyc_files = dialogue.pyc adonthell.pyc
- py_files = dialogue.py adonthell.py
--moddata_DATA = $(pyc_files)
-+#moddata_DATA = $(pyc_files)
-+moddata_DATA = $(py_files)
- EXTRA_DIST = $(py_files)
- CLEANFILES = $(pyc_files)
- all: all-am
diff --git a/debian/patches/10_ftbfs_with_gcc-4.4.diff b/debian/patches/10_ftbfs_with_gcc-4.4.diff
deleted file mode 100644
index 2960891..0000000
--- a/debian/patches/10_ftbfs_with_gcc-4.4.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Patch backported from http://github.com/ksterker/adonthell/tree/master,
-commit c620028d36510103d15efe15fed11532a4cd4a71
-Index: adonthell-0.3.5/src/dialog.cc
-===================================================================
---- adonthell-0.3.5.orig/src/dialog.cc 2009-09-12 09:35:25.000000000 +0400
-+++ adonthell-0.3.5/src/dialog.cc 2009-09-12 09:49:58.000000000 +0400
-@@ -265,7 +265,8 @@
- {
- u_int32 begin, end, len;
- PyObject *result;
-- char *tmp, *start, *mid, *str = NULL;
-+ char *tmp, *mid, *str = NULL;
-+ const char *start;
- character *the_player = data::the_player;
- string newstr (s);
-
-@@ -318,7 +319,7 @@
-
- // Error!
- cout << "\n*** Error, unknown macro " << start << flush;
-- start[0] = ' ';
-+ newstr[newstr.length () - strlen (start)] = ' ';
- }
-
- // execute python functions
diff --git a/debian/patches/11_ftbfs_with_gcc-4.6.diff b/debian/patches/11_ftbfs_with_gcc-4.6.diff
deleted file mode 100644
index abc6eb6..0000000
--- a/debian/patches/11_ftbfs_with_gcc-4.6.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: fix "taking address of temporary" errors
-Author: Peter De Wachter <pdewacht at gmail.com>
-Bug-Debian: http://bugs.debian.org/624998
-Forwarded: not-needed?
-
-It looks like the relevant code has been entirely rewritten for adonthell 0.4
-
---- a/src/label.cc
-+++ b/src/label.cc
-@@ -645,7 +645,7 @@
- }
-
-
--const string label::text_string () const
-+const string & label::text_string () const
- {
- return my_text_;
- }
---- a/src/label.h
-+++ b/src/label.h
-@@ -90,7 +90,7 @@
- /**
- Get the text in string
- */
-- const string text_string () const;
-+ const string & text_string () const;
-
-
- /**
---- a/src/win_event.cc
-+++ b/src/win_event.cc
-@@ -35,7 +35,7 @@
- case DESTROY:
- {
- set_callback_destroy (
-- makeFunctor (&Functor0wRet<bool>(), *callback, &py_callback::callback_func0ret));
-+ makeFunctor (new Functor0wRet<bool>(), *callback, &py_callback::callback_func0ret));
- break;
- }
-
diff --git a/debian/patches/12_no_sparc_bytecompile.patch b/debian/patches/12_no_sparc_bytecompile.patch
deleted file mode 100644
index 0063215..0000000
--- a/debian/patches/12_no_sparc_bytecompile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Do not bytecompile Python files during build
-Author: Luca Falavigna <dktrkranz at debian.org>
-Bug-Debian: http://bugs.debian.org/639450
-Forwarded: no
-
-Index: adonthell-0.3.5/src/modules/Makefile.in
-===================================================================
---- adonthell-0.3.5.orig/src/modules/Makefile.in 2011-10-02 17:20:09.885955991 +0200
-+++ adonthell-0.3.5/src/modules/Makefile.in 2011-10-02 17:20:44.365957048 +0200
-@@ -216,6 +216,10 @@
- CLEANFILES = $(pyc_files)
- all: all-am
-
-+ifneq ($(shell dpkg-architecture -qDEB_BUILD_ARCH),sparc)
-+ ADONTHELLCMD=$(top_builddir)/src/adonthell-0.3 -c
-+endif
-+
- .SUFFIXES:
- $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
-@@ -404,7 +408,7 @@
-
-
- all: $(py_files)
-- $(top_builddir)/src/adonthell-0.3 -c
-+ $(ADONTHELLCMD)
-
- %.pyc : %.py
- @if test x$(top_srcdir) != x$(top_builddir) ; then \
diff --git a/debian/patches/disable-swig.patch b/debian/patches/disable-swig.patch
deleted file mode 100644
index 0b0c0ce..0000000
--- a/debian/patches/disable-swig.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Thu, 14 Apr 2016 18:59:31 +0200
-Subject: disable swig
-
-Do not rebuild adonthell.py and py_adonthell_wrap.cc. As of Swig >= 3.x this
-would cause runtime errors on startup.
-
-See README.source for more information and ideas to fix this issue.
-
-Forwarded: not-needed
----
- src/Makefile.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.in b/src/Makefile.in
-index f18477d..5b74fa0 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -768,8 +768,8 @@ uninstall-am: uninstall-binPROGRAMS
-
-
- # Note: adonthell.py is also built by this target.
--py_adonthell_wrap.cc : py_adonthell.i $(headers)
-- @if test "${P_SWIG}"; then \
-+#py_adonthell_wrap.cc : py_adonthell.i $(headers)
-+# @if test "${P_SWIG}"; then \
- echo ${P_SWIG} -python -modern -shadow ${SDL_CFLAGS} -I$(srcdir) -I$(top_srcdir) -c++ -makedefault -o $(srcdir)/$*.cc $(srcdir)/py_adonthell.i; \
- ${P_SWIG} -python -modern -shadow ${SDL_CFLAGS} -I$(srcdir) -I$(top_srcdir) -c++ -makedefault -o $(srcdir)/$*.cc $(srcdir)/py_adonthell.i; \
- mv $(srcdir)/adonthell.py modules/adonthell.py; \
diff --git a/debian/patches/format-security.patch b/debian/patches/format-security.patch
deleted file mode 100644
index 0bc7ba9..0000000
--- a/debian/patches/format-security.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Thu, 14 Apr 2016 19:20:53 +0200
-Subject: format security
-
-Fix FTBFS due to format-security flag.
-
-Forwarded: no, project is no longer active
----
- src/py_adonthell_wrap.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/py_adonthell_wrap.cc b/src/py_adonthell_wrap.cc
-index 048f0af..2a73207 100644
---- a/src/py_adonthell_wrap.cc
-+++ b/src/py_adonthell_wrap.cc
-@@ -867,7 +867,7 @@ SWIG_Python_AddErrorMsg(const char* mesg)
- Py_DECREF(old_str);
- Py_DECREF(value);
- } else {
-- PyErr_Format(PyExc_RuntimeError, mesg);
-+ PyErr_Format(PyExc_RuntimeError, "%s", mesg);
- }
- }
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 10c2562..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,7 +0,0 @@
-04_do_not_ship_pyc.diff
-10_ftbfs_with_gcc-4.4.diff
-11_ftbfs_with_gcc-4.6.diff
-12_no_sparc_bytecompile.patch
-#typemap-bool.patch
-disable-swig.patch
-format-security.patch
diff --git a/debian/patches/typemap-bool.patch b/debian/patches/typemap-bool.patch
deleted file mode 100644
index e6c9ff9..0000000
--- a/debian/patches/typemap-bool.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Thu, 14 Apr 2016 07:57:12 +0200
-Subject: typemap bool
-
----
- src/py_adonthell.i | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/py_adonthell.i b/src/py_adonthell.i
-index d5ae9a9..68e4b00 100644
---- a/src/py_adonthell.i
-+++ b/src/py_adonthell.i
-@@ -94,6 +94,15 @@ enum {Python = 1, C = 0};
- $1 = $input;
- }
-
-+%typemap(in) bool{
-+ $1 = false; // any type other than numeric is automatically false
-+ if(PyInt_Check($input))
-+ $1 = !(PyInt_AsLong($input) == (long)0);
-+ else if(PyFloat_Check($input))
-+ $1 = !(PyFloat_AsDouble($input) == 0.0);
-+}
-+
-+
- %include "types.h"
- %include "fileops.h"
- %include "event.h"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/adonthell.git
More information about the Pkg-games-commits
mailing list