[SCM] yoshimi/master: Patches refreshed/removed.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit bb4bcd46f58492eba97d5a25c207aa93f3a5f3e9
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sun Dec 17 12:20:53 2017 +0100

    Patches refreshed/removed.

diff --git a/debian/patches/01-gcc_flags.patch b/debian/patches/01-gcc_flags.patch
index f09cfc7..3e670d3 100644
--- a/debian/patches/01-gcc_flags.patch
+++ b/debian/patches/01-gcc_flags.patch
@@ -21,7 +21,7 @@ Index: yoshimi/src/CMakeLists.txt
  find_package (PkgConfig REQUIRED)
  if (PKG_CONFIG_FOUND)
      message(STATUS "Found pkg-config ${PKG_CONFIG_EXECUTABLE}")
-@@ -320,6 +323,7 @@ else (BuildForDebug)
+@@ -322,6 +325,7 @@ else (BuildForDebug)
              endif (BuildForCore2_X86_64)
          endif (BuildForAMD_X86_64)
      endif (BuildFor0ld_X86)
diff --git a/debian/patches/02-bsd_build_fix.patch b/debian/patches/02-bsd_build_fix.patch
deleted file mode 100644
index dbd66f2..0000000
--- a/debian/patches/02-bsd_build_fix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: Fix build on non-linux systems
-Author: Will Godfrey <willgodfrey at musically.me.uk>
-Forwarded: not-needed
-
-Index: yoshimi/src/CMakeLists.txt
-===================================================================
---- yoshimi.orig/src/CMakeLists.txt
-+++ yoshimi/src/CMakeLists.txt
-@@ -145,6 +145,7 @@ endif(EXP10F)
- 
- check_c_source_compiles (
-     "#include <argp.h>
-+     #include <stdlib.h>
-      int main () {
-          int argc=1;
-          char *argv[]={\"test\"};
-Index: yoshimi/src/Misc/Config.cpp
-===================================================================
---- yoshimi.orig/src/Misc/Config.cpp
-+++ yoshimi/src/Misc/Config.cpp
-@@ -1089,7 +1089,7 @@ LinuxSampler src/common/Features.cpp, li
- **/
- 
- 
--static error_t parse_cmds (int key, char *arg, struct argp_state *state)
-+static int parse_cmds (int key, char *arg, struct argp_state *state)
- {
-     Config *settings = (Config*)state->input;
-     if (arg && arg[0] == 0x3d)
-Index: yoshimi/src/Misc/WaveShapeSamples.h
-===================================================================
---- yoshimi.orig/src/Misc/WaveShapeSamples.h
-+++ yoshimi/src/Misc/WaveShapeSamples.h
-@@ -25,6 +25,8 @@
- #ifndef WAVESHAPESAMPLES_H
- #define WAVESHAPESAMPLES_H
- 
-+#include <cmath>
-+
- class WaveShapeSamples
- {
-     public:
diff --git a/debian/patches/series b/debian/patches/series
index cfd4e7e..ac0ed64 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01-gcc_flags.patch
-02-bsd_build_fix.patch

-- 
yoshimi packaging