[rbdoom3bfg] 06/06: Remove 82-enable-hurd-kfreebsd.patch -- applied upstream

[Tobias Frost]

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

tobi pushed a commit to branch master
in repository rbdoom3bfg.

commit 32c655c3a74ebdcd341b03a903b635fc88bf2ebe
Author: Tobias Frost <tobi at coldtobi.de>
Date:   Sat Jul 4 10:57:35 2015 +0200

    Remove 82-enable-hurd-kfreebsd.patch -- applied upstream
---
 debian/changelog                             |  1 +
 debian/patches/82-enable-hurd-kfreebsd.patch | 72 ----------------------------
 debian/patches/series                        |  1 -
 3 files changed, 1 insertion(+), 73 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cb0a434..c50f3c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ rbdoom3bfg (1.0.3+repack1+git20150625-1) UNRELEASED; urgency=medium
   * Refresh 10-lowercase-executeable.patch
   * Remove 75-local-no-precompiled-header.patch -- applied upstream
   * Refresh patch 80-disable-cpu-features.patch, applied mostly upstream
+  * Remove 82-enable-hurd-kfreebsd.patch -- applied upstream
 
  -- Tobias Frost <tobi at debian.org>  Sat, 04 Jul 2015 10:09:40 +0200
 
diff --git a/debian/patches/82-enable-hurd-kfreebsd.patch b/debian/patches/82-enable-hurd-kfreebsd.patch
deleted file mode 100644
index 628e851..0000000
--- a/debian/patches/82-enable-hurd-kfreebsd.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Description: Tweak build system to support compilation under kfreebsd and hurd
- The patch focuses to set the compiler flags not accroding to architecture
- but according to the compiler.
-Author: Tobias Frost <tobi at debian.org>
-Forwarded: https://github.com/RobertBeckebans/RBDOOM-3-BFG/pull/231
-Applied-Upstream: https://github.com/RobertBeckebans/RBDOOM-3-BFG/commit/8a8deb63fde5286b56600f7f8af60eb4a99cef98
-Last-Update: 2015-06-24
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/neo/idlib/sys/sys_defines.h
-+++ b/neo/idlib/sys/sys_defines.h
-@@ -102,7 +102,7 @@
- #endif
- 
- 
--#elif defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__)
-+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__GNUC__) || defined(__clang__)
- 
- #ifndef CPUSTRING
- #if defined(__i386__)
-@@ -120,6 +120,8 @@
- #define	BUILD_STRING					"linux-" CPUSTRING
- #elif defined(__APPLE__)
- #define BUILD_STRING					"osx-" CPUSTRING
-+#else
-+#define BUILD_STRING					"other-" CPUSTRING
- #endif
- 
- #define _alloca							alloca
-@@ -150,6 +152,8 @@
- #define CALLBACK
- #define __cdecl
- 
-+#else
-+#error unknown build enviorment
- #endif
- // RB end
- 
---- a/neo/CMakeLists.txt
-+++ b/neo/CMakeLists.txt
-@@ -1423,6 +1423,7 @@
-         ${PNG_LIBRARY}
-         ${JPEG_LIBRARY}
-         ${GLEW_LIBRARY}
-+	${CMAKE_DL_LIBS}
- 		)
- 		
- 	#CMAKE_BINARY_DIR
-@@ -1579,15 +1580,10 @@
- 			set(RT_LIBRARY rt)
- 		endif()
- 
--		if(NOT "${CMAKE_SYSTEM}" MATCHES "FreeBSD")
--			set(DL_LIBRARY dl)
--		endif()
--
- 		target_link_libraries(rbdoom3bfg
- 			idlib
- 			${OPENGL_LIBRARIES}
- 			pthread
--			${DL_LIBRARY}
- 			${RT_LIBRARY}
- 			${SDLx_LIBRARY}
- 			${OPENAL_LIBRARY}
-@@ -1596,6 +1592,7 @@
-             ${PNG_LIBRARY}
-             ${JPEG_LIBRARY}
-             ${GLEW_LIBRARY}
-+	    ${CMAKE_DL_LIBS}
- 			)
- 	endif()
-     
diff --git a/debian/patches/series b/debian/patches/series
index 3468b98..59f554d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 10-lowercase-executeable.patch
 65-init-sdl2.patch
 80-disable-cpu-features.patch
-82-enable-hurd-kfreebsd.patch

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