[Pkg-sdl-commits] [libsdl2] 05/09: d/patches: drop SDL2_dont_propagate_lpthread.diff

[Manuel A. Fernandez Montecelo]

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

mafm pushed a commit to annotated tag debian/2.0.5+dfsg1-1
in repository libsdl2.

commit 121da9c08deecf354f9d8a3c6d1a306eaa567355
Author: Manuel A. Fernandez Montecelo <mafm at debian.org>
Date:   Tue Nov 1 19:25:18 2016 +0100

    d/patches: drop SDL2_dont_propagate_lpthread.diff
    
    (included in 2.0.4 already, but not dropped then)
---
 debian/changelog                                 |  2 ++
 debian/patches/SDL2_dont_propagate_lpthread.diff | 43 ------------------------
 debian/patches/series                            |  1 -
 3 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b58d2c7..ac993da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ libsdl2 (2.0.5+dfsg1-1) UNRELEASED; urgency=medium
   * New upstream release
     - Drop debian/patches applied or backported from upstream:
       * replace-relicenced-SDL_qsort.patch
+      * SDL2_dont_propagate_lpthread.diff (included in 2.0.4 already, but not
+        dropped then)
 
  -- Manuel A. Fernandez Montecelo <mafm at debian.org>  Tue, 01 Nov 2016 18:38:43 +0100
 
diff --git a/debian/patches/SDL2_dont_propagate_lpthread.diff b/debian/patches/SDL2_dont_propagate_lpthread.diff
deleted file mode 100644
index 459cd99..0000000
--- a/debian/patches/SDL2_dont_propagate_lpthread.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: Do not propagate -lpthread to sdl-config --libs (adapted for SDL2)
- Introduced in 1.2.11-1 (Thu, 20 Jul 2006 14:17:18 +0200).
- .
- Upstream will not apply it at the moment:
-   Sam Lantinga 2012-01-22 10:54:21 PST
- .
-   At some point it was required that multi-threaded programs using pthreads on
-   Linux link directly to the pthread library.  I don't remember all the details,
-   but it had something to do with initializing C runtime variables correctly.
- .
-   I'm sure it's not an issue anymore, but I'd rather not apply this patch in 1.2.
-   I'll go ahead and make this change in 1.3 though.
-Author: Sam Hocevar <sam+deb at zoy.org>
-Last-Update: 2013-10-19
-Bug-Debian: http://bugs.debian.org/375822
-Forwarded: http://bugzilla.libsdl.org/show_bug.cgi?id=1392
-
----
- sdl2-config.in |    2 +-
- sdl2.pc.in     |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/sdl2.pc.in
-+++ b/sdl2.pc.in
-@@ -10,6 +10,6 @@
- Version: @SDL_VERSION@
- Requires:
- Conflicts:
--Libs: -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@
-+Libs: -L${libdir} @SDL_RLD_FLAGS@ -lSDL2
- Libs.private: @SDL_STATIC_LIBS@
- Cflags: -I${includedir}/SDL2 @SDL_CFLAGS@
---- a/sdl2-config.in
-+++ b/sdl2-config.in
-@@ -45,7 +45,7 @@
-       echo -I at includedir@/SDL2 @SDL_CFLAGS@
-       ;;
- @ENABLE_SHARED_TRUE@    --libs)
-- at ENABLE_SHARED_TRUE@      echo -L at libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
-+ at ENABLE_SHARED_TRUE@      echo -L at libdir@ @SDL_RLD_FLAGS@ -lSDL2
- @ENABLE_SHARED_TRUE@      ;;
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)
diff --git a/debian/patches/series b/debian/patches/series
index 63bd8a8..fa5e734 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-SDL2_dont_propagate_lpthread.diff
 bug_822210_fix_sdl2-config.cmake_whitespace.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sdl/packages/libsdl2.git