[netpanzer] 92/118: Drop use-system-libs.patch

[Markus Koschany]

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

apo pushed a commit to branch master
in repository netpanzer.

commit e56c38049079ae6f7263b2d05e0629d404a6e2d9
Author: Markus Koschany <apo at debian.org>
Date:   Sun Jun 5 07:44:11 2016 +0200

    Drop use-system-libs.patch
---
 debian/patches/series                |  1 -
 debian/patches/use-system-libs.patch | 97 ------------------------------------
 2 files changed, 98 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 4be0c6d..29057ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 #gcc-4.3.diff
 #desktop.diff
-use-system-libs.patch
diff --git a/debian/patches/use-system-libs.patch b/debian/patches/use-system-libs.patch
deleted file mode 100644
index 9690f27..0000000
--- a/debian/patches/use-system-libs.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -154,16 +154,10 @@ env.BuildDir(env['FINALBUILDDIR'],'.',du
- crossmingwenv.BuildDir(crossmingwenv['FINALBUILDDIR'],'.',duplicate=0)
- crosslinuxenv.BuildDir(crosslinuxenv['FINALBUILDDIR'],'.',duplicate=0)
- 
--luaenv = env.Clone()
--physfsenv = env.Clone()
- networkenv = env.Clone()
- 
--crossmingwluaenv = crossmingwenv.Clone()
--crossmingwphysfsenv = crossmingwenv.Clone()
- crossmingwnetworkenv = crossmingwenv.Clone()
- 
--crosslinuxluaenv = crosslinuxenv.Clone()
--crosslinuxphysfsenv = crosslinuxenv.Clone()
- crosslinuxnetworkenv = crosslinuxenv.Clone()
- 
- ################################################################
-@@ -205,9 +199,9 @@ print 'Building version ' + NPVERSION +
- # Configure Environments
- ################################################################
- 
--env.Append(           CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/physfs', 'src/Lib/lua'] )
--crossmingwenv.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/physfs', 'src/Lib/lua'] )
--crosslinuxenv.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/physfs', 'src/Lib/lua'] )
-+env.Append(           CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/lua'] )
-+crossmingwenv.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/lua'] )
-+crosslinuxenv.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/lua'] )
- 
- # for this platform
- if thisplatform == 'darwin':
-@@ -216,14 +210,10 @@ if thisplatform == 'darwin':
-  
-     if env['universal'] != 'false':
- 		env.Append( CCFLAGS = [ '-arch', 'ppc', '-arch', 'i386' ] )
--		luaenv.Append( CCFLAGS = [ '-arch', 'ppc', '-arch', 'i386' ] )
--		physfsenv.Append( CCFLAGS = [ '-arch', 'ppc', '-arch', 'i386' ] )
- 		networkenv.Append( CCFLAGS = [ '-arch', 'ppc', '-arch', 'i386' ] )
- 		env.Append( LINKFLAGS = [ '-mmacosx-version-min=10.4', '-arch', 'ppc', '-arch', 'i386' ] )
-     else:
-         env.Append( CCFLAGS = [ '-arch', 'i386' ] )
--        luaenv.Append( CCFLAGS = [ '-arch', 'i386' ] )
--        physfsenv.Append( CCFLAGS = [ '-arch', 'i386' ] )
-         networkenv.Append( CCFLAGS = [ '-arch', 'i386' ] )
-         env.Append( LINKFLAGS = [ '-arch', 'i386' ] )
- 	
-@@ -265,36 +255,12 @@ MakeStaticLib(          networkenv, 'npn
- MakeStaticLib(crossmingwnetworkenv, 'npnetwork', 'Network', '*.cpp')
- MakeStaticLib(crosslinuxnetworkenv, 'npnetwork', 'Network', '*.cpp')
- 
--# BUILDS LUA
--luaenv.Append(           CPPPATH = [ 'src/Lib/lua'] )
--crossmingwluaenv.Append( CPPPATH = [ 'src/Lib/lua'] )
--crosslinuxluaenv.Append( CPPPATH = [ 'src/Lib/lua'] )
--MakeStaticLib(          luaenv, 'nplua', 'lua', '*.c')
--MakeStaticLib(crossmingwluaenv, 'nplua', 'lua', '*.c')
--MakeStaticLib(crosslinuxluaenv, 'nplua', 'lua', '*.c')
--
--# BUILDS PHYSFS
--physfsenv.Append( CFLAGS = [ '-DPHYSFS_SUPPORTS_ZIP=1', '-DZ_PREFIX=1', '-DPHYSFS_NO_CDROM_SUPPORT=1' ] )
--physfsenv.Append( CPPPATH = [ 'src/Lib/physfs', 'src/Lib/physfs/zlib123' ] )
--MakeStaticLib(physfsenv, 'npphysfs', 'physfs physfs/platform physfs/archivers physfs/zlib123', '*.c')
--
--crossmingwphysfsenv.Append( CFLAGS = [ '-DPHYSFS_SUPPORTS_ZIP=1', '-DZ_PREFIX=1', '-DPHYSFS_NO_CDROM_SUPPORT=1' ] )
--crossmingwphysfsenv.Append( CPPPATH = [ 'src/Lib/physfs', 'src/Lib/physfs/zlib123' ] )
--MakeStaticLib(crossmingwphysfsenv, 'npphysfs', 'physfs physfs/platform physfs/archivers physfs/zlib123', '*.c')
--
--crosslinuxphysfsenv.Append( CFLAGS = [ '-DPHYSFS_SUPPORTS_ZIP=1', '-DZ_PREFIX=1', '-DPHYSFS_NO_CDROM_SUPPORT=1' ] )
--crosslinuxphysfsenv.Append( CPPPATH = [ 'src/Lib/physfs', 'src/Lib/physfs/zlib123' ] )
--MakeStaticLib(crosslinuxphysfsenv, 'npphysfs', 'physfs physfs/platform physfs/archivers physfs/zlib123', '*.c')
--
- # BUILDS 2D
- env.Append( CFLAGS = [ '-DZ_PREFIX=1' ] )
--env.Append( CPPPATH = 'src/Lib/physfs/zlib123' )
- MakeStaticLib(env, 'np2d', '2D 2D/libpng', '*.c*')
- crossmingwenv.Append( CFLAGS = [ '-DZ_PREFIX=1' ] )
--crossmingwenv.Append( CPPPATH = 'src/Lib/physfs/zlib123' )
- MakeStaticLib(crossmingwenv, 'np2d', '2D 2D/libpng', '*.c*')
- crosslinuxenv.Append( CFLAGS = [ '-DZ_PREFIX=1' ] )
--crosslinuxenv.Append( CPPPATH = 'src/Lib/physfs/zlib123' )
- MakeStaticLib(crosslinuxenv, 'np2d', '2D 2D/libpng', '*.c*')
- 
- # BUILDS REST OF LIBRARIES
-@@ -323,9 +289,9 @@ if crossmingwenv.has_key('WINICON'):
-     
- crosslinuxenv.Append( NPSOURCES = globSources(crosslinuxenv, 'src/NetPanzer', npdirs, "*.cpp") )
- 
--env.Append(           NPLIBS = ['nplua','np2d','npnetwork','nplibs','npphysfs'] )
--crossmingwenv.Append( NPLIBS = ['nplua','np2d','npnetwork','nplibs','npphysfs'] )
--crosslinuxenv.Append( NPLIBS = ['nplua','np2d','npnetwork','nplibs','npphysfs'] )
-+env.Append(           NPLIBS = ['lua5.1','np2d','npnetwork','nplibs','physfs'] )
-+crossmingwenv.Append( NPLIBS = ['lua5.1','np2d','npnetwork','nplibs','physfs'] )
-+crosslinuxenv.Append( NPLIBS = ['lua5.1','np2d','npnetwork','nplibs','physfs'] )
- 
- if env.has_key('LIBS'):
-     env.Append( NPLIBS = env['LIBS'] )

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/netpanzer.git