summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cowgill <jcowgill@debian.org>2016-10-27 18:35:53 +0100
committerJames Cowgill <jcowgill@debian.org>2016-10-27 18:35:53 +0100
commit90988f52418f6fba41ac4c0fe32f71b02ce10c2c (patch)
tree0262c246daefa86e95dee7ddb1f7154e8288b94e
parent366d67ad0ab9b91b6e517a2b269cf4b4768653e3 (diff)
Drop 07_config-kfreebsd.patch - applied upstream
-rw-r--r--debian/patches/07_config-kfreebsd.patch16
-rw-r--r--debian/patches/series1
2 files changed, 0 insertions, 17 deletions
diff --git a/debian/patches/07_config-kfreebsd.patch b/debian/patches/07_config-kfreebsd.patch
deleted file mode 100644
index 6b33c94..0000000
--- a/debian/patches/07_config-kfreebsd.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Define SFML_OS_FREEBSD on kFreeBSD
-Author: James Cowgill <jcowgill@debian.org>
-Forwarded: https://github.com/SFML/SFML/pull/1129
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/cmake/Config.cmake
-+++ b/cmake/Config.cmake
-@@ -27,7 +27,7 @@ elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Li
- # don't use the OpenGL ES implementation on Linux
- set(OPENGL_ES 0)
- endif()
--elseif(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
-+elseif(CMAKE_SYSTEM_NAME MATCHES "^k?FreeBSD$")
- set(SFML_OS_FREEBSD 1)
- # don't use the OpenGL ES implementation on FreeBSD
- set(OPENGL_ES 0)
diff --git a/debian/patches/series b/debian/patches/series
index f465147..06d8ed1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
04_remove-googleapi-css.patch
05_build-doc-once.patch
06_pkgconfig-freebsd.patch
-07_config-kfreebsd.patch