[fife] 06/25: Drop more obsolete patches.
Markus Koschany
apo at moszumanska.debian.org
Mon Nov 7 20:31:25 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository fife.
commit e002be4b424e7a7d566f1bc35a229c916746c839
Author: Markus Koschany <apo at debian.org>
Date: Wed Sep 21 20:06:09 2016 +0200
Drop more obsolete patches.
add-kfreebsd-gnu-configuration.diff
changeset_3949.diff
libpython.diff
support-parallel-build.diff
---
debian/patches/add-kfreebsd-gnu-configuration.diff | 339 ---------------------
debian/patches/changeset_3949.diff | 25 --
debian/patches/libpython.diff | 88 ------
debian/patches/series | 5 -
debian/patches/support-parallel-build.diff | 15 -
5 files changed, 472 deletions(-)
diff --git a/debian/patches/add-kfreebsd-gnu-configuration.diff b/debian/patches/add-kfreebsd-gnu-configuration.diff
deleted file mode 100644
index 2eb22d3..0000000
--- a/debian/patches/add-kfreebsd-gnu-configuration.diff
+++ /dev/null
@@ -1,339 +0,0 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- fife (0.3.3+r2+dfsg1-1) unstable; urgency=low
- .
- * New upstream release
- * First release in proper Debian (Closes: #632360)
-Author: Christoph Egger <christoph at debian.org>
-Bug-Debian: http://bugs.debian.org/632360
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- /dev/null
-+++ fife-0.3.3+r2+dfsg1/build/gnukfreebsd9-config.py
-@@ -0,0 +1,101 @@
-+# -*- coding: utf-8 -*-
-+
-+# ####################################################################
-+# Copyright (C) 2005-2010 by the FIFE team
-+# http://www.fifengine.net
-+# This file is part of FIFE.
-+#
-+# FIFE is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU Lesser General Public
-+# License as published by the Free Software Foundation; either
-+# version 2.1 of the License, or (at your option) any later version.
-+#
-+# This library is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# Lesser General Public License for more details.
-+#
-+# You should have received a copy of the GNU Lesser General Public
-+# License along with this library; if not, write to the
-+# Free Software Foundation, Inc.,
-+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+# ####################################################################
-+
-+import sys
-+import os
-+import platform
-+
-+pythonversion = 'python' + str(os.sys.version_info[0]) + '.' + str(os.sys.version_info[1])
-+
-+def initEnvironment(env):
-+
-+ rootpath = env.Dir('#.').srcnode().abspath
-+ extincludepath = os.path.join(rootpath, 'ext', 'install', 'include')
-+ extlibpath = os.path.join(rootpath, 'ext', 'install', 'lib')
-+
-+ env.Append(CPPPATH = [os.path.join('/', 'opt', 'include'),
-+ os.path.join('/', 'usr', 'include', 'vorbis'),
-+ os.path.join('/', 'usr', 'include', 'SDL'),
-+ os.path.join('/', 'usr', 'include', pythonversion),
-+ extincludepath])
-+
-+ env.Append(LIBPATH = [os.path.join('/', 'opt', 'lib'),
-+ extlibpath,
-+ env.subst('$LIBDIR')])
-+
-+ env.AppendENVPath('LD_RUN_PATH', os.path.join('..', '..', '..', extlibpath))
-+
-+ env.AppendUnique(CXXFLAGS=["-DPNG_SKIP_SETJMP_CHECK"])
-+
-+ return env
-+
-+def addExtras(env, opengl):
-+ env.Append(LIBS = pythonversion)
-+
-+ if opengl:
-+ env.Append(LIBS = ['stdc++', 'GL',])
-+ env.Append(LIBPATH = os.path.join('/', 'usr', 'X11R6', 'lib'))
-+
-+ # define for using tinyxml with stl support enabled
-+ env.AppendUnique(CPPDEFINES = ['TIXML_USE_STL'])
-+
-+ return env
-+
-+def getRequiredHeaders(opengl):
-+ return None
-+
-+def getRequiredLibs(opengl):
-+ # libs is a list of tuples that have the form:
-+ # (libname, headers)
-+ # libname - may be a single library or a tuple of libraries
-+ # headers - may be a single header or a list of headers
-+ #
-+ # This list is somewhat order dependent
-+ # guichan_sdl - depends on at least the SDL libs and guichan prior in the list
-+ # guichan_opengl - depends on at least guichan prior in the list
-+ libs = [('vorbisfile', 'vorbisfile.h'),
-+ (pythonversion, pythonversion + '/Python.h'),
-+ ('openal', 'AL/al.h'),
-+ ('SDL', 'SDL.h'),
-+ ('SDL_ttf', 'SDL_ttf.h'),
-+ ('SDL_image', 'SDL_image.h'),
-+ ('guichan', 'guichan.hpp'),
-+ ('guichan_sdl', ''),
-+ ('boost_system', ''),
-+ (('boost_filesystem', 'boost_filesystem-gcc', 'boost_filesystem-gcc41', 'boost_filesystem-mt', 'libboost_filesystem-mt'), 'boost/filesystem.hpp'),
-+ (('boost_regex', 'boost_regex-gcc', 'boost_regex-gcc41', 'boost_regex-mt', 'libboost_regex-mt'), 'boost/regex.hpp'),
-+ ('png', 'png.h'),
-+ ('Xcursor', '')]
-+
-+ if (opengl):
-+ libs.append(('guichan_opengl', ''))
-+
-+ return libs
-+
-+def getOptionalLibs(opengl):
-+ libs = [('tinyxml', 'tinyxml.h')]
-+
-+ return libs
-+
-+# vim: set filetype=python:
-+
---- /dev/null
-+++ fife-0.3.3+r2+dfsg1/build/gnukfreebsd8-config.py
-@@ -0,0 +1,101 @@
-+# -*- coding: utf-8 -*-
-+
-+# ####################################################################
-+# Copyright (C) 2005-2010 by the FIFE team
-+# http://www.fifengine.net
-+# This file is part of FIFE.
-+#
-+# FIFE is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU Lesser General Public
-+# License as published by the Free Software Foundation; either
-+# version 2.1 of the License, or (at your option) any later version.
-+#
-+# This library is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# Lesser General Public License for more details.
-+#
-+# You should have received a copy of the GNU Lesser General Public
-+# License along with this library; if not, write to the
-+# Free Software Foundation, Inc.,
-+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+# ####################################################################
-+
-+import sys
-+import os
-+import platform
-+
-+pythonversion = 'python' + str(os.sys.version_info[0]) + '.' + str(os.sys.version_info[1])
-+
-+def initEnvironment(env):
-+
-+ rootpath = env.Dir('#.').srcnode().abspath
-+ extincludepath = os.path.join(rootpath, 'ext', 'install', 'include')
-+ extlibpath = os.path.join(rootpath, 'ext', 'install', 'lib')
-+
-+ env.Append(CPPPATH = [os.path.join('/', 'opt', 'include'),
-+ os.path.join('/', 'usr', 'include', 'vorbis'),
-+ os.path.join('/', 'usr', 'include', 'SDL'),
-+ os.path.join('/', 'usr', 'include', pythonversion),
-+ extincludepath])
-+
-+ env.Append(LIBPATH = [os.path.join('/', 'opt', 'lib'),
-+ extlibpath,
-+ env.subst('$LIBDIR')])
-+
-+ env.AppendENVPath('LD_RUN_PATH', os.path.join('..', '..', '..', extlibpath))
-+
-+ env.AppendUnique(CXXFLAGS=["-DPNG_SKIP_SETJMP_CHECK"])
-+
-+ return env
-+
-+def addExtras(env, opengl):
-+ env.Append(LIBS = pythonversion)
-+
-+ if opengl:
-+ env.Append(LIBS = ['stdc++', 'GL',])
-+ env.Append(LIBPATH = os.path.join('/', 'usr', 'X11R6', 'lib'))
-+
-+ # define for using tinyxml with stl support enabled
-+ env.AppendUnique(CPPDEFINES = ['TIXML_USE_STL'])
-+
-+ return env
-+
-+def getRequiredHeaders(opengl):
-+ return None
-+
-+def getRequiredLibs(opengl):
-+ # libs is a list of tuples that have the form:
-+ # (libname, headers)
-+ # libname - may be a single library or a tuple of libraries
-+ # headers - may be a single header or a list of headers
-+ #
-+ # This list is somewhat order dependent
-+ # guichan_sdl - depends on at least the SDL libs and guichan prior in the list
-+ # guichan_opengl - depends on at least guichan prior in the list
-+ libs = [('vorbisfile', 'vorbisfile.h'),
-+ (pythonversion, pythonversion + '/Python.h'),
-+ ('openal', 'AL/al.h'),
-+ ('SDL', 'SDL.h'),
-+ ('SDL_ttf', 'SDL_ttf.h'),
-+ ('SDL_image', 'SDL_image.h'),
-+ ('guichan', 'guichan.hpp'),
-+ ('guichan_sdl', ''),
-+ ('boost_system', ''),
-+ (('boost_filesystem', 'boost_filesystem-gcc', 'boost_filesystem-gcc41', 'boost_filesystem-mt', 'libboost_filesystem-mt'), 'boost/filesystem.hpp'),
-+ (('boost_regex', 'boost_regex-gcc', 'boost_regex-gcc41', 'boost_regex-mt', 'libboost_regex-mt'), 'boost/regex.hpp'),
-+ ('png', 'png.h'),
-+ ('Xcursor', '')]
-+
-+ if (opengl):
-+ libs.append(('guichan_opengl', ''))
-+
-+ return libs
-+
-+def getOptionalLibs(opengl):
-+ libs = [('tinyxml', 'tinyxml.h')]
-+
-+ return libs
-+
-+# vim: set filetype=python:
-+
---- /dev/null
-+++ fife-0.3.3+r2+dfsg1/build/gnu0-config.py
-@@ -0,0 +1,101 @@
-+# -*- coding: utf-8 -*-
-+
-+# ####################################################################
-+# Copyright (C) 2005-2010 by the FIFE team
-+# http://www.fifengine.net
-+# This file is part of FIFE.
-+#
-+# FIFE is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU Lesser General Public
-+# License as published by the Free Software Foundation; either
-+# version 2.1 of the License, or (at your option) any later version.
-+#
-+# This library is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# Lesser General Public License for more details.
-+#
-+# You should have received a copy of the GNU Lesser General Public
-+# License along with this library; if not, write to the
-+# Free Software Foundation, Inc.,
-+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+# ####################################################################
-+
-+import sys
-+import os
-+import platform
-+
-+pythonversion = 'python' + str(os.sys.version_info[0]) + '.' + str(os.sys.version_info[1])
-+
-+def initEnvironment(env):
-+
-+ rootpath = env.Dir('#.').srcnode().abspath
-+ extincludepath = os.path.join(rootpath, 'ext', 'install', 'include')
-+ extlibpath = os.path.join(rootpath, 'ext', 'install', 'lib')
-+
-+ env.Append(CPPPATH = [os.path.join('/', 'opt', 'include'),
-+ os.path.join('/', 'usr', 'include', 'vorbis'),
-+ os.path.join('/', 'usr', 'include', 'SDL'),
-+ os.path.join('/', 'usr', 'include', pythonversion),
-+ extincludepath])
-+
-+ env.Append(LIBPATH = [os.path.join('/', 'opt', 'lib'),
-+ extlibpath,
-+ env.subst('$LIBDIR')])
-+
-+ env.AppendENVPath('LD_RUN_PATH', os.path.join('..', '..', '..', extlibpath))
-+
-+ env.AppendUnique(CXXFLAGS=["-DPNG_SKIP_SETJMP_CHECK"])
-+
-+ return env
-+
-+def addExtras(env, opengl):
-+ env.Append(LIBS = pythonversion)
-+
-+ if opengl:
-+ env.Append(LIBS = ['stdc++', 'GL',])
-+ env.Append(LIBPATH = os.path.join('/', 'usr', 'X11R6', 'lib'))
-+
-+ # define for using tinyxml with stl support enabled
-+ env.AppendUnique(CPPDEFINES = ['TIXML_USE_STL'])
-+
-+ return env
-+
-+def getRequiredHeaders(opengl):
-+ return None
-+
-+def getRequiredLibs(opengl):
-+ # libs is a list of tuples that have the form:
-+ # (libname, headers)
-+ # libname - may be a single library or a tuple of libraries
-+ # headers - may be a single header or a list of headers
-+ #
-+ # This list is somewhat order dependent
-+ # guichan_sdl - depends on at least the SDL libs and guichan prior in the list
-+ # guichan_opengl - depends on at least guichan prior in the list
-+ libs = [('vorbisfile', 'vorbisfile.h'),
-+ (pythonversion, pythonversion + '/Python.h'),
-+ ('openal', 'AL/al.h'),
-+ ('SDL', 'SDL.h'),
-+ ('SDL_ttf', 'SDL_ttf.h'),
-+ ('SDL_image', 'SDL_image.h'),
-+ ('guichan', 'guichan.hpp'),
-+ ('guichan_sdl', ''),
-+ ('boost_system', ''),
-+ (('boost_filesystem', 'boost_filesystem-gcc', 'boost_filesystem-gcc41', 'boost_filesystem-mt', 'libboost_filesystem-mt'), 'boost/filesystem.hpp'),
-+ (('boost_regex', 'boost_regex-gcc', 'boost_regex-gcc41', 'boost_regex-mt', 'libboost_regex-mt'), 'boost/regex.hpp'),
-+ ('png', 'png.h'),
-+ ('Xcursor', '')]
-+
-+ if (opengl):
-+ libs.append(('guichan_opengl', ''))
-+
-+ return libs
-+
-+def getOptionalLibs(opengl):
-+ libs = [('tinyxml', 'tinyxml.h')]
-+
-+ return libs
-+
-+# vim: set filetype=python:
-+
diff --git a/debian/patches/changeset_3949.diff b/debian/patches/changeset_3949.diff
deleted file mode 100644
index a5d52d2..0000000
--- a/debian/patches/changeset_3949.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: trunk/engine/core/eventchannel/eventchannel.i
-===================================================================
---- trunk/engine/core/eventchannel/eventchannel.i (revision 3775)
-+++ trunk/engine/core/eventchannel/eventchannel.i (revision 3949)
-@@ -59,5 +59,5 @@
- virtual std::string getDebugString() const;
- virtual const std::string& getName() const;
-- virtual ~IEvent() {}
-+ virtual ~Event() {}
- private:
- Event();
-@@ -71,5 +71,5 @@
- virtual bool isMetaPressed() const;
- virtual bool isShiftPressed() const;
-- virtual ~IInputEvent() {}
-+ virtual ~InputEvent() {}
- private:
- InputEvent();
-@@ -154,5 +154,5 @@
- virtual MouseEventType getType() const;
- virtual MouseButtonType getButton() const;
-- virtual ~IMouseEvent();
-+ virtual ~MouseEvent();
- private:
- MouseEvent();
diff --git a/debian/patches/libpython.diff b/debian/patches/libpython.diff
deleted file mode 100644
index 99e9d35..0000000
--- a/debian/patches/libpython.diff
+++ /dev/null
@@ -1,88 +0,0 @@
-Index: fife/build/gnukfreebsd9-config.py
-===================================================================
---- fife.orig/build/gnukfreebsd9-config.py 2013-03-10 18:13:59.991279000 -0700
-+++ fife/build/gnukfreebsd9-config.py 2013-03-10 18:18:49.031280890 -0700
-@@ -50,7 +50,7 @@
- return env
-
- def addExtras(env, opengl):
-- env.Append(LIBS = pythonversion)
-+# env.Append(LIBS = pythonversion)
-
- if opengl:
- env.Append(LIBS = ['stdc++', 'GL',])
-@@ -74,7 +74,7 @@
- # guichan_sdl - depends on at least the SDL libs and guichan prior in the list
- # guichan_opengl - depends on at least guichan prior in the list
- libs = [('vorbisfile', 'vorbisfile.h'),
-- (pythonversion, pythonversion + '/Python.h'),
-+# (pythonversion, pythonversion + '/Python.h'),
- ('openal', 'AL/al.h'),
- ('SDL', 'SDL.h'),
- ('SDL_ttf', 'SDL_ttf.h'),
-Index: fife/build/gnu0-config.py
-===================================================================
---- fife.orig/build/gnu0-config.py 2013-03-10 18:13:59.691293000 -0700
-+++ fife/build/gnu0-config.py 2013-03-10 18:18:48.791280752 -0700
-@@ -50,7 +50,7 @@
- return env
-
- def addExtras(env, opengl):
-- env.Append(LIBS = pythonversion)
-+# env.Append(LIBS = pythonversion)
-
- if opengl:
- env.Append(LIBS = ['stdc++', 'GL',])
-@@ -74,7 +74,7 @@
- # guichan_sdl - depends on at least the SDL libs and guichan prior in the list
- # guichan_opengl - depends on at least guichan prior in the list
- libs = [('vorbisfile', 'vorbisfile.h'),
-- (pythonversion, pythonversion + '/Python.h'),
-+# (pythonversion, pythonversion + '/Python.h'),
- ('openal', 'AL/al.h'),
- ('SDL', 'SDL.h'),
- ('SDL_ttf', 'SDL_ttf.h'),
-Index: fife/build/gnukfreebsd8-config.py
-===================================================================
---- fife.orig/build/gnukfreebsd8-config.py 2013-03-10 18:13:59.871281000 -0700
-+++ fife/build/gnukfreebsd8-config.py 2013-03-10 18:18:48.941278771 -0700
-@@ -50,7 +50,7 @@
- return env
-
- def addExtras(env, opengl):
-- env.Append(LIBS = pythonversion)
-+# env.Append(LIBS = pythonversion)
-
- if opengl:
- env.Append(LIBS = ['stdc++', 'GL',])
-@@ -74,7 +74,7 @@
- # guichan_sdl - depends on at least the SDL libs and guichan prior in the list
- # guichan_opengl - depends on at least guichan prior in the list
- libs = [('vorbisfile', 'vorbisfile.h'),
-- (pythonversion, pythonversion + '/Python.h'),
-+# (pythonversion, pythonversion + '/Python.h'),
- ('openal', 'AL/al.h'),
- ('SDL', 'SDL.h'),
- ('SDL_ttf', 'SDL_ttf.h'),
-Index: fife/build/linux2-config.py
-===================================================================
---- fife.orig/build/linux2-config.py 2013-03-10 18:13:38.401287000 -0700
-+++ fife/build/linux2-config.py 2013-03-10 18:18:46.861335826 -0700
-@@ -50,7 +50,7 @@
- return env
-
- def addExtras(env, opengl):
-- env.Append(LIBS = pythonversion)
-+# env.Append(LIBS = pythonversion)
-
- if opengl:
- env.Append(LIBS = ['stdc++', 'GL',])
-@@ -74,7 +74,7 @@
- # guichan_sdl - depends on at least the SDL libs and guichan prior in the list
- # guichan_opengl - depends on at least guichan prior in the list
- libs = [('vorbisfile', 'vorbisfile.h'),
-- (pythonversion, pythonversion + '/Python.h'),
-+# (pythonversion, pythonversion + '/Python.h'),
- ('openal', 'AL/al.h'),
- ('SDL', 'SDL.h'),
- ('SDL_ttf', 'SDL_ttf.h'),
diff --git a/debian/patches/series b/debian/patches/series
index 8ed77b7..cff6a85 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,3 @@
-#support-parallel-build.diff
-#add-kfreebsd-gnu-configuration.diff
remove_glee.patch
-#changeset_3949.diff
spelling.diff
-#libpython.diff
-libpython.diff
gcc6.diff
diff --git a/debian/patches/support-parallel-build.diff b/debian/patches/support-parallel-build.diff
deleted file mode 100644
index 8b70a1e..0000000
--- a/debian/patches/support-parallel-build.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: fife/engine/SConscript
-===================================================================
---- fife.orig/engine/SConscript 2012-04-22 19:49:53.720180098 +0200
-+++ fife/engine/SConscript 2012-04-22 19:50:51.984464934 +0200
-@@ -157,7 +157,9 @@
- SHLIBSUFFIX=dest_suffix,
- SHLIBEMITTER = '')
-
--pythonext = env.PythonExtensions(target = [os.path.join('swigwrappers', 'python' ,'fife_wrap.cc'), os.path.join('python', 'fife', 'fife.py')],
-+pythonext = env.PythonExtensions(target = [os.path.join('swigwrappers', 'python' ,'fife_wrap.cc'),
-+ os.path.join('swigwrappers', 'python' ,'fife_wrap.h'),
-+ os.path.join('python', 'fife', 'fife.py')],
- source = os.path.join('swigwrappers', 'python' ,'fife.i'),
- SWIGFLAGS=['-python','-c++','-w511'],
- SWIGPATH='core',
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/fife.git
More information about the Pkg-games-commits
mailing list