[libsfml] 07/10: Drop 07_gcc-5.3.patch and require gcc 6 instead
James Cowgill
jcowgill at moszumanska.debian.org
Tue Aug 9 16:05:36 UTC 2016
This is an automated email from the git hooks/post-receive script.
jcowgill pushed a commit to branch master
in repository libsfml.
commit e27fd6a7be1f0d82dc2139dae11bd707bc998994
Author: James Cowgill <jcowgill at debian.org>
Date: Tue Aug 9 15:33:25 2016 +0000
Drop 07_gcc-5.3.patch and require gcc 6 instead
---
debian/control | 1 +
debian/patches/07_gcc-5.3.patch | 25 -------------------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 26 deletions(-)
diff --git a/debian/control b/debian/control
index 4a68be5..f81768e 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Uploaders:
Build-Depends: debhelper (>= 9),
cmake (>= 2.8.9),
doxygen,
+ g++ (>= 6),
libflac-dev,
libfreetype6-dev,
libgl1-mesa-dev,
diff --git a/debian/patches/07_gcc-5.3.patch b/debian/patches/07_gcc-5.3.patch
deleted file mode 100644
index 23a5165..0000000
--- a/debian/patches/07_gcc-5.3.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Workaround GCC 5.3 issues.
- See:
- https://github.com/nothings/stb/issues/280
- https://bugs.launchpad.net/ubuntu/+source/gcc-5/+bug/1568899
- https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65612
- Compiler bug was fixed in 6.0
-Author: David Yip <yipdw at member.fsf.org>
-Origin: other, https://gitlab.peach-bun.com/pinion/SFML/commit/3383b4a472f0bd16a8161fb8760cd3e6333f1782
-
---- a/src/SFML/Graphics/CMakeLists.txt
-+++ b/src/SFML/Graphics/CMakeLists.txt
-@@ -148,6 +148,13 @@ add_definitions(-DSTBI_FAILURE_USERMSG)
- # when gcc is used; otherwise saving PNGs may crash in stb_image_write
- if(SFML_COMPILER_GCC)
- set_source_files_properties(${SRCROOT}/ImageLoader.cpp PROPERTIES COMPILE_FLAGS -fno-strict-aliasing)
-+
-+endif()
-+
-+# see https://bugs.launchpad.net/ubuntu/+source/gcc-5/+bug/1568899
-+if(SFML_COMPILER_GCC AND BUILD_SHARED_LIBS)
-+ message(WARNING "Applying workaround for https://bugs.launchpad.net/ubuntu/+source/gcc-5/+bug/1568899")
-+ list(APPEND GRAPHICS_EXT_LIBS "-lgcc_s -lgcc")
- endif()
-
- # define the sfml-graphics target
diff --git a/debian/patches/series b/debian/patches/series
index 614c3d1..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_gcc-5.3.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/libsfml.git
More information about the Pkg-games-commits
mailing list